From cc3ddfda6bfb9a2aa0cd55073e8864320daf1f20 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期四, 27 七月 2023 14:13:38 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionHiddenDangerServiceImpl.java | 78 +++++++++++++++-----------------------
1 files changed, 31 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionHiddenDangerServiceImpl.java b/src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionHiddenDangerServiceImpl.java
index ff755c1..854ebd0 100644
--- a/src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionHiddenDangerServiceImpl.java
+++ b/src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionHiddenDangerServiceImpl.java
@@ -53,8 +53,8 @@
StringBuffer stringBuffer = new StringBuffer();
//附件
- if(CollectionUtils.isNotEmpty(inspectionHiddenDanger.getAttachmentList())){
- for (AttachmentInfo attachmentInfo : inspectionHiddenDanger.getAttachmentList()) {
+ if(CollectionUtils.isNotEmpty(inspectionHiddenDanger.getRattachmentList())){
+ for (AttachmentInfo attachmentInfo : inspectionHiddenDanger.getRattachmentList()) {
attachmentInfo.setBusinessId(inspectionHiddenDanger.getId());
stringBuffer.append(attachmentInfo.getId().toString()).append(",");
}
@@ -63,12 +63,11 @@
inspectionHiddenDanger.setUpdateTime(new Date());
inspectionHiddenDanger.setUpdateBy(userInfo.getRealname());
- inspectionHiddenDanger.setUrl(stringBuffer.toString());
+ inspectionHiddenDanger.setRectificationUrl(stringBuffer.toString());
inspectionHiddenDangerMapper.updateById(inspectionHiddenDanger);
//更新附件
- if(CollectionUtils.isNotEmpty(inspectionHiddenDanger.getAttachmentList())){
- attachmentInfoService.updateBusinessIdBatch(inspectionHiddenDanger.getAttachmentList());
-
+ if(CollectionUtils.isNotEmpty(inspectionHiddenDanger.getRattachmentList())){
+ attachmentInfoService.updateBusinessIdBatch(inspectionHiddenDanger.getRattachmentList());
}
}
@@ -82,6 +81,7 @@
inspectionHiddenDanger.setUpdateBy(userInfo.getRealname());
inspectionHiddenDanger.setUpdateTime(new Date());
inspectionHiddenDangerMapper.delByInspectionItemId(inspectionHiddenDanger);
+
}
@Override
@@ -125,52 +125,36 @@
params.put("city",user.getCity());
params.put("area",user.getCounty());
}
- IPage<SafetySelfInspection> res = inspectionHiddenDangerMapper.selectPages(page, params);
- List<SafetySelfInspection> records = res.getRecords();
- if (CollectionUtils.isNotEmpty(records)){
- for (SafetySelfInspection inspection : records) {
- List<InspectionHiddenDanger> dangerList = this.getBySafetySelfInspectionId(inspection.getId());
- //一般 1
- int sameasCount = 0;
- //重大 2
- int majorCount = 0;
- //总数
- int totalCount = 0;
- //未整改数量
- int unRectifyCount = 0;
-
- for (InspectionHiddenDanger inspectionHiddenDanger : dangerList) {
- if (inspectionHiddenDanger.getLevel().equals(1)) {
- sameasCount += 1;
- }else {
- majorCount += 1;
- }
- if(inspectionHiddenDanger.getStatus().equals((byte) 0)){
- unRectifyCount += 1;
- }
- totalCount += 1;
- }
-
- inspection.setSameAsCount(sameasCount);
- inspection.setMajorCount(majorCount);
- inspection.setHdTocalCount(totalCount);
- if(unRectifyCount == 0){
- inspection.setRectificationStatus(2);
- }else if(unRectifyCount == totalCount){
- inspection.setRectificationStatus(0);
- }else {
- inspection.setRectificationStatus(1);
- }
-
- }
- res.setRecords(records);
- }
+ IPage<SafetySelfInspectionDO> res = inspectionHiddenDangerMapper.selectPages(page, params);
return res;
}
@Override
public List<InspectionHiddenDanger> inspectionHdangerlist(Long selfInspectionId) {
- return inspectionHiddenDangerMapper.inspectionHdangerlist(selfInspectionId);
+
+ List<InspectionHiddenDanger> inspectionHiddenDangerList = inspectionHiddenDangerMapper.inspectionHdangerlist(selfInspectionId);
+ for (InspectionHiddenDanger inspectionHiddenDanger : inspectionHiddenDangerList) {
+ if(StringUtils.isNotBlank(inspectionHiddenDanger.getRectificationUrl())){
+ List<Long> idList = new ArrayList<>();
+ String[] split = inspectionHiddenDanger.getRectificationUrl().split(",");
+ for (String s : split) {
+ idList.add(Long.valueOf(s));
+ }
+ List<AttachmentInfo> byIds = attachmentInfoService.findByIds(idList);
+ inspectionHiddenDanger.setRattachmentList(byIds);
+ }
+ if(StringUtils.isNotBlank(inspectionHiddenDanger.getUrl())){
+ List<Long> idList = new ArrayList<>();
+ String[] split = inspectionHiddenDanger.getUrl().split(",");
+ for (String s : split) {
+ idList.add(Long.valueOf(s));
+ }
+ List<AttachmentInfo> byIds = attachmentInfoService.findByIds(idList);
+ inspectionHiddenDanger.setAttachmentList(byIds);
+ }
+ }
+ return inspectionHiddenDangerList;
+
}
private void modrequiredVerification(InspectionHiddenDanger inspectionHiddenDanger){
--
Gitblit v1.9.2