Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.技术监督计划bug修改

Browse Source
This commit is contained in:
cdf
2024-04-17 09:06:52 +08:00
parent ba2df7c268
commit a07aad3fc0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java
View File

@@ -45,6 +45,12 @@ public class SupvPlanParam extends BaseParam {
@NotBlank(message = "监督单位不可为空") @NotBlank(message = "监督单位不可为空")
private String supvOrgId; private String supvOrgId;
/**
* 计划编制人id
*/
@NotBlank(message = "计划编制人不可为空")
private String planUserId;
/** /**
* 监督类型 * 监督类型
*/ */

5
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
View File

@@ -123,7 +123,6 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
supvPlan.setIsUploadHead(0); supvPlan.setIsUploadHead(0);
supvPlan.setPlanUserId(RequestUtil.getUserIndex());
if(StrUtil.isNotBlank(supvPlan.getEffectUserId())){ if(StrUtil.isNotBlank(supvPlan.getEffectUserId())){
List<User> userList = userFeignClient.getUserByIdList(Stream.of(supvPlan.getEffectUserId()).collect(Collectors.toList())).getData(); List<User> userList = userFeignClient.getUserByIdList(Stream.of(supvPlan.getEffectUserId()).collect(Collectors.toList())).getData();
if(CollUtil.isNotEmpty(userList)){ if(CollUtil.isNotEmpty(userList)){
@@ -363,7 +362,7 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
} }
//判断监督对象类型 //判断监督对象类型
if (StrUtil.isNotBlank(supvPlanParam.getSupvObjType())) { /* if (StrUtil.isNotBlank(supvPlanParam.getSupvObjType())) {
DictData dictData = dicDataFeignClient.getDicDataById(supvPlanParam.getSupvType()).getData(); DictData dictData = dicDataFeignClient.getDicDataById(supvPlanParam.getSupvType()).getData();
if (dictData.getCode().equals(DicDataEnum.New_Energy.getCode())) { if (dictData.getCode().equals(DicDataEnum.New_Energy.getCode())) {
if (StrUtil.isBlank(supvPlanParam.getSupvObjType())) { if (StrUtil.isBlank(supvPlanParam.getSupvObjType())) {
@@ -388,7 +387,7 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
throw new BusinessException("监督对象协议容量不可为空"); throw new BusinessException("监督对象协议容量不可为空");
} }
} }
} }*/
//判断时间范围 //判断时间范围
if(StrUtil.isAllNotBlank(supvPlanParam.getEffectStartTime(),supvPlanParam.getEffectEndTime())|| if(StrUtil.isAllNotBlank(supvPlanParam.getEffectStartTime(),supvPlanParam.getEffectEndTime())||
StrUtil.isAllNotBlank(supvPlanParam.getEffectStartTime(),supvPlanParam.getReportIssueTime()) StrUtil.isAllNotBlank(supvPlanParam.getEffectStartTime(),supvPlanParam.getReportIssueTime())