diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java index 216a90194..3727af210 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java @@ -149,6 +149,9 @@ public class SupvPlanParam extends BaseParam { @ApiModelProperty(value = "实施状态") private String effectStatus; + @ApiModelProperty(value = "实施人") + private String effectUserId; + @EqualsAndHashCode(callSuper = true) @Data diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvProblemParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvProblemParam.java index cf6c2ad9f..9e8d19953 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvProblemParam.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvProblemParam.java @@ -149,6 +149,10 @@ public class SupvProblemParam extends BaseParam { @NotBlank(message = "整改情况不可为空") private String rectificationStatus; + @NotBlank(message = "问题发现时间") + @DateTimeStrValid(message = "问题发现时间格式有误") + private String discoveryTime; + @EqualsAndHashCode(callSuper = true) @Data public static class UpdateSupvProblemParam extends SupvProblemParam{ diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java index faba6dc51..1de11c8c0 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java @@ -47,6 +47,7 @@ import java.util.Map; import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; /** *
@@ -95,6 +96,12 @@ public class SupvPlanServiceImpl extends ServiceImpl> getUserListByDeptId(@RequestParam("deptId") String deptId) {
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
index ce70081eb..615d92233 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
@@ -474,14 +474,14 @@ public class UserServiceImpl extends ServiceImpl