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

1.监督计划调整

Browse Source 
2.主网测点台账接口
This commit is contained in:
cdf
2024-06-25 13:24:40 +08:00
parent 234f0be465
commit df72e7c338
9 changed files with 78 additions and 30 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,12 +45,6 @@ public class SupvPlanParam extends BaseParam {
@NotBlank(message = "监督单位不可为空")
private String supvOrgId;
/**
* 计划所属单位
*/
@ApiModelProperty(value = "计划所属单位",required = true)
@NotBlank(message = "计划所属单位不可为空")
private String planBelongOrg;
/**
* 计划编制人id

5
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java
View File

@@ -64,11 +64,6 @@ public class SupvPlan extends BaseEntity {
*/
private String supvOrgId;
/**
* 监督单位
*/
private String planBelongOrg;
/**
* 监督单位
*/

7
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java
View File

@@ -42,13 +42,6 @@ public class SupvPlanVO {
@ApiModelProperty(value = "计划编制单位id")
private String planOrgId;
/**
* 监督计划所属单位
*/
private String planBelongOrg;
private String planBelongOrgName;
/**
* 计划编制单位名字
*/

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

@@ -258,13 +258,11 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
public Page<SupvPlanVO> pagePlan(SupvPlanParam supvPlanParam) {
LambdaQueryWrapper<SupvPlan> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())) {
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getSupvOrgId()).getData();
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getPlanOrgId()).getData();
lambdaQueryWrapper.in(SupvPlan::getSupvOrgId, deptIds)
.between(SupvPlan::getPlanSupvDate, DateUtil.parse(supvPlanParam.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN),DateUtil.parse(supvPlanParam.getSearchEndTime(), DatePattern.NORM_DATE_PATTERN))
.eq(StrUtil.isNotBlank(supvPlanParam.getSupvType()),SupvPlan::getSupvType,supvPlanParam.getSupvType());
}
if(StrUtil.isNotBlank(supvPlanParam.getSortBy())){
if(supvPlanParam.getOrderBy().equals("desc")){
lambdaQueryWrapper.orderByDesc(SupvPlan::getPlanSupvDate);
@@ -289,9 +287,9 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
PvTerminalTreeVO pvTerminalTreeVO = null;
item.setSupvOrgName(mapCode.get(item.getSupvOrgId()).getName());
if (mapCode.containsKey(item.getPlanBelongOrg())) {
pvTerminalTreeVO = mapCode.get(item.getPlanBelongOrg());
item.setPlanBelongOrgName(pvTerminalTreeVO.getName());
if (mapCode.containsKey(item.getPlanOrgId())) {
pvTerminalTreeVO = mapCode.get(item.getPlanOrgId());
item.setPlanOrgName(pvTerminalTreeVO.getName());
int deptLevel = pvTerminalTreeVO.getPids().split(StrUtil.COMMA).length;
if (deptLevel == 2) {
//省

4
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java
View File

@@ -136,8 +136,8 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
for (SupvPlan supvPlan : supvPlanList) {
checkParam(supvPlan);
PvTerminalTreeVO pvTerminalTreeVO = null;
if (mapCode.containsKey(supvPlan.getPlanBelongOrg())) {
pvTerminalTreeVO = mapCode.get(supvPlan.getPlanBelongOrg());
if (mapCode.containsKey(supvPlan.getPlanOrgId())) {
pvTerminalTreeVO = mapCode.get(supvPlan.getPlanOrgId());
supvPlan.setSupvOrgName(pvTerminalTreeVO.getName());
int deptLevel = pvTerminalTreeVO.getPids().split(StrUtil.COMMA).length;
if (deptLevel == 2) {