From ab0682fb16c1cd1d1f1b054184296bbaae158d2b Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Mon, 22 Dec 2025 16:45:44 +0800
Subject: [PATCH] 修改合同评审
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityDecomposeServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityDecomposeServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityDecomposeServiceImpl.java
index 562054f..60e8153 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityDecomposeServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityDecomposeServiceImpl.java
@@ -7,9 +7,9 @@
import com.gkhy.exam.common.exception.ApiException;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
-import com.gkhy.exam.system.domain.Quality;
import com.gkhy.exam.system.domain.QualityDecompose;
import com.gkhy.exam.system.domain.QualityTarget;
+import com.gkhy.exam.system.domain.QualityTargetMess;
import com.gkhy.exam.system.domain.req.DecomposeTargetReq;
import com.gkhy.exam.system.domain.req.QualityReq;
import com.gkhy.exam.system.domain.vo.QualityDecomposeVo;
@@ -17,8 +17,6 @@
import com.gkhy.exam.system.mapper.QualityMapper;
import com.gkhy.exam.system.mapper.QualityTargetMapper;
import com.gkhy.exam.system.service.QualityDecomposeService;
-import com.gkhy.exam.system.service.QualityService;
-import com.gkhy.exam.system.service.QualityTargetService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,7 +40,7 @@
@Override
public CommonPage selectQualityDecomposeList(QualityReq qualityReq) {
- if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ if (!SecurityUtils.adminUser()){
if (qualityReq.getCompanyId()==null){
throw new ApiException("非管理员，查询条件不可为空");
}
@@ -51,6 +49,10 @@
List<QualityDecomposeVo> qualityDecomposeVos = qualityDecomposeMapper.selectDecomposeList(qualityReq);
for (QualityDecomposeVo qualityDecomposeVo : qualityDecomposeVos) {
List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityDecomposeVo.getQualityId());
+ for (QualityTarget qualityTarget : qualityTargets) {
+ List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
+ qualityTarget.setQualityTargetMesses(qualityTargetMesses);
+ }
qualityDecomposeVo.setQualityTargets(qualityTargets);
}
return CommonPage.restPage(qualityDecomposeVos);
@@ -71,8 +73,9 @@
for (QualityTarget qualityTarget : qualityTargets) {
qualityTarget.setCreateTime(LocalDateTime.now());
qualityTarget.setCreateBy(loginUser.getUsername());
+ qualityTargetMapper.insertQualityTargetMess(qualityTarget.getQualityTargetMesses());
}
- qualityTargetMapper.updateQualityTargetById(qualityTargets);
+// qualityTargetMapper.updateQualityTargetById(qualityTargets);
return CommonResult.success();
}
@@ -85,7 +88,11 @@
BeanUtils.copyProperties(decomposeTargetReq,qualityDecompose);
qualityDecomposeMapper.updateById(qualityDecompose);
List<QualityTarget> qualityTargets = decomposeTargetReq.getQualityTargets();
- qualityTargetMapper.updateQualityTargetById(qualityTargets);
+ for (QualityTarget qualityTarget : qualityTargets) {
+ qualityTargetMapper.deletedByQualityTargetId(qualityTarget.getId());
+ qualityTargetMapper.insertQualityTargetMess(qualityTarget.getQualityTargetMesses());
+ }
+// qualityTargetMapper.updateQualityTargetById(qualityTargets);
return CommonResult.success();
}
--
Gitblit v1.9.2