From 075205d4b9cc8ac081fed8d4e21ff17c10e3e507 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 9 Jul 2024 13:55:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E8=AF=95?= =?UTF-8?q?=E8=BF=90=E8=A1=8Cbug=E4=BF=AE=E6=94=B9=E5=92=8C=E5=85=A8?= =?UTF-8?q?=E6=99=AF=E9=97=AE=E9=A2=98=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/api/TerminalBaseClient.java | 6 ++ .../TerminalBaseClientFallbackFactory.java | 6 ++ .../pq/controller/TerminalBaseController.java | 10 ++++ .../pq/service/TerminalBaseService.java | 7 +++ .../service/impl/TerminalBaseServiceImpl.java | 18 ++++++ .../po/device/TempLineRunTestWarning.java | 2 +- .../pojo/vo/gridDiagram/GridDiagramVO.java | 6 ++ .../device/DeVReportManageController.java | 1 + .../controller/device/TempLineController.java | 1 + .../user/UserReportDeleteController.java | 3 +- .../device/TempLineRunTestWarningMapper.java | 6 ++ .../mapping/TempLineRunTestWarningMapper.xml | 17 ++++++ .../impl/GridDiagramServiceImpl.java | 28 +++++++++- .../impl/UserReportDeleteServiceImpl.java | 55 ++++++++++++++++--- .../impl/UserReportNormalServiceImpl.java | 21 ++++--- .../user/impl/UserReportPOServiceImpl.java | 4 +- .../impl/UserReportRenewalServiceImpl.java | 11 +++- 17 files changed, 182 insertions(+), 20 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java index e77029781..39c2ffbcd 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java @@ -46,4 +46,10 @@ public interface TerminalBaseClient { */ @GetMapping("/terminalSyncRunFly") HttpResult terminalSyncRunFly(@RequestParam("lineId") String lineId); + + /** + * 监测点信息删除 + */ + @GetMapping("/terminalSyncDeleteFly") + HttpResult terminalSyncDeleteFly(@RequestParam("lineId") String lineId); } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java index 61def495d..a61e2945d 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java @@ -50,6 +50,12 @@ public class TerminalBaseClientFallbackFactory implements FallbackFactory terminalSyncDeleteFly(String lineId) { + log.error("{}异常，降级处理，异常为：{}", "监测点信息删除", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java index 772d10925..30c30da7f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java @@ -139,6 +139,16 @@ public class TerminalBaseController extends BaseController { Boolean b = terminalBaseService.terminalSyncRunFly(lineId); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); } + + @ApiOperation("监测点信息删除") + @OperateInfo(operateType = OperateType.ADD, info = LogEnum.BUSINESS_MEDIUM) + @GetMapping("/terminalSyncDeleteFly") + public HttpResult terminalSyncDeleteFly(@RequestParam("lineId") String lineId) { + String methodDescribe = getMethodDescribe("terminalSyncDeleteFly"); + Boolean b = terminalBaseService.terminalSyncDeleteFly(lineId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } + /** * 终端修改操作 * diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java index 97af4bf1a..2f0ca59f1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java @@ -250,4 +250,11 @@ public interface TerminalBaseService { * @return */ Boolean terminalSyncRunFly(String lineId); + + /** + * 监测数据删除 + * @param lineId + * @return + */ + Boolean terminalSyncDeleteFly(String lineId); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 4eca12cde..a2bdfa82a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -24,6 +24,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.LogUtil; import com.njcn.common.utils.PubUtils; import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.biz.enums.RunFlagEnum; import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.biz.pojo.po.DeviceBak; import com.njcn.device.biz.pojo.po.Overlimit; @@ -1989,6 +1990,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple } @Override + @Transactional(rollbackFor = Exception.class) public Boolean terminalSyncRunFly(String lineId) { LineDTO lineDTO = this.baseMapper.selectLineDetail(lineId); if(ObjectUtil.isNotNull(lineDTO)){ @@ -2005,6 +2007,22 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple return false; } + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean terminalSyncDeleteFly(String lineId) { + LineDTO lineDTO = this.baseMapper.selectLineDetail(lineId); + if(ObjectUtil.isNotNull(lineDTO)){ + //删除监测点详细信息 + lineDetailMapper.updateLineRunFlag(lineDTO.getLineId(), RunFlagEnum.QUIT.getStatus()); + //todo 删除监测点信息 + this.removeById(lineDTO.getLineId()); + //todo 删除部门监测点关系 + deptLineMapper.delete(new LambdaQueryWrapper() + .eq(DeptLine::getLineId, lineDTO.getLineId())); + } + return false; + } + private String saveTerminalInfo(List oracleTerminalExcels, List overLimitExcels) { List oracleTerminalExcelMsg = new ArrayList<>(); diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/TempLineRunTestWarning.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/TempLineRunTestWarning.java index 1d9022fc4..7a3937f4b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/TempLineRunTestWarning.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/TempLineRunTestWarning.java @@ -37,7 +37,7 @@ public class TempLineRunTestWarning extends BaseEntity implements Serializable{ private String testRunReport; /** - * 试运行表主键 + * 审核原因 */ @TableField(value = "reason") private String reason; diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/gridDiagram/GridDiagramVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/gridDiagram/GridDiagramVO.java index c1eec1cfc..252083bff 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/gridDiagram/GridDiagramVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/gridDiagram/GridDiagramVO.java @@ -39,6 +39,9 @@ public class GridDiagramVO { @ApiModelProperty(value = "技术监督计划") private Integer surveyNum; + + @ApiModelProperty(value = "试运行问题") + private Integer trialRunNum; } @Data @@ -52,5 +55,8 @@ public class GridDiagramVO { @ApiModelProperty(value = "技术监督计划") private GridDiagramVO survey; + + @ApiModelProperty(value = "试运行问题") + private GridDiagramVO trialRun; } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java index 6914a93f8..1c51b892b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java @@ -42,6 +42,7 @@ public class DeVReportManageController extends BaseController { private final SupervisionDevMainReportPOService supervisionDevMainReportPOService; + //装置新增 @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) @PostMapping("/add") @ApiOperation("新增电能质量监测装置设备") diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java index 1a9541b14..8ad5d42ee 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java @@ -40,6 +40,7 @@ public class TempLineController extends BaseController { private final SupervisionTempLineReportService supervisionTempLineReportService; + //监测点新增 @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) @PostMapping("/add") @ApiOperation("新增临时监测点管理") diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportDeleteController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportDeleteController.java index ab9cf9f68..238a19d71 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportDeleteController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportDeleteController.java @@ -26,7 +26,8 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @RequestMapping("/userReportDelete") -@Api(tags = "干扰源常态化管理信息删除") +@Api(tags = "干扰源常态化管理信息删除(功能取消)") +@Deprecated() public class UserReportDeleteController extends BaseController { private final IUserReportDeleteService userReportDeleteService; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/TempLineRunTestWarningMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/TempLineRunTestWarningMapper.java index d9df3a597..ed94e3a92 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/TempLineRunTestWarningMapper.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/TempLineRunTestWarningMapper.java @@ -1,8 +1,12 @@ package com.njcn.supervision.mapper.device; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import org.apache.ibatis.annotations.Param; import com.njcn.supervision.pojo.po.device.TempLineRunTestWarning; +import java.util.List; + /** * @author web2023 * @description 针对表【supervision_temp_line_run_test_warning】的数据库操作Mapper @@ -11,6 +15,8 @@ import com.njcn.supervision.pojo.po.device.TempLineRunTestWarning; */ public interface TempLineRunTestWarningMapper extends BaseMapper { + List selectWarningsIds(@Param("orgIds") List orgIds, + @Param("param") StatisticsBizBaseParam param); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/TempLineRunTestWarningMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/TempLineRunTestWarningMapper.xml index fd32b15c1..5c3c7cc3c 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/TempLineRunTestWarningMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/TempLineRunTestWarningMapper.xml @@ -5,4 +5,21 @@ + diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java index e6e039b7b..db55cf1c7 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.supervision.mapper.device.TempLineRunTestWarningMapper; import com.njcn.supervision.pojo.po.device.LineWarning; import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet; import com.njcn.supervision.pojo.po.problem.SupervisionUserComplaintPO; @@ -43,6 +44,7 @@ public class GridDiagramServiceImpl implements GridDiagramService { private final DeptFeignClient deptFeignClient; private final IWarningLeafletService warningLeafletService; private final ILineWarningService lineWarningService; + private final TempLineRunTestWarningMapper warningsMapper; @Override public GridDiagramVO.Info getSupervisionData(StatisticsBizBaseParam param) { @@ -108,10 +110,16 @@ public class GridDiagramServiceImpl implements GridDiagramService { .ge(StrUtil.isNotBlank(param.getStartTime()), SurveyTest::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime()))) .le(StrUtil.isNotBlank(param.getEndTime()), SurveyTest::getCreateTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))) ); + //试运行问题单子 + List runWarningsIds = warningsMapper.selectWarningsIds(deptIds, param); + + //根据问题单id查询已关联工单 List problemIds = userComplaintList.stream().map(SupervisionUserComplaintPO::getId).collect(Collectors.toList()); problemIds.addAll(surveyTestList.stream().map(SurveyTest::getId).collect(Collectors.toList())); problemIds.addAll(lineWarningList.stream().map(LineWarning::getId).collect(Collectors.toList())); + problemIds.addAll(runWarningsIds); + List list =new ArrayList<>(); if (CollUtil.isNotEmpty(problemIds)) { list.addAll(warningLeafletService.list(new LambdaQueryWrapper() @@ -155,9 +163,21 @@ public class GridDiagramServiceImpl implements GridDiagramService { surveyVo.setProcessedNum(surveyHandleList.size()); surveyVo.setDisposalNum(survey.size() == 0 ? 0.0f : NumberUtil.round(surveyHandleList.size() * 100.0 / survey.size(), 2).floatValue()); + //试运行监测点问题 + GridDiagramVO trialRunVo=new GridDiagramVO(); + List trialRun = list.stream().filter(x -> runWarningsIds.contains(x.getProblemId())).collect(Collectors.toList()); + trialRunVo.setAbnormalNum(runWarningsIds.size()); + trialRunVo.setAssociatedNum(trialRun.size()); + trialRunVo.setConversionNum(trialRunVo.getAbnormalNum() == 0 ? 0.0f : NumberUtil.round(trialRun.size() * 100.0 / trialRunVo.getAbnormalNum(), 2).floatValue()); + List trialRunHandleList = trialRun.stream().filter(x -> x.getStatus() == 2).map(WarningLeaflet::getId).collect(Collectors.toList()); + trialRunVo.setWorkNum(trialRun.size()); + trialRunVo.setProcessedNum(trialRunHandleList.size()); + trialRunVo.setDisposalNum(trialRun.size() == 0 ? 0.0f : NumberUtil.round(trialRunHandleList.size() * 100.0 / trialRun.size(), 2).floatValue()); + City.setOnLine(warnVo); City.setUser(userVo); City.setSurvey(surveyVo); + City.setTrialRun(trialRunVo); return City; } @@ -199,11 +219,17 @@ public class GridDiagramServiceImpl implements GridDiagramService { ); gridDiagramVO.setSurveyNum(surveyTestList.size()); - gridDiagramVO.setAbnormalNum(lineWarningList.size() + userComplaintList.size() + surveyTestList.size()); + //试运行问题单子 + List runWarningsIds = warningsMapper.selectWarningsIds(ids, baseParam); + gridDiagramVO.setTrialRunNum(runWarningsIds.size()); + + + gridDiagramVO.setAbnormalNum(lineWarningList.size() + userComplaintList.size() + surveyTestList.size()+ runWarningsIds.size()); //根据问题单id查询已关联工单 List problemIds = userComplaintList.stream().map(SupervisionUserComplaintPO::getId).collect(Collectors.toList()); problemIds.addAll(surveyTestList.stream().map(SurveyTest::getId).collect(Collectors.toList())); problemIds.addAll(lineWarningList.stream().map(LineWarning::getId).collect(Collectors.toList())); + problemIds.addAll(runWarningsIds); if (CollUtil.isNotEmpty(problemIds)) { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportDeleteServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportDeleteServiceImpl.java index 5ab01d68a..e5a8dfea7 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportDeleteServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportDeleteServiceImpl.java @@ -1,6 +1,8 @@ package com.njcn.supervision.service.user.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.bpm.api.BpmProcessFeignClient; @@ -9,10 +11,17 @@ import com.njcn.bpm.pojo.dto.BpmInstanceInfo; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pq.api.TerminalBaseClient; import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.mapper.user.UserReportPOMapper; import com.njcn.supervision.pojo.param.user.UserReportParam; +import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO; +import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; +import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTestPO; import com.njcn.supervision.pojo.po.user.*; +import com.njcn.supervision.service.device.ISupervisionTempLineRunTestService; +import com.njcn.supervision.service.device.SupervisionTempLineDebugPOService; +import com.njcn.supervision.service.device.SupervisionTempLineReportService; import com.njcn.supervision.service.user.*; import com.njcn.supervision.utils.InstanceUtil; import com.njcn.web.utils.RequestUtil; @@ -21,8 +30,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; /** @@ -41,11 +52,20 @@ public class UserReportDeleteServiceImpl extends ServiceImpl() .set(UserReportProjectPO::getState, status) @@ -61,6 +81,27 @@ public class UserReportDeleteServiceImpl extends ServiceImpl() .set(UserReportPO::getState, 0) .eq(UserReportPO::getId, businessId)); + //删除监测点绑定信息 + List lineList = lineReportService.list(new LambdaQueryWrapper() + .eq(SupervisionTempLineReport::getState, 0) + .eq(SupervisionTempLineReport::getUserId, businessId)); + if(CollUtil.isNotEmpty(lineList)){ + List lineIds = lineList.stream().map(SupervisionTempLineReport::getId).collect(Collectors.toList()); + //删除监测点绑定信息 + lineReportService.update(new LambdaUpdateWrapper() + .set(SupervisionTempLineReport::getState, 0) + .eq(SupervisionTempLineReport::getUserId, businessId)); + //删除监测点联调 + lineDebugService.update(new LambdaUpdateWrapper() + .set(SupervisionTempLineDebugPO::getState, 0) + .in(SupervisionTempLineDebugPO::getId, lineIds)); + //删除试运行信息 + lineRunTestService.update(new LambdaUpdateWrapper() + .set(SupervisionTempLineRunTestPO::getState, 0) + .in(SupervisionTempLineRunTestPO::getId, lineIds)); + } + //远程删除监测点信息和监测点详细信息 +// translateClient.terminalSyncDeleteFly(businessId); } this.lambdaUpdate().set(UserReportPO::getStatus, status).eq(UserReportPO::getId, businessId).update(); } @@ -68,11 +109,11 @@ public class UserReportDeleteServiceImpl extends ServiceImpl x.between("supervision_user_report.expected_production_date", DateUtil.beginOfDay(DateUtil.parse(userReportQueryParam.getSearchBeginTime())), - DateUtil.endOfDay(DateUtil.parse(userReportQueryParam.getSearchEndTime()))).or().isNull("supervision_user_report.expected_production_date")); + DateUtil.endOfDay(DateUtil.parse(userReportQueryParam.getSearchEndTime()))) + .or() + .isNull("supervision_user_report.expected_production_date")); } userReportVOQueryWrapper.orderByDesc("supervision_user_report.Update_Time"); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportRenewalServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportRenewalServiceImpl.java index c5e025fb7..a5e71f218 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportRenewalServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportRenewalServiceImpl.java @@ -76,7 +76,7 @@ public class UserReportRenewalServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.USER_REPORT_RENEWAL.getKey());