From 69157a138b4ec7bbae10b48fbae6f2dd25c4e84d Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Mon, 2 Sep 2024 16:38:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=9B=91=E7=9D=A3=E8=AE=A1=E5=88=92=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/pojo/param/SupvPlanParam.java | 8 ++++- .../com/njcn/process/pojo/po/SupvPlan.java | 4 ++- .../com/njcn/process/pojo/vo/SupvPlanVO.java | 6 ++++ .../process/service/ISupvPlanService.java | 2 +- .../service/impl/SupvPlanServiceImpl.java | 28 ++++++++++++++--- .../service/impl/SupvPushGwServiceImpl.java | 2 -- .../service/impl/SupvReportMServiceImpl.java | 30 +++++++++++++++---- 7 files changed, 65 insertions(+), 15 deletions(-) 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 8e9b45cfb..be3f0fb29 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 @@ -25,7 +25,7 @@ import java.time.LocalDateTime; * @since 2023-06-21 */ @Data -@TableName("supv_plan") +@EqualsAndHashCode(callSuper = true) public class SupvPlanParam extends BaseParam { @@ -74,6 +74,12 @@ public class SupvPlanParam extends BaseParam { @DateTimeStrValid(message = "计划监督时间格式有误") private String planSupvDate; + /** + * 监督对象id + */ + @ApiModelProperty(value = "监督对象id") + private String supvObjId; + /** * 监督对象名称 */ diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java index 1cd62f22f..7896ecda8 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java @@ -123,7 +123,9 @@ public class SupvPlan extends BaseEntity { private String supvObjName; - @TableField(exist = false) + /** + * 监督对象id + */ private String supvObjId; /** diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java index 3feff1add..e1594ce15 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java @@ -72,6 +72,12 @@ public class SupvPlanVO { @JsonFormat(pattern = "yyyy-MM") private String planSupvDate; + /** + * 监督对象Id + */ + @ApiModelProperty(value = "监督对象Id") + private String supvObjId; + /** * 监督对象名称 */ diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ISupvPlanService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ISupvPlanService.java index a662c1999..1f5738eab 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ISupvPlanService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ISupvPlanService.java @@ -36,7 +36,7 @@ public interface ISupvPlanService extends IService { * @author cdf * @date 2023/6/21 */ - boolean updatePlan(SupvPlanParam supvPlanParam); + boolean updatePlan(SupvPlanParam.UpdateSupvPlanParam supvPlanParam); /** * 删除技术监督 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 eb0cb6351..b6e78a75b 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 @@ -7,6 +7,7 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; @@ -109,7 +110,14 @@ public class SupvPlanServiceImpl extends ServiceImpl i supvPlan.setReportIssueTime(PubUtils.localDateTimeFormat(supvPlanParam.getReportIssueTime())); } - + DictData dictData = dicDataFeignClient.getDicDataById(supvPlanParam.getSupvType()).getData(); + if(dictData.getCode().equals(DicDataEnum.Technical_Super.getCode())){ + if(StrUtil.isBlank(supvPlanParam.getSupvObjId())){ + throw new BusinessException("供电电压质量技术监督类型对象id不可为空！"); + } + }else { + supvPlan.setSupvObjId(IdUtil.simpleUUID()); + } if(!"01".equals(supvPlan.getEffectStatus())){ if(Objects.isNull(supvPlan.getEffectStartTime()) ){ @@ -123,7 +131,6 @@ public class SupvPlanServiceImpl extends ServiceImpl i } } - supvPlan.setIsUploadHead(0); if(StrUtil.isNotBlank(supvPlan.getEffectUserId())){ List userList = userFeignClient.getUserByIdList(Stream.of(supvPlan.getEffectUserId()).collect(Collectors.toList())).getData(); @@ -137,8 +144,10 @@ public class SupvPlanServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) - public boolean updatePlan(SupvPlanParam supvPlanParam) { + public boolean updatePlan(SupvPlanParam.UpdateSupvPlanParam supvPlanParam) { checkParam(supvPlanParam, true); + SupvPlan byId = this.getById(supvPlanParam.getPlanId()); + SupvPlan supvPlan = new SupvPlan(); BeanUtil.copyProperties(supvPlanParam, supvPlan); supvPlan.setPlanSupvDate(PubUtils.localDateFormat(supvPlanParam.getPlanSupvDate())); @@ -154,6 +163,17 @@ public class SupvPlanServiceImpl extends ServiceImpl i if(StrUtil.isNotBlank(supvPlanParam.getReportIssueTime())) { supvPlan.setReportIssueTime(PubUtils.localDateTimeFormat(supvPlanParam.getReportIssueTime())); } + DictData dictData = dicDataFeignClient.getDicDataById(supvPlanParam.getSupvType()).getData(); + if(dictData.getCode().equals(DicDataEnum.Technical_Super.getCode())){ + if(StrUtil.isBlank(supvPlanParam.getSupvObjId())){ + throw new BusinessException("供电电压质量技术监督类型对象id不可为空！"); + } + } + + if(!byId.getSupvType().equals(supvPlanParam.getSupvType())){ + supvPlan.setSupvObjId(IdUtil.simpleUUID()); + } + if(StrUtil.isNotBlank(supvPlan.getEffectUserId())){ List userList = userFeignClient.getUserByIdList(Stream.of(supvPlan.getEffectUserId()).collect(Collectors.toList())).getData(); if(CollUtil.isNotEmpty(userList)){ @@ -172,7 +192,7 @@ public class SupvPlanServiceImpl extends ServiceImpl i throw new BusinessException("结束实施时间不可为空！"); } } - SupvPlan byId = this.getById(supvPlan.getPlanId()); + //实施问题 List list =new ArrayList<>(); if(1==byId.getIsUploadHead()){ diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java index 12de5d635..9d9db1d8b 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java @@ -239,8 +239,6 @@ public class SupvPushGwServiceImpl implements SupvPushGwService { pvTerminalTreeVO = mapCode.get(supvPlan.getPlanOrgId()); supvPlan.setPlanOrgName(pvTerminalTreeVO.getName()); } - - supvPlan.setSupvObjId(IdUtil.simpleUUID()); } if (supvPlanList.size() > 100) { throw new BusinessException("一次最多上送100条数据"); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java index a535e3f57..0b8a5cc54 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java @@ -167,7 +167,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl processPublicYearDTOS = this.baseMapper.statisticPlanReportYear(firstYearDay, endYearDay, mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(), null, null); - List processPublicDTOCapacitorListM = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null); + List processPublicDTOCapacitorListM = this.baseMapper.statisticPlanReport(firstDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null); List processPublicDTOCapacitorAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null); //电容器组问题数量 List processPublicDTOCapacitorGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null); @@ -190,14 +190,18 @@ public class SupvReportMServiceImpl extends MppServiceImpl supvReportMBatch = new ArrayList<>(); + Integer dyProvinceCount = 0; + String provinceId =""; + for(DeptGetBase deptGetBase : deptGetBaseList){ - if(deptGetBase.getUnitName().equals("国家电网公司")){ - System.out.println(55); - } if(deptGetBase.getDeptLevel() !=2 && deptGetBase.getDeptLevel() !=3 && deptGetBase.getDeptLevel() !=4){ continue; } + + if(deptGetBase.getDeptLevel() ==2){ + provinceId = deptGetBase.getUnitId(); + } //月累计监督数量 Integer all = 0; Integer yearAll = 0; @@ -256,8 +260,15 @@ public class SupvReportMServiceImpl extends MppServiceImpl0?1:0); + supvReportM.setPowerMonthConductedNum(dyYCount>0?1:0); + if(deptGetBase.getDeptLevel() == 3){ + dyProvinceCount+=supvReportM.getPowerMonthPlanNum(); + } + + all+=supvReportM.getPowerMonthConductedNum(); Integer dd = dealData(childrenDeptList,processPublicDTODianYaYearPlan); yearAll+=dd; @@ -337,6 +348,13 @@ public class SupvReportMServiceImpl extends MppServiceImpl