From a8a6760635f0642a2cbf61854b5587d9d0944985 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 11 七月 2025 17:20:36 +0800
Subject: [PATCH] 新功能加问题修复
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java
index b90911f..210e558 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java
@@ -1,5 +1,7 @@
package com.gkhy.exam.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
@@ -8,12 +10,10 @@
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.CompanyBasic;
-import com.gkhy.exam.system.domain.Quality;
-import com.gkhy.exam.system.domain.QualityTarget;
-import com.gkhy.exam.system.domain.SysCompany;
+import com.gkhy.exam.system.domain.*;
import com.gkhy.exam.system.domain.req.QualityTargetReq;
import com.gkhy.exam.system.domain.vo.QualityTargetVo;
+import com.gkhy.exam.system.mapper.QualityDecomposeMapper;
import com.gkhy.exam.system.mapper.QualityMapper;
import com.gkhy.exam.system.mapper.QualityTargetMapper;
import com.gkhy.exam.system.mapper.SysDeptMapper;
@@ -23,8 +23,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.sql.Wrapper;
import java.time.LocalDateTime;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
@Service
@@ -35,6 +38,8 @@
@Autowired
private QualityTargetMapper qualityTargetMapper;
@Autowired
+ private QualityDecomposeMapper qualityDecomposeMapper;
+ @Autowired
private SysCompanyService sysCompanyService;
@Autowired
private SysDeptMapper sysDeptMapper;
@@ -42,7 +47,7 @@
@Override
public CommonPage selectQualityList(Quality quality) {
boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
- if (!admin){
+ if (!SecurityUtils.adminUser()){
if (quality.getCompanyId()==null){
throw new RuntimeException("非管理员操作，查询条件不可为空");
}
@@ -51,6 +56,10 @@
List<QualityTargetVo> qualityTargetVos = qualityMapper.selectQualityTarget(quality);
for (QualityTargetVo qualityTargetVo : qualityTargetVos) {
List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityTargetVo.getId());
+ for (QualityTarget qualityTarget : qualityTargets) {
+ List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
+ qualityTarget.setQualityTargetMesses(qualityTargetMesses);
+ }
qualityTargetVo.setQualityTargets(qualityTargets);
}
return CommonPage.restPage(qualityTargetVos);
@@ -93,7 +102,7 @@
public CommonResult updateQuality(QualityTargetReq qualityTargetReq) {
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
List<QualityTarget> qualityTargets = qualityTargetReq.getQualityTargets();
- List<Integer> collect = qualityTargets.stream().map(QualityTarget::getQualityId).collect(Collectors.toList());
+// List<Integer> collect = qualityTargets.stream().map(QualityTarget::getQualityId).collect(Collectors.toList());
Quality quality = new Quality();
BeanUtils.copyProperties(qualityTargetReq,quality);
//获取对应企业
@@ -102,7 +111,7 @@
quality.setUpdateBy(loginUser.getUsername());
quality.setUpdateTime(LocalDateTime.now());
int insert = qualityMapper.updateQualityById(quality);
- qualityTargetMapper.deleteByQualityIds(collect);
+ qualityTargetMapper.deleteByQualityIds(qualityTargetReq.getId());
for (QualityTarget qualityTarget : qualityTargets) {
qualityTarget.setQualityId(quality.getId());
qualityTarget.setCompanyId(qualityTargetReq.getCompanyId());
@@ -133,6 +142,10 @@
List<QualityTargetVo> qualityTargetVos = qualityMapper.selectQualityTarget(quality);
for (QualityTargetVo qualityTargetVo : qualityTargetVos) {
List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityTargetVo.getId());
+ for (QualityTarget qualityTarget : qualityTargets) {
+ List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
+ qualityTarget.setQualityTargetMesses(qualityTargetMesses);
+ }
qualityTargetVo.setQualityTargets(qualityTargets);
}
return CommonResult.success(qualityTargetVos);
--
Gitblit v1.9.2