From 474a3686709b62962c7e92f6ee2c2c59be524c7f Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Mon, 28 Oct 2024 17:52:43 +0800
Subject: [PATCH] =?UTF-8?q?1.pms=E5=85=A8=E8=BF=87=E7=A8=8B=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B8=B4=E6=97=B6=E6=A1=A3=E6=A1=88=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/po/upload/PmsTemProcessReport.java       |  2 +-
 .../impl/PmsTemProcessReportServiceImpl.java      |  5 +++--
 .../upload/impl/PmsTemUserServiceImpl.java        | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessReport.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessReport.java
index 8028f126d..bf311b271 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessReport.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessReport.java
@@ -18,7 +18,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("pms_tem_process_report")
-public class PmsTemProcessReport extends BaseEntity {
+public class PmsTemProcessReport{
 
     private static final long serialVersionUID = 1L;
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java
index f783a01a3..d3fe20241 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java
@@ -2,6 +2,7 @@ package com.njcn.harmonic.service.upload.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,7 +46,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
         lambdaQueryWrapper.in(PmsTemProcessReport::getObjId,ids);
         List<PmsTemProcessReport> pmsTemProcessReportList = this.list(lambdaQueryWrapper);
         if(CollUtil.isEmpty(pmsTemProcessReportList)){
-            throw new BusinessException("查询用户临时档案数据为空");
+            throw new BusinessException("查询月报数据为空");
         }
 
         List<List<PmsTemProcessReport>> list = CollUtil.split(pmsTemProcessReportList,100);
@@ -76,7 +77,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
     public List<PmsTemProcessReport> getList(PmsTemUserParam.QueryPmsTemUserParam param) {
 
         LambdaQueryWrapper<PmsTemProcessReport> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PmsTemProcessReport::getStatisticalDate,param.getSearchBeginTime());
+        lambdaQueryWrapper.eq(PmsTemProcessReport::getStatisticalDate, param.getSearchBeginTime().substring(0,7));
         return this.list(lambdaQueryWrapper);
     }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java
index 0a3c6e7c2..9de4ff074 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java
@@ -13,11 +13,13 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.enums.PmsEnum;
 
 
+import com.njcn.harmonic.mapper.upload.PmsTemProcessApprovalMapper;
 import com.njcn.harmonic.mapper.upload.PmsTemProcessTrackMapper;
 import com.njcn.harmonic.mapper.upload.PmsTemUserMapper;
 import com.njcn.harmonic.pojo.dto.upload.RUploadMainMonitorDataDTO;
 import com.njcn.harmonic.pojo.param.UploadDataParam;
 import com.njcn.harmonic.pojo.param.upload.PmsTemUserParam;
+import com.njcn.harmonic.pojo.po.upload.PmsTemProcessApproval;
 import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO;
 import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO;
 import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData;
@@ -58,6 +60,8 @@ public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemU
 
     private final PmsTemProcessTrackMapper pmsTemProcessTrackMapper;
 
+    private final PmsTemProcessApprovalMapper pmsTemProcessApprovalMapper;
+
 
 
 
@@ -84,6 +88,11 @@ public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemU
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delPmsTemUser(List<String> ids) {
+
+        long count = pmsTemProcessApprovalMapper.selectCount(new LambdaQueryWrapper<PmsTemProcessApproval>().in(PmsTemProcessApproval::getTempUserDossierId,ids));
+        if(count>0){
+            throw new BusinessException("当前用户存在评估文档整改情况,不可删除");
+        }
         this.removeByIds(ids);
         pmsTemProcessTrackMapper.delete(new LambdaQueryWrapper<PmsTemProcessTrackPO>().in(PmsTemProcessTrackPO::getTempUserDossierId,ids));
         return true;
@@ -118,6 +127,12 @@ public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemU
             throw new BusinessException("查询用户临时档案数据为空");
         }
 
+
+        pmsTemUserPOList.forEach(item->{
+            item.setGcVoltageLevel(String.format("%02d",Integer.valueOf(item.getGcVoltageLevel())));
+            item.setGcSubstationVoltageLevel(String.format("%02d",Integer.valueOf(item.getGcSubstationVoltageLevel())));
+        });
+
         List<List<PmsTemUserPO>> list = CollUtil.split(pmsTemUserPOList,100);
         for(int i=0;i<list.size();i++){
             SendParam sendParam = new SendParam();