From f84f28a824fde14acd2bd91cff054de44beafbb7 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期五, 27 六月 2025 15:17:19 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/resources/mapper/system/CompanyQualityPolicyMapper.xml | 27 ++--
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java | 17 ++
multi-system/src/main/resources/mapper/system/CompanyBasicMapper.xml | 41 ++++----
multi-system/src/main/resources/mapper/system/CompanyCertificateMapper.xml | 35 +++---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityDecomposeServiceImpl.java | 4
multi-system/src/main/resources/mapper/system/CompanySummaryMapper.xml | 27 ++--
multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityDecomposeMapper.java | 2
multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml | 6 +
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityAccomplishServiceImpl.java | 4
multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyQualityPolicyServiceImpl.java | 25 +++++
multi-system/src/main/resources/mapper/system/QualityMapper.xml | 94 +++++++++---------
multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanySummaryServiceImpl.java | 4
multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml | 3
multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyBasicServiceImpl.java | 4
14 files changed, 178 insertions(+), 115 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityDecomposeMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityDecomposeMapper.java
index f3023fd..7b25b2e 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityDecomposeMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityDecomposeMapper.java
@@ -1,6 +1,7 @@
package com.gkhy.exam.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gkhy.exam.system.domain.Quality;
import com.gkhy.exam.system.domain.QualityDecompose;
import com.gkhy.exam.system.domain.req.DecomposeTargetReq;
import com.gkhy.exam.system.domain.req.QualityReq;
@@ -17,4 +18,5 @@
int insertDecompose(DecomposeTargetReq decomposeTargetReq);
+ List<Integer> selectByDelFlag();
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyBasicServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyBasicServiceImpl.java
index 28936bf..ca36ea6 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyBasicServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyBasicServiceImpl.java
@@ -63,6 +63,10 @@
@Override
public CommonResult updateCompanyBasic(CompanyBasic companyBasic) {
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
+ List<CompanyBasic> companyBasics = companyBasicMapper.selectCompanyBasicList(companyBasic.getCompanyId());
+ if (companyBasics.size()>0){
+ throw new ApiException("当前企业已有相关数据，请删除原有数据后重试");
+ }
SysCompany sysCompany = sysCompanyService.selectCompanyById(Long.valueOf(companyBasic.getCompanyId()));
companyBasic.setCompanyName(sysCompany.getName());
companyBasic.setUpdateBy(loginUser.getUsername());
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyQualityPolicyServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyQualityPolicyServiceImpl.java
index e494c8e..01f5761 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyQualityPolicyServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanyQualityPolicyServiceImpl.java
@@ -27,6 +27,11 @@
@Autowired
private SysCompanyService sysCompanyService;
+ /**
+ * 质量方针列表
+ * @param companyId
+ * @return
+ */
@Override
public CommonPage selectCompanyQualityPolicyList(Integer companyId) {
boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
@@ -40,6 +45,11 @@
return CommonPage.restPage(companyQualityPolicies);
}
+ /**
+ * 质量方针新增
+ * @param companyQualityPolicy
+ * @return
+ */
@Override
public CommonResult insertCompanyQualityPolicy(CompanyQualityPolicy companyQualityPolicy) {
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
@@ -58,9 +68,18 @@
return CommonResult.failed();
}
+ /**
+ * 质量方针修改
+ * @param companyQualityPolicy
+ * @return
+ */
@Override
public CommonResult updateCompanyQualityPolicy(CompanyQualityPolicy companyQualityPolicy) {
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
+ List<CompanyQualityPolicy> companyQualityPolicies = companyQualityPolicyMapper.selectCompanyQualityPolicyList(companyQualityPolicy.getCompanyId());
+ if (companyQualityPolicies.size()>0){
+ throw new ApiException("当前企业已有相关数据，请删除原有数据后重试");
+ }
SysCompany sysCompany = sysCompanyService.selectCompanyById(Long.valueOf(companyQualityPolicy.getCompanyId()));
companyQualityPolicy.setCompanyName(sysCompany.getName());
companyQualityPolicy.setUpdateBy(loginUser.getUsername());
@@ -72,9 +91,15 @@
return CommonResult.failed();
}
+ /**
+ * 质量方针删除
+ * @param qualityPolicyId
+ * @return
+ */
@Override
public CommonResult deletedCompanyQualityPolicy(Integer qualityPolicyId) {
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
+ //封装删除对象
CompanyQualityPolicy companyQualityPolicy = new CompanyQualityPolicy();
companyQualityPolicy.setId(qualityPolicyId);
companyQualityPolicy.setUpdateBy(loginUser.getUsername());
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanySummaryServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanySummaryServiceImpl.java
index 4153a6b..4f7549a 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanySummaryServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CompanySummaryServiceImpl.java
@@ -62,6 +62,10 @@
@Override
public CommonResult updateCompanySummary(CompanySummary companySummary) {
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
+ List<CompanySummary> companySummaries = companySummaryMapper.selectCompanySummaryList(companySummary.getCompanyId());
+ if (companySummaries.size()>0){
+ throw new ApiException("当前企业已有相关数据，请删除原有数据后重试");
+ }
SysCompany sysCompany = sysCompanyService.selectCompanyById(Long.valueOf(companySummary.getCompanyId()));
companySummary.setCompanyName(sysCompany.getName());
companySummary.setUpdateBy(loginUser.getUsername());
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityAccomplishServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityAccomplishServiceImpl.java
index e34a398..a5dd76b 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityAccomplishServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityAccomplishServiceImpl.java
@@ -68,6 +68,10 @@
@Override
public CommonResult updateQualityAccomplish(QualityAccomplish qualityAccomplish) {
+ List<QualityAccomplish> qualityAccomplishes = qualityAccomplishMapper.selectByQualityId(qualityAccomplish.getQualityId());
+ if (qualityAccomplishes.size()>0){
+ throw new ApiException("当前质量目标完成情况已存在");
+ }
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
qualityAccomplish.setUpdateTime(LocalDateTime.now());
qualityAccomplish.setUpdateBy(loginUser.getUsername());
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..0664671 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
@@ -78,6 +78,10 @@
@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());
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..18d3bd5 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
@@ -34,6 +37,8 @@
private QualityMapper qualityMapper;
@Autowired
private QualityTargetMapper qualityTargetMapper;
+ @Autowired
+ private QualityDecomposeMapper qualityDecomposeMapper;
@Autowired
private SysCompanyService sysCompanyService;
@Autowired
@@ -91,6 +96,10 @@
@Override
public CommonResult updateQuality(QualityTargetReq qualityTargetReq) {
+ List<Quality> qualities = qualityMapper.selectQualityByType(qualityTargetReq);
+ if (qualities.size()>0){
+ throw new ApiException("企业下已有相关数据，请删除后重试，或进行修改");
+ }
LoginUserDetails loginUser = SecurityUtils.getLoginUser();
List<QualityTarget> qualityTargets = qualityTargetReq.getQualityTargets();
List<Integer> collect = qualityTargets.stream().map(QualityTarget::getQualityId).collect(Collectors.toList());
diff --git a/multi-system/src/main/resources/mapper/system/CompanyBasicMapper.xml b/multi-system/src/main/resources/mapper/system/CompanyBasicMapper.xml
index 2251334..feb4ff3 100644
--- a/multi-system/src/main/resources/mapper/system/CompanyBasicMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/CompanyBasicMapper.xml
@@ -55,30 +55,31 @@
<select id="selectCompanyBasicList" resultType="com.gkhy.exam.system.domain.CompanyBasic">
SELECT
- `id`,
- `company_id`,
- `company_name`,
- `basic`,
- `introduce`,
- `target`,
- `quality`,
- `activity`,
- `audit`,
- `epiboly`,
- `resource`,
- `del_flag`,
- `create_by`,
- `create_time`,
- `update_by`,
- `update_time`
+ cb.`id`,
+ cb.`company_id`,
+ sc.`name` as company_name,
+ cb.`basic`,
+ cb.`introduce`,
+ cb.`target`,
+ cb.`quality`,
+ cb.`activity`,
+ cb.`audit`,
+ cb.`epiboly`,
+ cb.`resource`,
+ cb.`del_flag`,
+ cb.`create_by`,
+ cb.`create_time`,
+ cb.`update_by`,
+ cb.`update_time`
FROM
- company_basic
+ company_basic cb
+ left join sys_company sc on cb.company_id = sc.id
WHERE
- del_flag = 1
+ cb.del_flag = 1
<if test="companyId!=null and companyId != ''">
- and company_id = #{companyId}
+ and cb.company_id = #{companyId}
</if>
ORDER BY
- create_time DESC
+ cb.create_time DESC
</select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/CompanyCertificateMapper.xml b/multi-system/src/main/resources/mapper/system/CompanyCertificateMapper.xml
index ced1ee9..e2fac32 100644
--- a/multi-system/src/main/resources/mapper/system/CompanyCertificateMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/CompanyCertificateMapper.xml
@@ -47,27 +47,28 @@
<select id="selectCompanyCertificateList" resultType="com.gkhy.exam.system.domain.CompanyCertificate">
SELECT
- `id`,
- `company_id`,
- `company_name`,
- `certificate_name`,
- `certificate_num`,
- `effective_time`,
- `file_name`,
- `file_path`,
- `del_flag`,
- `create_by`,
- `create_time`,
- `update_by`,
- `update_time`
+ cc.`id`,
+ cc.`company_id`,
+ sc.`name` as company_name,
+ cc.`certificate_name`,
+ cc.`certificate_num`,
+ cc.`effective_time`,
+ cc.`file_name`,
+ cc.`file_path`,
+ cc.`del_flag`,
+ cc.`create_by`,
+ cc.`create_time`,
+ cc.`update_by`,
+ cc.`update_time`
FROM
- company_certificate
+ company_certificate cc
+ left join sys_company sc on cc.company_id = sc.id
WHERE
- del_flag = 1
+ cc.del_flag = 1
<if test="companyId!=null and companyId!=''">
- and company_id = #{companyId}
+ and cc.company_id = #{companyId}
</if>
ORDER BY
- create_time DESC
+ cc.create_time DESC
</select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/CompanyQualityPolicyMapper.xml b/multi-system/src/main/resources/mapper/system/CompanyQualityPolicyMapper.xml
index af5aa3e..fa678a8 100644
--- a/multi-system/src/main/resources/mapper/system/CompanyQualityPolicyMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/CompanyQualityPolicyMapper.xml
@@ -36,23 +36,24 @@
<select id="selectCompanyQualityPolicyList" resultType="com.gkhy.exam.system.domain.CompanyQualityPolicy">
SELECT
- `id`,
- `company_id`,
- company_name,
- `policy`,
- `del_flag`,
- `create_by`,
- `create_time`,
- `update_by`,
- `update_time`
+ cqp.`id`,
+ cqp.`company_id`,
+ sc.`name` as company_name,
+ cqp.`policy`,
+ cqp.`del_flag`,
+ cqp.`create_by`,
+ cqp.`create_time`,
+ cqp.`update_by`,
+ cqp.`update_time`
FROM
- company_quality_policy
+ company_quality_policy cqp
+ left join sys_company sc on cqp.company_id = sc.id
WHERE
- del_flag = 1
+ cqp.del_flag = 1
<if test="companyId!=null and companyId!=''">
- and company_id = #{companyId}
+ and cqp.company_id = #{companyId}
</if>
ORDER BY
- create_time DESC
+ cqp.create_time DESC
</select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/CompanySummaryMapper.xml b/multi-system/src/main/resources/mapper/system/CompanySummaryMapper.xml
index 12ee74f..a5dc3fa 100644
--- a/multi-system/src/main/resources/mapper/system/CompanySummaryMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/CompanySummaryMapper.xml
@@ -34,23 +34,24 @@
<select id="selectCompanySummaryList" resultType="com.gkhy.exam.system.domain.CompanySummary">
SELECT
- `id`,
- `company_id`,
- `company_name`,
- `company_summary`,
- `del_flag`,
- `create_by`,
- `create_time`,
- `update_by`,
- `update_time`
+ cs.`id`,
+ cs.`company_id`,
+ sc.`name` as company_name,
+ cs.`company_summary`,
+ cs.`del_flag`,
+ cs.`create_by`,
+ cs.`create_time`,
+ cs.`update_by`,
+ cs.`update_time`
FROM
- company_summary
+ company_summary cs
+ left join sys_company sc on cs.company_id = sc.id
WHERE
- del_flag = 1
+ cs.del_flag = 1
<if test="companyId!=null and companyId!=''">
- and company_id = #{companyId}
+ and cs.company_id = #{companyId}
</if>
ORDER BY
- create_time DESC
+ cs.create_time DESC
</select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml b/multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml
index 33e8d39..6a7946c 100644
--- a/multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/QualityAccomplishMapper.xml
@@ -6,7 +6,7 @@
SELECT
qa.`id`,
qa.`company_id`,
- q.company_name,
+ sc.`name` as company_name,
q.year,
q.type,
q.depart_name,
@@ -27,6 +27,7 @@
FROM
quality_accomplish qa
LEFT JOIN quality q ON qa.quality_id = q.id
+ left join sys_company sc on q.company_id = sc.id
WHERE
qa.del_flag = 1
<if test="companyId!=null and companyId!=''">
diff --git a/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml b/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml
index 6b12112..a788e6e 100644
--- a/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/QualityDecomposeMapper.xml
@@ -16,7 +16,7 @@
SELECT
qd.`id`,
qd.`company_id`,
- q.company_name,
+ sc.`name` as company_name,
q.`year`,
q.type,
q.depart_name,
@@ -39,6 +39,7 @@
qd.`update_time`
FROM quality_decompose qd
LEFT JOIN quality q on qd.quality_id = q.id
+ left join sys_company sc on q.company_id = sc.id
WHERE qd.del_flag = 1
<if test="companyId !=null and companyId!=''">
and q.company_id =#{companyId}
@@ -75,5 +76,8 @@
where del_flag = 1
and quality_id=#{qualityId}
</select>
+ <select id="selectByDelFlag" resultType="java.lang.Integer">
+ select quality_id from quality_decompose where del_flag = 1
+ </select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/QualityMapper.xml b/multi-system/src/main/resources/mapper/system/QualityMapper.xml
index 29c3562..b4e7ff7 100644
--- a/multi-system/src/main/resources/mapper/system/QualityMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/QualityMapper.xml
@@ -89,67 +89,69 @@
<select id="selectQualityTarget" resultType="com.gkhy.exam.system.domain.vo.QualityTargetVo">
SELECT
- `id`,
- `company_id`,
- `company_name`,
- `year`,
- `num`,
- `type`,
- `depart_id`,
- `depart_name`,
- `method`,
- `compilation_id`,
- `compilation_name`,
- `compilation_time`,
- `quality_id`,
- `quality_name`,
- `quality_time`,
- `lead_id`,
- `lead_name`,
- `lead_time`
- FROM quality
+ q.`id`,
+ q.`company_id`,
+ sc.`name` as `company_name`,
+ q.`year`,
+ q.`num`,
+ q.`type`,
+ q.`depart_id`,
+ q.`depart_name`,
+ q.`method`,
+ q.`compilation_id`,
+ q.`compilation_name`,
+ q.`compilation_time`,
+ q.`quality_id`,
+ q.`quality_name`,
+ q.`quality_time`,
+ q.`lead_id`,
+ q.`lead_name`,
+ q.`lead_time`
+ FROM quality q
+ left join sys_company sc on q.company_id = sc.id
WHERE
- del_flag=1
+ q.del_flag=1
<if test="companyId!=null and companyId!=''">
- and company_id = #{companyId}
+ and q.company_id = #{companyId}
</if>
<if test="year!=null and year!=''">
- and `year` = #{year}
+ and q.`year` = #{year}
</if>
<if test="type!=null and type!=''">
- and `type` = #{type}
+ and q.`type` = #{type}
</if>
ORDER BY
- create_time DESC
+ q.create_time DESC
</select>
<select id="selectQualityByType" resultType="com.gkhy.exam.system.domain.Quality">
SELECT
- `id`,
- `company_id`,
- `company_name`,
- `year`,
- `num`,
- `type`,
- `depart_id`,
- `depart_name`,
- `method`,
- `compilation_id`,
- `compilation_name`,
- `compilation_time`,
- `quality_id`,
- `quality_name`,
- `quality_time`,
- `lead_id`,
- `lead_name`,
- `lead_time`
- FROM quality
+ q.`id`,
+ q.`company_id`,
+ sc.`name` as company_name,
+ q.`year`,
+ q.`num`,
+ q.`type`,
+ q.`depart_id`,
+ q.`depart_name`,
+ q.`method`,
+ q.`compilation_id`,
+ q.`compilation_name`,
+ q.`compilation_time`,
+ q.`quality_id`,
+ q.`quality_name`,
+ q.`quality_time`,
+ q.`lead_id`,
+ q.`lead_name`,
+ q.`lead_time`
+ FROM quality q
+ left join sys_company sc on q.company_id = sc.id
WHERE
- del_flag=1 and `type` = #{type} and `year` = #{year}
+ q.del_flag=1 and q.`type` = #{type} and q.`year` = #{year}
<if test="type == 1">
- and company_id = #{companyId}
+ and q.company_id = #{companyId}
</if>
<if test="type == 2">
- and depart_id = #{departId}
+ and q.depart_id = #{departId}
</if>
</select>
--
Gitblit v1.9.2