任务和缺陷修改

pms-service/src/main/java/com/tofly/pms/testmanage/controller/BugInfoController.java

@@ -96,9 +96,12 @@ public class BugInfoController {
         String sureId = bugInfo.getSureId();
         bugInfo.setTitle(null);
         bugInfo.setSureId(null);
+        Date startDate1 = bugInfo.getStartDate();
+        Date endDate1 = bugInfo.getEndDate();
         LambdaQueryWrapper<BugInfo> wrapper = new QueryWrapper<>(bugInfo).lambda()
                 .like(StringUtils.isNotBlank(title), BugInfo::getTitle, title)
                 .eq(BugInfo::getDeleted, 0)
+                .between(Objects.nonNull(startDate1) && Objects.nonNull(endDate1),BugInfo::getCreateTime, startDate1, endDate1)
                 .in(BugInfo::getProjectId, projectIdList)
                 .orderByDesc(BugInfo::getCreateTime);
         if (StringUtils.isNotBlank(sureId)) {
@@ -502,10 +505,13 @@ public class BugInfoController {
         String sureId = bugInfo.getSureId();
         bugInfo.setTitle(null);
         bugInfo.setSureId(null);
+        Date startDate = bugInfo.getStartDate();
+        Date endDate = bugInfo.getEndDate();
         BugStatusCountWithAllVo b = new BugStatusCountWithAllVo();
         LambdaQueryWrapper<BugInfo> w = Wrappers.query(bugInfo)
                 .lambda()
                 .eq(BugInfo::getDeleted, 0)
+                .between(Objects.nonNull(startDate) && Objects.nonNull(endDate),BugInfo::getCreateTime, startDate, endDate)
                 .like(StringUtils.isNotBlank(title),
                         BugInfo::getTitle, title)
                 .in(BugInfo::getProjectId, selfProjectId);

pms-service/src/main/java/com/tofly/pms/testmanage/entity/BugInfo.java

@@ -209,6 +209,13 @@ public class BugInfo implements Serializable, Cloneable {
     @ApiModelProperty(value = "是否正在处理：0：未处理，1：正在处理")
     private Integer processing;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
+
     public void setProcessingModeAnnotation() {
         try {
             Field field = this.getClass().getDeclaredField("processingMode");