From 03776bb7c22244add3bc379fdbbfd5eb364dfd82 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Wed, 5 Jun 2024 17:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RMpPartHarmonicDetailDServiceImpl.java            | 7 ++++++-
 .../service/user/impl/UserReportPOServiceImpl.java         | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java
index 33fbf28e9..0380c74eb 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java
@@ -1,6 +1,9 @@
 package com.njcn.harmonic.service.majornetwork.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
@@ -57,6 +60,8 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmon
     @Override
     public Page<RMpPartHarmonicDetailDTO> getRMpPartHarmonicDetail(RMpPartHarmonicDetailQueryParam param) {
 
+        String start = DateUtil.format(DateUtil.offsetDay(DateUtil.parse(param.getEndTime(), DatePattern.NORM_DATE_PATTERN),-15),DatePattern.NORM_DATE_PATTERN);
+
         List<String> lineIdLists = deptLineFeignClient.getLineNodeByDeptId(param.getOrgNo()).getData();
         if (CollectionUtils.isEmpty(lineIdLists)){
             return  new Page<RMpPartHarmonicDetailDTO>(param.getPageNum(),param.getPageSize());
@@ -65,7 +70,7 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmon
         List<RStatLimitRateDPO> rStatLimitRateDPOs = irStatLimitRateDService.lambdaQuery()
                 .in(RStatLimitRateDPO::getLineId,lineIdLists)
                 .eq(RStatLimitRateDPO::getPhasicType,"T")
-                .between(RStatLimitRateDPO::getTime, param.getStartTime()+" 00:00:00", param.getEndTime()+" 23:59:59").list();
+                .between(RStatLimitRateDPO::getTime, start+" 00:00:00", param.getEndTime()+" 23:59:59").list();
         List<RMpPartHarmonicDetailDTO> rMpPartHarmonicDetailDTOS = new ArrayList<>();
         LocalDate date = LocalDate.parse(param.getStartTime());
         YearMonth yearMonth = YearMonth.from(date);
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
index c1d746674..d008e34de 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
@@ -160,6 +160,9 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
             throw new BusinessException("当前流程以完成审批,无法重新发起");
         }
 
+        //处理历史流程id列表
+        String historyInstanceIds = InstanceUtil.dealHistoryId(userReportPO.getProcessInstanceId(), userReportPO.getHistoryInstanceId());
+
         BeanUtil.copyProperties(userReportParam,userReportPO);
 
         if (
@@ -192,8 +195,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
             userReportSensitivePOService.updateById(userReportSensitivePO);
         }
 
-        //处理历史流程id列表
-        String historyInstanceIds = InstanceUtil.dealHistoryId(userReportPO.getProcessInstanceId(), userReportPO.getHistoryInstanceId());
+
 
         // 发起 BPM 流程
         Map<String, Object> processInstanceVariables = new HashMap<>();