From 7f89db04cc75a842352087099ee6a7431b7357e0 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 09 十二月 2025 15:12:24 +0800
Subject: [PATCH] 修改返回所有数据
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityDecomposeServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 0664671..5839478 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
@@ -10,6 +10,7 @@
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;
@@ -42,7 +43,7 @@
@Override
public CommonPage selectQualityDecomposeList(QualityReq qualityReq) {
- if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ if (!SecurityUtils.adminUser()){
if (qualityReq.getCompanyId()==null){
throw new ApiException("非管理员，查询条件不可为空");
}
@@ -51,6 +52,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,17 +76,14 @@
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();
}
@Override
public CommonResult updateQualityDecompose(DecomposeTargetReq decomposeTargetReq) {
- List<QualityDecompose> qualityDecomposes = qualityDecomposeMapper.selectByCompanyId(decomposeTargetReq.getQualityId());
- if (qualityDecomposes.size()>0){
- throw new ApiException("当前企业已有数据，请删除后重试");
- }
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
decomposeTargetReq.setUpdateBy(loginUser.getUsername());
decomposeTargetReq.setCreateTime(LocalDateTime.now());
@@ -89,7 +91,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