From 8feb7b00ab8a3f29f4a3c48b98c9546ffeb0dc43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 6 Jul 2023 08:59:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E7=AE=A1?= =?UTF-8?q?=E7=90=86bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommTerminalServiceImpl.java | 2 +- .../com/njcn/process/pojo/vo/SupvPlanVO.java | 3 ++- .../service/impl/SupvPlanServiceImpl.java | 18 +++++++++++++++++- .../service/impl/SupvPushGwServiceImpl.java | 8 ++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index 2bf0b31b5..1bd3156d4 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -98,7 +98,7 @@ public class CommTerminalServiceImpl implements CommTerminalService { deptGetBase.setUnitId(it.getCode()); deptGetBase.setUnitName(it.getName()); List deptChildren = deptDTOList.stream().filter(deptDTO -> deptDTO.getPids().contains(it.getId())).map(DeptDTO::getCode).collect(Collectors.toList()); - deptChildren.add(it.getId()); + deptChildren.add(it.getCode()); deptGetBase.setUnitChildrenList(deptChildren); deptGetBase.setDeptLevel(it.getPids().split(StrUtil.COMMA).length); result.add(deptGetBase); 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 ab2ec5153..7647df4f0 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 @@ -161,5 +161,6 @@ public class SupvPlanVO { */ private String effectStatus; - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; } 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 e5435606c..474cc4bdb 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 @@ -3,6 +3,8 @@ package com.njcn.process.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -39,6 +41,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDate; import java.util.List; import java.util.Map; import java.util.Objects; @@ -67,6 +70,8 @@ public class SupvPlanServiceImpl extends ServiceImpl i private final SupvProblemMapper supvProblemMapper; + private final FileStorageUtil fileStorageUtil; + @Override public boolean addPlan(SupvPlanParam supvPlanParam) { @@ -119,6 +124,13 @@ public class SupvPlanServiceImpl extends ServiceImpl i if (CollUtil.isNotEmpty(busIds)) { LambdaQueryWrapper fileLambdaQueryWrapper = new LambdaQueryWrapper<>(); fileLambdaQueryWrapper.in(SupvFile::getBusiId, busIds); + + List supvFiles = supvFileMapper.selectList(fileLambdaQueryWrapper); + + for(SupvFile supvFile: supvFiles){ + fileStorageUtil.deleteFile(supvFile.getFileUrl()); + } + supvFileMapper.delete(fileLambdaQueryWrapper); } return true; @@ -129,7 +141,11 @@ public class SupvPlanServiceImpl extends ServiceImpl i LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); if (StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())) { List deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getSupvOrgId()).getData(); - lambdaQueryWrapper.in(SupvPlan::getSupvOrgId, deptIds).between(SupvPlan::getPlanSupvDate, supvPlanParam.getSearchBeginTime(), supvPlanParam.getSearchEndTime()); + lambdaQueryWrapper.in(SupvPlan::getSupvOrgId, deptIds) + .between(SupvPlan::getCreateTime, LocalDateTimeUtil.beginOfDay(LocalDate.parse(supvPlanParam.getSearchBeginTime()).atStartOfDay()), LocalDateTimeUtil.endOfDay(LocalDate.parse(supvPlanParam.getSearchEndTime()).atStartOfDay())) + .eq(StrUtil.isNotBlank(supvPlanParam.getSupvType()),SupvPlan::getSupvType,supvPlanParam.getSupvType()) + .orderByDesc(SupvPlan::getCreateTime); + } List deptList = deptFeignClient.allDeptList().getData(); Map mapCode = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity())); 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 76100d1ac..b26c89cf0 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 @@ -39,6 +39,7 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * pqs @@ -279,6 +280,13 @@ public class SupvPushGwServiceImpl implements SupvPushGwService { @Override public boolean deletePlan(List planIds) { + //判断是否已经取消上送 + LambdaQueryWrapper supvPlanLambdaQueryWrapper = new LambdaQueryWrapper<>(); + supvPlanLambdaQueryWrapper.in(SupvPlan::getIsUploadHead, Stream.of(0,2).collect(Collectors.toList())).in(SupvPlan::getPlanId,planIds); + int count = supvPlanMapper.selectCount(supvPlanLambdaQueryWrapper); + if(count>0){ + throw new BusinessException("请选择已上送计划"); + } List supvPlanList = new ArrayList<>(); for(String id : planIds) {