Merge branch 'master' of http://192.168.2.241:3000/lifan/tofly-pms

pms-service/src/main/java/com/tofly/pms/project/controller/TfPmProjectdevWController.java

@@ -46,11 +46,17 @@ public class TfPmProjectdevWController{
      */
     @ApiOperation("分页查询")
     @GetMapping
-    public ResponseEntity<Page<ProjectdevW>> paginQuery(ProjectdevW projectdevW, Page page){
+    public ResponseEntity<Page<ProjectdevW>> paginQuery(ProjectdevW projectdevW, Page<ProjectdevW> page){
         String name = projectdevW.getName();
         projectdevW.setName(null);
-        LambdaQueryWrapper<ProjectdevW> wrapper = new QueryWrapper<>(projectdevW).lambda().like(StringUtils.isNotBlank(name), ProjectdevW::getName, name);
-        final Page page1 = projectDevWService.page(page,wrapper);
+        String label = projectdevW.getLabel();
+        projectdevW.setLabel(null);
+
+        LambdaQueryWrapper<ProjectdevW> wrapper = new QueryWrapper<>(projectdevW)
+                .lambda()
+                .like(StringUtils.isNotBlank(name), ProjectdevW::getName, name)
+                .like(StringUtils.isNotBlank(label),ProjectdevW::getLabel,label);
+        final Page<ProjectdevW> page1 = projectDevWService.page(page,wrapper);
 
 
 

pms-service/src/main/java/com/tofly/pms/working/controller/TaskWController.java

@@ -287,6 +287,9 @@ public class TaskWController {
                 if (StringUtils.isNotBlank(taskUpdateBatchDto.getHeadId())) {
                     taskW.setHeadId(taskUpdateBatchDto.getHeadId());
                 }
+                if (StringUtils.isNotBlank(taskUpdateBatchDto.getLabel())) {
+                    taskW.setLabel(taskUpdateBatchDto.getLabel());
+                }
                 if (StringUtils.isNotBlank(taskW.getHeadId()) && (StringUtils.isBlank(taskW.getStatus()) || "0".equals(taskW.getStatus()))) {
                     taskW.setStatus("1");
                 }

pms-service/src/main/java/com/tofly/pms/working/dto/TaskUpdateBatchDto.java

@@ -20,4 +20,6 @@ public class TaskUpdateBatchDto {
     /** 确认人ID */
     @ApiModelProperty(value = "确认人ID")
     private String confirmId ;
+    @ApiModelProperty(value = "标签")
+    private String label;
 }

pms-service/src/main/java/com/tofly/pms/working/listener/FeedBackListener.java

@@ -62,6 +62,13 @@ public class FeedBackListener extends ImportExcelListener<FeedbackExcelModel> {
                     .replaceAll("-([1-9]-)", "-0$1")
                     .replaceAll("-([1-9]$)", "-0$1"));
         }
+        String resolveDate = data.getResolveDate();
+        if (StringUtils.isNotBlank(resolveDate)) {
+            data.setResolveDate(resolveDate
+                    .replaceAll("/", "-")
+                    .replaceAll("-([1-9]-)", "-0$1")
+                    .replaceAll("-([1-9]$)", "-0$1"));
+        }
         super.invoke(data, context);
     }
 //    private void saveImageToFile(InputStream inputStream) {