[chg] 项目维保状态逻辑修改

[add]
1.设备返修和备件申请支持发货日期查询
2.项目列表添加参数

src/main/java/vion/dto/RepairRecDTO.java

@@ -121,4 +121,9 @@ public class RepairRecDTO extends BaseDTO {
     private Date createTimeStart;
     private Date createTimeStart;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTimeEnd;
     private Date createTimeEnd;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date shipDateStart;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date shipDateEnd;
 }
 }
\ No newline at end of file

src/main/java/vion/dto/SparePartDTO.java

@@ -117,4 +117,9 @@ public class SparePartDTO extends BaseDTO {
     private Date createTimeStart;
     private Date createTimeStart;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTimeEnd;
     private Date createTimeEnd;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date shipDateStart;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date shipDateEnd;
 }
 }
\ No newline at end of file

src/main/java/vion/dto/StoreDTO.java

@@ -59,6 +59,17 @@ public class StoreDTO extends BaseDTO {
     private String stuckPoint;
     private String stuckPoint;
     /** 标签id */
     /** 标签id */
     private Long tagId;
     private Long tagId;
+    /** 项目负责人 or 项目经理 */
+    private Long mainUser;
+    /** 主要产品 */
+    private Integer mainProduct;
+    /** 点位数量 */
+    private Integer pointNum;
+    /** 计划完成日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date planFinishDate;
+    /** 项目规模 */
+    private Integer projectSize;
 
 
     private Long sourceId;
     private Long sourceId;
     private Long targetId;
     private Long targetId;

src/main/java/vion/model/Store.java

@@ -71,7 +71,7 @@ public class Store {
     /** 任务详情 */
     /** 任务详情 */
     private String taskDetail;
     private String taskDetail;
 
 
-    /** 预计完成日期 */
+    /** 实际完成日期 */
     private Date finishDate;
     private Date finishDate;
 
 
     /** 完成百分比 */
     /** 完成百分比 */
@@ -80,4 +80,16 @@ public class Store {
     /** 当前卡点 */
     /** 当前卡点 */
     private String stuckPoint;
     private String stuckPoint;
 
 
+    /** 主要产品 */
+    private Integer mainProduct;
+
+    /** 点位数量 */
+    private Integer pointNum;
+
+    /** 计划完成日期 */
+    private Date planFinishDate;
+
+    /** 项目规模 */
+    private Integer projectSize;
+
 }
 }

src/main/java/vion/service/impl/RepairRecServiceImpl.java

 package vion.service.impl;
 package vion.service.impl;
 
 
+import org.dromara.hutool.core.array.ArrayUtil;
 import org.dromara.hutool.core.date.DateUtil;
 import org.dromara.hutool.core.date.DateUtil;
 import org.dromara.hutool.core.io.file.FileNameUtil;
 import org.dromara.hutool.core.io.file.FileNameUtil;
 import org.dromara.hutool.core.io.file.FileUtil;
 import org.dromara.hutool.core.io.file.FileUtil;
@@ -93,6 +94,7 @@ public class RepairRecServiceImpl extends MPJBaseServiceImpl<RepairRecMapper, Re
                 .leftJoin(Store.class, Store::getId, RepairRec::getStoreId)
                 .leftJoin(Store.class, Store::getId, RepairRec::getStoreId)
                 .leftJoin(RRepairDevice.class, on -> on.eq(RRepairDevice::getRId, RepairRec::getId).eq(RRepairDevice::getRType, 2))
                 .leftJoin(RRepairDevice.class, on -> on.eq(RRepairDevice::getRId, RepairRec::getId).eq(RRepairDevice::getRType, 2))
                 .between(RepairRec::getCreateTime, dto.getCreateTimeStart(), dto.getCreateTimeEnd())
                 .between(RepairRec::getCreateTime, dto.getCreateTimeStart(), dto.getCreateTimeEnd())
+                .between(ArrayUtil.isAllNotNull(dto.getShipDateStart(), dto.getShipDateEnd()), SparePart::getShipDate, dto.getShipDateStart(), dto.getShipDateEnd())
                 .orderByDesc(RepairRec::getCreateTime);
                 .orderByDesc(RepairRec::getCreateTime);
         return this.selectJoinList(RepairRecVO.class, wrapper);
         return this.selectJoinList(RepairRecVO.class, wrapper);
     }
     }

src/main/java/vion/service/impl/SparePartServiceImpl.java

 package vion.service.impl;
 package vion.service.impl;
 
 
+import org.dromara.hutool.core.array.ArrayUtil;
 import org.dromara.hutool.core.date.DateUtil;
 import org.dromara.hutool.core.date.DateUtil;
 import org.dromara.hutool.core.io.file.FileNameUtil;
 import org.dromara.hutool.core.io.file.FileNameUtil;
 import org.dromara.hutool.core.io.file.FileUtil;
 import org.dromara.hutool.core.io.file.FileUtil;
@@ -91,6 +92,7 @@ public class SparePartServiceImpl extends MPJBaseServiceImpl<SparePartMapper, Sp
                 .leftJoin(Contract.class, Contract::getId, SparePart::getContractId)
                 .leftJoin(Contract.class, Contract::getId, SparePart::getContractId)
                 .leftJoin(RRepairDevice.class, on -> on.eq(RRepairDevice::getRId, SparePart::getId).eq(RRepairDevice::getRType, 1))
                 .leftJoin(RRepairDevice.class, on -> on.eq(RRepairDevice::getRId, SparePart::getId).eq(RRepairDevice::getRType, 1))
                 .between(SparePart::getCreateTime, dto.getCreateTimeStart(), dto.getCreateTimeEnd())
                 .between(SparePart::getCreateTime, dto.getCreateTimeStart(), dto.getCreateTimeEnd())
+                .between(ArrayUtil.isAllNotNull(dto.getShipDateStart(), dto.getShipDateEnd()), SparePart::getShipDate, dto.getShipDateStart(), dto.getShipDateEnd())
                 .orderByDesc(SparePart::getCreateTime);
                 .orderByDesc(SparePart::getCreateTime);
         return this.selectJoinList(SparePartVO.class, wrapper);
         return this.selectJoinList(SparePartVO.class, wrapper);
     }
     }

src/main/java/vion/vo/StoreVO.java

@@ -78,7 +78,7 @@ public class StoreVO {
      */
      */
     private String taskDetail;
     private String taskDetail;
     /**
     /**
-     * 预计完成日期
+     * 实际完成日期
      */
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date finishDate;
     private Date finishDate;
@@ -90,6 +90,26 @@ public class StoreVO {
      * 当前卡点
      * 当前卡点
      */
      */
     private String stuckPoint;
     private String stuckPoint;
+    /**
+     * 主要产品
+     */
+    private Integer mainProduct;
+
+    /**
+     * 点位数量
+     */
+    private Integer pointNum;
+
+    /**
+     * 计划完成日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date planFinishDate;
+
+    /**
+     * 项目规模
+     */
+    private Integer projectSize;
 
 
     private List<String> userNameList;
     private List<String> userNameList;
 
 
@@ -118,4 +138,9 @@ public class StoreVO {
      * 标签
      * 标签
      */
      */
     private List<TagVO> tagList;
     private List<TagVO> tagList;
+
+    /**
+     * 项目负责人 or 项目经理
+     */
+    private Long mainUser;
 }
 }