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

新增状态查询接口

Browse Source
This commit is contained in:
cdf
2024-06-05 17:31:06 +08:00
parent 0939f20e4a
commit 03776bb7c2
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpPartHarmonicDetailDServiceImpl.java
View File

@@ -1,6 +1,9 @@
package com.njcn.harmonic.service.majornetwork.impl; package com.njcn.harmonic.service.majornetwork.impl;
import cn.hutool.core.collection.CollectionUtil; 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.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.common.pojo.param.StatisticsBizBaseParam;
@@ -57,6 +60,8 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmon
@Override @Override
public Page<RMpPartHarmonicDetailDTO> getRMpPartHarmonicDetail(RMpPartHarmonicDetailQueryParam param) { 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(); List<String> lineIdLists = deptLineFeignClient.getLineNodeByDeptId(param.getOrgNo()).getData();
if (CollectionUtils.isEmpty(lineIdLists)){ if (CollectionUtils.isEmpty(lineIdLists)){
return new Page<RMpPartHarmonicDetailDTO>(param.getPageNum(),param.getPageSize()); return new Page<RMpPartHarmonicDetailDTO>(param.getPageNum(),param.getPageSize());
@@ -65,7 +70,7 @@ public class RMpPartHarmonicDetailDServiceImpl extends ServiceImpl<RMpPartHarmon
List<RStatLimitRateDPO> rStatLimitRateDPOs = irStatLimitRateDService.lambdaQuery() List<RStatLimitRateDPO> rStatLimitRateDPOs = irStatLimitRateDService.lambdaQuery()
.in(RStatLimitRateDPO::getLineId,lineIdLists) .in(RStatLimitRateDPO::getLineId,lineIdLists)
.eq(RStatLimitRateDPO::getPhasicType,"T") .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<>(); List<RMpPartHarmonicDetailDTO> rMpPartHarmonicDetailDTOS = new ArrayList<>();
LocalDate date = LocalDate.parse(param.getStartTime()); LocalDate date = LocalDate.parse(param.getStartTime());
YearMonth yearMonth = YearMonth.from(date); YearMonth yearMonth = YearMonth.from(date);

6
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -160,6 +160,9 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
throw new BusinessException("当前流程以完成审批,无法重新发起"); throw new BusinessException("当前流程以完成审批,无法重新发起");
} }
//处理历史流程id列表
String historyInstanceIds = InstanceUtil.dealHistoryId(userReportPO.getProcessInstanceId(), userReportPO.getHistoryInstanceId());
BeanUtil.copyProperties(userReportParam,userReportPO); BeanUtil.copyProperties(userReportParam,userReportPO);
if ( if (
@@ -192,8 +195,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
userReportSensitivePOService.updateById(userReportSensitivePO); userReportSensitivePOService.updateById(userReportSensitivePO);
} }
//处理历史流程id列表
String historyInstanceIds = InstanceUtil.dealHistoryId(userReportPO.getProcessInstanceId(), userReportPO.getHistoryInstanceId());
// 发起 BPM 流程 // 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>(); Map<String, Object> processInstanceVariables = new HashMap<>();