From 3c9acb7ad11006d5535b8e0fd34c28f908376dd8 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 18 Sep 2023 09:10:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E5=A4=A7=E5=B7=A5=E7=A8=8B=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/GovernmentController.java | 3 +- ...erousEngineeringCheckAcceptController.java | 2 +- .../EntDangerousEngineeringController.java | 3 +- .../GovDangerousEngineeringController.java | 3 +- .../DangerousEngineeringController.java | 3 +- .../xmgl/modules/basicdata/dto/NoticeDto.java | 3 +- .../service/impl/NoticeServiceImpl.java | 41 ++++++++++--------- .../xmgl/modules/basicdata/vo/NoticeVo.java | 4 +- .../service/IDangerousEngineeringService.java | 2 + ...ngerousEngineeringProgressServiceImpl.java | 1 + .../impl/DangerousEngineeringServiceImpl.java | 39 ++++++++++++++---- .../java/com/zhgd/xmgl/util/DateUtils.java | 6 ++- 12 files changed, 73 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/GovernmentController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/GovernmentController.java index 759953f..6caad88 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/GovernmentController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/GovernmentController.java @@ -157,7 +157,8 @@ public class GovernmentController { result.error500("未找到对应实体"); }else { // 检验政务账号是否已存在 - SystemUser systemUser = systemUserService.getOne(Wrappers.lambdaQuery().eq(SystemUser::getAccount, governmentVo.getAccount())); + SystemUser systemUser = systemUserService.getOne(Wrappers.lambdaQuery().eq(SystemUser::getAccount, governmentVo.getAccount()) + .ne(SystemUser::getSn, governmentEntity.getGovernmentSn())); if (systemUser != null) { result.error500("该用户账号已被使用"); return result; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDangerousEngineeringCheckAcceptController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDangerousEngineeringCheckAcceptController.java index 5b872f8..c69ac00 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDangerousEngineeringCheckAcceptController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDangerousEngineeringCheckAcceptController.java @@ -87,7 +87,7 @@ public class EntDangerousEngineeringCheckAcceptController { @ApiOperation(value = " 添加危大工程验收信息", notes = "添加危大工程验收信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody DangerousEngineeringCheckAccept dangerousEngineeringCheckAccept) { - dangerousEngineeringCheckAcceptService.save(dangerousEngineeringCheckAccept); + dangerousEngineeringCheckAcceptService.saveInfo(dangerousEngineeringCheckAccept); return Result.success("添加成功！"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDangerousEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDangerousEngineeringController.java index 4167bd2..0cd17b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDangerousEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntDangerousEngineeringController.java @@ -54,6 +54,7 @@ public class EntDangerousEngineeringController { @PostMapping(value = "/page") public Result> queryPageList(@ApiIgnore Page page, @ApiIgnore @RequestBody DangerousEngineering dangerousEngineering) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dangerousEngineering); + queryWrapper.lambda().orderByDesc(DangerousEngineering::getCreateTime); IPage pageList = dangerousEngineeringService.page(page, queryWrapper); return Result.success(pageList); } @@ -129,7 +130,7 @@ public class EntDangerousEngineeringController { if (dangerousEngineeringEntity == null) { result.error500("未找到对应实体"); } else { - boolean ok = dangerousEngineeringService.removeById(dangerousEngineering.getId()); + boolean ok = dangerousEngineeringService.removeInfo(dangerousEngineering); if (ok) { result.success("删除成功!"); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovDangerousEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovDangerousEngineeringController.java index b23bfb2..ee42d83 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovDangerousEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovDangerousEngineeringController.java @@ -97,6 +97,7 @@ public class GovDangerousEngineeringController { if (StringUtils.isNotBlank(dangerousEngineering.getProjectSn())) { queryWrapper.lambda().eq(DangerousEngineering::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(DangerousEngineering::getCreateTime); IPage pageList = dangerousEngineeringService.page(page, queryWrapper); return Result.success(pageList); } @@ -134,7 +135,7 @@ public class GovDangerousEngineeringController { if (dangerousEngineeringEntity == null) { result.error500("未找到对应实体"); } else { - boolean ok = dangerousEngineeringService.removeById(dangerousEngineering.getId()); + boolean ok = dangerousEngineeringService.removeInfo(dangerousEngineering); if (ok) { result.success("删除成功!"); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/DangerousEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/DangerousEngineeringController.java index 57b2710..2fbec4f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/DangerousEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/DangerousEngineeringController.java @@ -59,6 +59,7 @@ public class DangerousEngineeringController { if (StringUtils.isNotBlank(dangerousEngineering.getProjectSn())) { queryWrapper.lambda().eq(DangerousEngineering::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(DangerousEngineering::getCreateTime); IPage pageList = dangerousEngineeringService.page(page, queryWrapper); return Result.success(pageList); } @@ -137,7 +138,7 @@ public class DangerousEngineeringController { if (dangerousEngineeringEntity == null) { result.error500("未找到对应实体"); } else { - boolean ok = dangerousEngineeringService.removeById(dangerousEngineering.getId()); + boolean ok = dangerousEngineeringService.removeInfo(dangerousEngineering); if (ok) { result.success("删除成功!"); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/NoticeDto.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/NoticeDto.java index 374056f..aacc95d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/NoticeDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/NoticeDto.java @@ -1,6 +1,5 @@ package com.zhgd.xmgl.modules.basicdata.dto; -import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.basicdata.entity.NoticeAccept; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +43,7 @@ public class NoticeDto { private Integer isRead; @ApiModelProperty(value = "附件") - private List annexFileList; + private List annexFileList; @ApiModelProperty(value = "接收方信息") private List acceptList; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java index 63c0cdc..2a1ebe9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.async.AsyncAiAnalyse; import com.zhgd.xmgl.handler.exception.CustomException; +import com.zhgd.xmgl.modules.basicdata.dto.AnnexFileDto; import com.zhgd.xmgl.modules.basicdata.dto.NoticeDto; import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.basicdata.entity.Notice; @@ -26,10 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -108,16 +106,16 @@ public class NoticeServiceImpl extends ServiceImpl impleme List noticeAcceptList = noticeAcceptService.getList(notice.getNoticeId()); noticeDto.setAcceptList(noticeAcceptList); noticeDto.setAcceptSnList(noticeAcceptList.stream().map(n -> n.getAccept()).collect(Collectors.toList())); -// List annexFileDtoList = new ArrayList<>(); -// annexFileList.stream().collect(Collectors.groupingBy((a) -> a.getLabel())); -// Set label = annexFileList.stream().map(a -> a.getLabel()).collect(Collectors.toSet()); -// for (String s : label) { -// AnnexFileDto annexFileDto = new AnnexFileDto(); -// annexFileDto.setLabel(s); -// annexFileDto.setAnnexFileList(annexFileList.stream().filter(a -> a.getLabel().equals(s)).collect(Collectors.toList())); -// annexFileDtoList.add(annexFileDto); -// } - noticeDto.setAnnexFileList(annexFileList); + List annexFileDtoList = new ArrayList<>(); + annexFileList.stream().collect(Collectors.groupingBy((a) -> a.getLabel())); + Set label = annexFileList.stream().map(a -> a.getLabel()).collect(Collectors.toSet()); + for (String s : label) { + AnnexFileDto annexFileDto = new AnnexFileDto(); + annexFileDto.setLabel(s); + annexFileDto.setAnnexFileList(annexFileList.stream().filter(a -> a.getLabel().equals(s)).collect(Collectors.toList())); + annexFileDtoList.add(annexFileDto); + } + noticeDto.setAnnexFileList(annexFileDtoList); return noticeDto; } @@ -170,11 +168,16 @@ public class NoticeServiceImpl extends ServiceImpl impleme } private boolean saveDetail(NoticeVo noticeVo, Long noticeId) { - List annexFileList = noticeVo.getAnnexFileList(); - for (AnnexFile annexFile : annexFileList) { - annexFile.setRelevanceId(noticeId.toString()); - annexFile.setCreateTime(new Date()); - annexFile.setFileType(ParamEnum.AnnexFileType.NOTICE.getValue()); + List annexFileList = new ArrayList<>(); + List annexFileDtoList = noticeVo.getAnnexFileDtoList(); + for (AnnexFileDto annexFileDto : annexFileDtoList) { + for (AnnexFile annexFile : annexFileDto.getAnnexFileList()) { + annexFile.setRelevanceId(noticeId.toString()); + annexFile.setCreateTime(new Date()); + annexFile.setLabel(annexFileDto.getLabel()); + annexFile.setFileType(ParamEnum.AnnexFileType.NOTICE.getValue()); + annexFileList.add(annexFile); + } } annexFileService.saveBatch(annexFileList); List acceptList = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/NoticeVo.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/NoticeVo.java index 7dfadf0..cd4a533 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/NoticeVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/NoticeVo.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.vo; -import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; +import com.zhgd.xmgl.modules.basicdata.dto.AnnexFileDto; import com.zhgd.xmgl.modules.basicdata.entity.NoticeAccept; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,7 +25,7 @@ public class NoticeVo { private String type; @ApiModelProperty(value = "附件列表") - private List annexFileList; + private List annexFileDtoList; @ApiModelProperty(value = "收件单位") private List accepts; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IDangerousEngineeringService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IDangerousEngineeringService.java index e8cf1b4..e6d3d89 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IDangerousEngineeringService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IDangerousEngineeringService.java @@ -26,5 +26,7 @@ public interface IDangerousEngineeringService extends IService wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/DangerousEngineeringProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/DangerousEngineeringProgressServiceImpl.java index e27d104..73acd6c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/DangerousEngineeringProgressServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/DangerousEngineeringProgressServiceImpl.java @@ -36,6 +36,7 @@ public class DangerousEngineeringProgressServiceImpl extends ServiceImpl pageList(Page page, QueryWrapper wrapper) { + wrapper.lambda().orderByDesc(DangerousEngineeringProgress::getCreateTime); return baseMapper.pageList(page, wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/DangerousEngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/DangerousEngineeringServiceImpl.java index 4aac753..b226a26 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/DangerousEngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/DangerousEngineeringServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.safety.service.impl; +import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,13 +10,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.dto.DangerousEngineeringEntDto; import com.zhgd.xmgl.modules.basicdata.dto.DangerousEngineeringProjectDto; +import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; -import com.zhgd.xmgl.modules.safety.entity.DangerousEngineering; -import com.zhgd.xmgl.modules.safety.entity.DangerousEngineeringInspect; +import com.zhgd.xmgl.modules.safety.entity.*; import com.zhgd.xmgl.modules.safety.mapper.DangerousEngineeringMapper; -import com.zhgd.xmgl.modules.safety.service.IDangerousEngineeringInspectService; -import com.zhgd.xmgl.modules.safety.service.IDangerousEngineeringService; +import com.zhgd.xmgl.modules.safety.service.*; import com.zhgd.xmgl.modules.safety.statistics.DangerousEngineeringStat; import com.zhgd.xmgl.security.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -42,9 +42,21 @@ public class DangerousEngineeringServiceImpl extends ServiceImpl pageListForSuperior(Map map) { Page pageList = PageUtil.copyProperties(engineeringService.pageListForSuperior(map), DangerousEngineeringEntDto.class); @@ -77,6 +89,19 @@ public class DangerousEngineeringServiceImpl extends ServiceImpllambdaQuery() + .eq(DangerousEngineeringInspect::getDangerousEngineeringId, dangerousEngineering.getId())); + dangerousEngineeringProgressService.remove(Wrappers.lambdaQuery() + .eq(DangerousEngineeringProgress::getDangerousEngineeringId, dangerousEngineering.getId())); + dangerousEngineeringProgrammeService.remove(Wrappers.lambdaQuery() + .eq(DangerousEngineeringProgramme::getDangerousEngineeringId, dangerousEngineering.getId())); + dangerousEngineeringCheckAcceptService.remove(Wrappers.lambdaQuery() + .eq(DangerousEngineeringCheckAccept::getDangerousEngineeringId, dangerousEngineering.getId())); + return this.removeById(dangerousEngineering.getId()); + } + @Override public DangerousEngineeringStat stat(QueryWrapper wrapper) { List list = this.list(wrapper); @@ -85,9 +110,9 @@ public class DangerousEngineeringServiceImpl extends ServiceImpl dangerousEngineeringInspectList = dangerousEngineeringInspectService.list(Wrappers.lambdaQuery() .between(DangerousEngineeringInspect::getInspectTime, DateUtil.beginOfMonth(new Date()), DateUtil.endOfMonth(new Date())) .in(DangerousEngineeringInspect::getDangerousEngineeringId, list.stream().map(l -> l.getId()).collect(Collectors.toList()))); - dangerousEngineeringStat.setBuilding(list.stream().filter(l -> DateUtil.compare(l.getConstructionStartTime(), new Date()) < 0 && - DateUtil.compare(l.getConstructionEndTime(), new Date()) > 0).collect(Collectors.toList()).size()); - dangerousEngineeringStat.setSiteNum(list.stream().map(l -> l.getConstructionLocation()).distinct().collect(Collectors.toList()).size()); + dangerousEngineeringStat.setBuilding(list.stream().filter(l -> DateUtil.compare(l.getConstructionStartTime(), new Date(), DatePattern.NORM_DATE_PATTERN) <= 0 && + DateUtil.compare(l.getConstructionEndTime(), new Date(), DatePattern.NORM_DATE_PATTERN) >= 0).collect(Collectors.toList()).size()); + dangerousEngineeringStat.setSiteNum(list.stream().map(l -> l.getConstructionLocation()).distinct().collect(Collectors.toList()).size()); dangerousEngineeringStat.setCheckNumber(dangerousEngineeringInspectList.size()); dangerousEngineeringStat.setQuestionNum(dangerousEngineeringInspectList.stream().filter(e -> e.getQuestion() != 0).collect(Collectors.toList()).size()); BigDecimal checkNum = new BigDecimal(dangerousEngineeringInspectList.stream().map(d -> d.getDangerousEngineeringId()).distinct().collect(Collectors.toList()).size()); diff --git a/src/main/java/com/zhgd/xmgl/util/DateUtils.java b/src/main/java/com/zhgd/xmgl/util/DateUtils.java index 43dfcb3..a6726ef 100644 --- a/src/main/java/com/zhgd/xmgl/util/DateUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/DateUtils.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.util; +import cn.hutool.core.date.DatePattern; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.DayOfWeek; @@ -20,13 +22,13 @@ public class DateUtils { public static String start(String time) { Date date = cn.hutool.core.date.DateUtil.parse(time); Date beginOfDay = cn.hutool.core.date.DateUtil.beginOfDay(date); - return cn.hutool.core.date.DateUtil.format(beginOfDay, "yyyy-MM-dd HH:mm:ss"); + return cn.hutool.core.date.DateUtil.format(beginOfDay, DatePattern.NORM_DATETIME_PATTERN); } public static String end(String time) { Date date = cn.hutool.core.date.DateUtil.parse(time); Date endOfDay = cn.hutool.core.date.DateUtil.endOfDay(date); - return cn.hutool.core.date.DateUtil.format(endOfDay, "yyyy-MM-dd HH:mm:ss"); + return cn.hutool.core.date.DateUtil.format(endOfDay, DatePattern.NORM_DATETIME_PATTERN); } public static void main(String[] args) {