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 5c2fff038..0295e4ee5 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 @@ -45,6 +45,12 @@ public class SupvPlanParam extends BaseParam { @NotBlank(message = "监督单位不可为空") private String supvOrgId; + /** + * 计划编制人id + */ + @NotBlank(message = "计划编制人不可为空") + private String planUserId; + /** * 监督类型 */ 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 db0915a8b..19b0b8a69 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 @@ -123,7 +123,6 @@ public class SupvPlanServiceImpl extends ServiceImpl i supvPlan.setIsUploadHead(0); - supvPlan.setPlanUserId(RequestUtil.getUserIndex()); if(StrUtil.isNotBlank(supvPlan.getEffectUserId())){ List userList = userFeignClient.getUserByIdList(Stream.of(supvPlan.getEffectUserId()).collect(Collectors.toList())).getData(); if(CollUtil.isNotEmpty(userList)){ @@ -363,7 +362,7 @@ public class SupvPlanServiceImpl extends ServiceImpl i } //判断监督对象类型 - if (StrUtil.isNotBlank(supvPlanParam.getSupvObjType())) { + /* if (StrUtil.isNotBlank(supvPlanParam.getSupvObjType())) { DictData dictData = dicDataFeignClient.getDicDataById(supvPlanParam.getSupvType()).getData(); if (dictData.getCode().equals(DicDataEnum.New_Energy.getCode())) { if (StrUtil.isBlank(supvPlanParam.getSupvObjType())) { @@ -388,7 +387,7 @@ public class SupvPlanServiceImpl extends ServiceImpl i throw new BusinessException("监督对象协议容量不可为空"); } } - } + }*/ //判断时间范围 if(StrUtil.isAllNotBlank(supvPlanParam.getEffectStartTime(),supvPlanParam.getEffectEndTime())|| StrUtil.isAllNotBlank(supvPlanParam.getEffectStartTime(),supvPlanParam.getReportIssueTime())