From c03cfd052348f0f83655b942e1564597da301ec1 Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期一, 04 九月 2023 17:50:19 +0800
Subject: [PATCH] freemarker配置
---
src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionHiddenDangerServiceImpl.java | 106 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 60 insertions(+), 46 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 311197d..95386fa 100644
--- a/src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionHiddenDangerServiceImpl.java
+++ b/src/main/java/com/gk/hotwork/Service/ServiceImpl/InspectionHiddenDangerServiceImpl.java
@@ -4,17 +4,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gk.hotwork.Domain.*;
+import com.gk.hotwork.Domain.Do.CompanyInspectionCountDO;
import com.gk.hotwork.Domain.Do.SafetySelfInspectionItemQualifiedCountDO;
import com.gk.hotwork.Domain.Exception.BusinessException;
-import com.gk.hotwork.Domain.InspectionExpert;
-import com.gk.hotwork.Domain.InspectionHiddenDanger;
-import com.gk.hotwork.Domain.SafetySelfInspection;
-import com.gk.hotwork.Domain.UserInfo;
import com.gk.hotwork.Domain.Utils.PageInfo;
import com.gk.hotwork.Domain.Utils.StringUtils;
import com.gk.hotwork.Domain.dto.resp.InspectionHiddenDangerRespDTO;
+import com.gk.hotwork.Domain.query.CountQuery;
import com.gk.hotwork.Mapper.InspectionExpertMapper;
import com.gk.hotwork.Mapper.InspectionHiddenDangerMapper;
+import com.gk.hotwork.Service.AttachmentInfoService;
import com.gk.hotwork.Service.InspectionExpertService;
import com.gk.hotwork.Service.InspectionHiddenDangerService;
import org.apache.commons.collections4.CollectionUtils;
@@ -41,6 +41,9 @@
@Autowired
private InspectionHiddenDangerMapper inspectionHiddenDangerMapper;
+ @Autowired
+ private AttachmentInfoService attachmentInfoService;
+
/**
* 修改
* @param inspectionHiddenDanger
@@ -49,9 +52,25 @@
@Override
public void mod(InspectionHiddenDanger inspectionHiddenDanger, UserInfo userInfo) {
modrequiredVerification(inspectionHiddenDanger);
+
+ StringBuffer stringBuffer = new StringBuffer();
+ //附件
+ if(CollectionUtils.isNotEmpty(inspectionHiddenDanger.getRattachmentList())){
+ for (AttachmentInfo attachmentInfo : inspectionHiddenDanger.getRattachmentList()) {
+ attachmentInfo.setBusinessId(inspectionHiddenDanger.getId());
+ stringBuffer.append(attachmentInfo.getId().toString()).append(",");
+ }
+ stringBuffer = stringBuffer.deleteCharAt(stringBuffer.length()-1);
+ }
+
inspectionHiddenDanger.setUpdateTime(new Date());
inspectionHiddenDanger.setUpdateBy(userInfo.getRealname());
+ inspectionHiddenDanger.setRectificationUrl(stringBuffer.toString());
inspectionHiddenDangerMapper.updateById(inspectionHiddenDanger);
+ //更新附件
+ if(CollectionUtils.isNotEmpty(inspectionHiddenDanger.getRattachmentList())){
+ attachmentInfoService.updateBusinessIdBatch(inspectionHiddenDanger.getRattachmentList());
+ }
}
/**
@@ -64,6 +83,7 @@
inspectionHiddenDanger.setUpdateBy(userInfo.getRealname());
inspectionHiddenDanger.setUpdateTime(new Date());
inspectionHiddenDangerMapper.delByInspectionItemId(inspectionHiddenDanger);
+
}
@Override
@@ -107,52 +127,47 @@
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;
+
+ }
+
+ /**
+ * 统计
+ * @param query
+ * @return
+ */
+ @Override
+ public List<CompanyInspectionCountDO> getStatisticHiddenDanger(CountQuery query) {
+
+ return inspectionHiddenDangerMapper.getStatisticHiddenDanger(query);
}
private void modrequiredVerification(InspectionHiddenDanger inspectionHiddenDanger){
@@ -163,7 +178,6 @@
if(danger.getStatus().equals((byte) 1)){
throw new BusinessException("已整改不可再修改");
}
- if (StringUtils.isBlank(inspectionHiddenDanger.getInfo())) throw new BusinessException("请填写隐患描述");
if (inspectionHiddenDanger.getLevel() == null) throw new BusinessException("请选择隐患等级");
if (inspectionHiddenDanger.getStatus() == null) throw new BusinessException("整改状态不可为空");
}
--
Gitblit v1.9.2