From 161e9bd529cb7c4afffb7e6b5f71f12fb2d60621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Tue, 11 Mar 2025 13:40:53 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=8F=90=E9=98=B2v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/common/enums/DfYhV2StatusEnum.java | 2 + .../df/domain/DfCheckingV2ProjectItem.java | 2 +- .../java/com/kms/yxgh/df/domain/DfYhV2.java | 6 +-- .../service/DfCheckingProblemV2Service.java | 8 ++-- .../df/service/DfCheckingRecordV2Service.java | 44 +++++++++---------- .../yxgh/df/service/DfCheckingV2Service.java | 12 ++--- .../kms/yxgh/df/service/DfYhV2Service.java | 38 +++++++++------- 7 files changed, 58 insertions(+), 54 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java index 926a2404..85a54655 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java @@ -9,6 +9,8 @@ public enum DfYhV2StatusEnum { INSPECTED("已巡检", "2"), UNDER_MAINTENANCE("养护中", "3"), NO_DEFECTS("无缺陷", "4"), + YES_UNDER("已养护", "6"), + ACCEPTED("已验收", "5"); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectItem.java index 30bfac0c..e3010d5f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectItem.java @@ -23,7 +23,7 @@ public class DfCheckingV2ProjectItem extends SyBaseEntity { * 项目id */ @ApiModelProperty("项目id") - private Integer checkingId; + private String checkingId; /** * 检查部位 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java index d866bd6c..07d6dad4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java @@ -61,7 +61,7 @@ public class DfYhV2 extends SyBaseEntity { * 问题等级 */ @ApiModelProperty("问题等级") - private String issueLevel; + private String problemLevel; /** @@ -112,7 +112,7 @@ public class DfYhV2 extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("维养开始时间") - private Date startTime; + private Date startDate; /** * 维养结束时间 @@ -132,7 +132,7 @@ public class DfYhV2 extends SyBaseEntity { * 问题位置 */ @ApiModelProperty("问题位置") - private String problemLocation; + private String location; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java index b3e3a0cf..b5ae64a5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java @@ -59,12 +59,12 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.like(DfCheckingProblemV2::getStatus, status)); Optional.ofNullable(data.getStartDate()) - .filter(startTime -> startTime != null) - .ifPresent(startTime -> queryWrapper.ge(DfCheckingProblemV2::getCreateTime, startTime)); + .filter(startDate -> startDate != null) + .ifPresent(startDate -> queryWrapper.ge(DfCheckingProblemV2::getStartDate, startDate)); Optional.ofNullable(data.getEndDate()) - .filter(endTime -> endTime != null) - .ifPresent(endTime -> queryWrapper.le(DfCheckingProblemV2::getEndTime, endTime)); + .filter(endDate -> endDate != null) + .ifPresent(endDate -> queryWrapper.le(DfCheckingProblemV2::getEndDate, endDate)); Optional.ofNullable(data.getProblemLevel()) .filter(StringUtils::isNotBlank) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java index caa952e0..69711dfe 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java @@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; -import com.kms.yxgh.df.domain.DfCheckingProblemV2; -import com.kms.yxgh.df.domain.DfCheckingRecord; -import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; -import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; +import com.kms.yxgh.df.domain.*; import com.kms.yxgh.df.dto.DfCheckingDetailDto; import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; @@ -38,6 +35,8 @@ import java.util.stream.Collectors; @AllArgsConstructor public class DfCheckingRecordV2Service extends BaseService { + private final DfYhV2Service dfYhV2Service; + private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service; @@ -71,12 +70,12 @@ public class DfCheckingRecordV2Service extends BaseService queryWrapper.like(DfCheckingRecord::getStatus, status)); Optional.ofNullable(data.getStartDate()) - .filter(startTime -> startTime != null) - .ifPresent(startTime -> queryWrapper.ge(DfCheckingRecord::getCreateTime, startTime)); + .filter(startDate -> startDate != null) + .ifPresent(startDate -> queryWrapper.ge(DfCheckingRecord::getStartDate, startDate)); Optional.ofNullable(data.getEndDate()) - .filter(endTime -> endTime != null) - .ifPresent(endTime -> queryWrapper.le(DfCheckingRecord::getCreateTime, endTime)); + .filter(endDate -> endDate != null) + .ifPresent(endDate -> queryWrapper.le(DfCheckingRecord::getEndDate, endDate)); } @@ -121,6 +120,7 @@ public class DfCheckingRecordV2Service extends BaseService sp=new SearchParam<>(); DfRecordSearchV2Dto searchV2Dto=new DfRecordSearchV2Dto(); + assert dfCheckingRecord != null; searchV2Dto.setRecordId(dfCheckingRecord.getId()); sp.setData(searchV2Dto); sp.setPageSize(Integer.MAX_VALUE); @@ -132,7 +132,6 @@ public class DfCheckingRecordV2Service extends BaseService().in(DfCheckingProblemV2::getId,ids)); + dfYhV2Service.remove(new LambdaQueryWrapper().in(DfYhV2::getDefectId,ids)); } } public static List convertToImages(List dtoList) { List dfCheckingProblemV2s = new ArrayList<>(); - dtoList.stream().forEach(e->{ + dtoList.forEach(e->{ DfCheckingProblemV2 dfCheckingProblemV2=new DfCheckingProblemV2(); BeanUtils.copyProperties(e,dfCheckingProblemV2); - dfCheckingProblemV2.setDoc(e.getProblemImages().stream().collect(Collectors.joining(","))); + dfCheckingProblemV2.setDoc(String.join(",", e.getProblemImages())); }); return dfCheckingProblemV2s; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java index f94f44cc..e41dcee9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java @@ -124,7 +124,7 @@ public class DfCheckingV2Service extends BaseService items = dfCheckingV2ProjectItemV2Service.list( @@ -156,7 +156,7 @@ public class DfCheckingV2Service extends BaseService projectItems = items.parallelStream() // 使用并行流 .map(item -> { DfCheckingV2ProjectItem projectItem = new DfCheckingV2ProjectItem(); - projectItem.setCheckingId(Integer.valueOf(dfCheckingV2ProjectManage.getId())); + projectItem.setCheckingId(dfCheckingV2ProjectManage.getId()); projectItem.setContent(item.getContent()); projectItem.setParts(String.join(",", item.getParts())); return projectItem; @@ -196,7 +196,7 @@ public class DfCheckingV2Service extends BaseService { DfCheckingV2ProjectItem projectItem = new DfCheckingV2ProjectItem(); projectItem.setId(item.getId()); - projectItem.setCheckingId(Integer.valueOf(dfCheckingV2ProjectManage.getId())); + projectItem.setCheckingId(dfCheckingV2ProjectManage.getId()); projectItem.setContent(item.getContent()); projectItem.setParts(String.join(",", item.getParts())); return projectItem; @@ -213,12 +213,6 @@ public class DfCheckingV2Service extends BaseService 0) { - int count = dfCheckingV2ProjectItemV2Service.count(new LambdaQueryWrapper() - .in(DfCheckingV2ProjectItem::getCheckingId, getIntList(ids)) - ); - if (count > 0) { - throw new RuntimeException("请先删除项目子项"); - } dfCheckingV2ProjectItemV2Service.remove(new LambdaQueryWrapper() .in(DfCheckingV2ProjectItem::getCheckingId, getIntList(ids))); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java index 492bcbee..e6869d9d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java @@ -1,6 +1,7 @@ package com.kms.yxgh.df.service; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,10 +12,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.common.ApprovalStatusEnum; import com.kms.yxgh.common.dto.ApprovalDetailDto; import com.kms.yxgh.common.dto.ApprovalSearchDto; +import com.kms.yxgh.common.enums.DfYhV2StatusEnum; import com.kms.yxgh.common.service.DefaultApprovalBusinessService; import com.kms.yxgh.common.dto.DocV2Dto; -import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; -import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; import com.kms.yxgh.df.domain.DfYhV2; import com.kms.yxgh.df.dto.v2.*; import com.kms.yxgh.df.mapper.DfYhV2Mapper; @@ -67,16 +67,20 @@ public class DfYhV2Service extends DefaultApprovalBusinessService queryWrapper.like(DfYhV2::getStatus, status)); Optional.ofNullable(data.getStartDate()) - .filter(startTime -> startTime != null) - .ifPresent(startTime -> queryWrapper.ge(DfYhV2::getCreateTime, startTime)); + .filter(startDate -> startDate != null) + .ifPresent(startDate -> queryWrapper.ge(DfYhV2::getStartDate, startDate)); + + Optional.ofNullable(data.getEndDate()) + .filter(endDate -> endDate != null) + .ifPresent(endDate -> queryWrapper.ge(DfYhV2::getEndDate, endDate)); Optional.ofNullable(data.getProblemLevel()) - .filter(problemLevel -> problemLevel != null) - .ifPresent(problemLevel -> queryWrapper.le(DfYhV2::getIssueLevel, problemLevel)); + .filter(StringUtils::isNotBlank) + .ifPresent(problemLevel -> queryWrapper.le(DfYhV2::getProblemLevel, problemLevel)); Optional.ofNullable(data.getRecordId()) - .filter(StringUtils::isNotBlank) - .ifPresent(recordId -> queryWrapper.eq(DfYhV2::getIssueLevel, recordId)); + .filter(StringUtils::isBlank) + .ifPresent(recordId -> queryWrapper.eq(DfYhV2::getRecordId, recordId)); } @@ -108,7 +112,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService