From b720341b27da54284f844561edfad5dacf13604e Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 09 七月 2025 08:50:48 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/java/com/gkhy/exam/system/domain/QualityTargetMess.java | 49 ++++++++++++++++++++++++
multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityTargetMapper.java | 7 +++
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java | 8 ++++
multi-system/src/main/resources/mapper/system/QualityTargetMapper.xml | 28 ++++++++++++++
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityDecomposeServiceImpl.java | 14 ++++++-
multi-system/src/main/java/com/gkhy/exam/system/domain/QualityTarget.java | 3 +
6 files changed, 107 insertions(+), 2 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/QualityTarget.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/QualityTarget.java
index 4a2ddcf..d02a882 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/QualityTarget.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/QualityTarget.java
@@ -11,6 +11,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
@Getter
@Setter
@@ -83,5 +84,7 @@
@TableField("update_time")
private LocalDateTime updateTime;
+ private List<QualityTargetMess> qualityTargetMesses;
+
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/QualityTargetMess.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/QualityTargetMess.java
new file mode 100644
index 0000000..4e90ee3
--- /dev/null
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/QualityTargetMess.java
@@ -0,0 +1,49 @@
+package com.gkhy.exam.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QualityTargetMess {
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @TableField("quality_target_id")
+ private Integer qualityTargetId;
+
+ @ApiModelProperty(value = "目标值")
+ @TableField("num")
+ private String num;
+
+ @ApiModelProperty(value = "实时措施")
+ @TableField("method")
+ private String method;
+
+ @ApiModelProperty(value = "计算方法")
+ @TableField("calculate")
+ private String calculate;
+
+ @ApiModelProperty(value = "数据源")
+ @TableField("data_source")
+ private String dataSource;
+
+ @ApiModelProperty(value = "部门名称")
+ @TableField("depart_name")
+ private String departName;
+
+ @ApiModelProperty(value = "考核时机")
+ @TableField("frequency")
+ private String frequency;
+
+ @ApiModelProperty(value = "负责人")
+ @TableField("duty_name")
+ private String dutyName;
+
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
+ private String remark;
+}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityTargetMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityTargetMapper.java
index 8b27d2a..0d45911 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityTargetMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualityTargetMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.exam.system.domain.QualityTarget;
+import com.gkhy.exam.system.domain.QualityTargetMess;
import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;
@@ -16,4 +17,10 @@
List<QualityTarget> selectByQualityId(Integer qualityId);
void deleteByQualityIds(@Param("qualityId") Integer qualityId);
+
+ List<QualityTargetMess> selectBYQualityTargetId(@Param("id") Integer id);
+
+ void insertQualityTargetMess(@Param("qualityTargetMesses") List<QualityTargetMess> qualityTargetMesses);
+
+ void deletedByQualityTargetId(@Param("qualityTargetId") Integer id);
}
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 bf12219..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;
@@ -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,8 +76,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 +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();
}
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 9076692..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
@@ -56,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);
@@ -138,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);
diff --git a/multi-system/src/main/resources/mapper/system/QualityTargetMapper.xml b/multi-system/src/main/resources/mapper/system/QualityTargetMapper.xml
index 9eb68cf..427d993 100644
--- a/multi-system/src/main/resources/mapper/system/QualityTargetMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/QualityTargetMapper.xml
@@ -14,6 +14,14 @@
#{item.createBy},#{item.createTime})
</foreach>
</insert>
+ <insert id="insertQualityTargetMess">
+ INSERT INTO `quality_target_mess`
+ ( `quality_target_id`, `num`, `method`, `calculate`, `data_source`, `depart_name`, `frequency`, `duty_name`, `remark` )
+ VALUES
+ <foreach collection="qualityTargetMesses" separator="," item="item">
+ ( #{item.qualityTargetId}, #{item.num}, #{item.method}, #{item.calculate}, #{item.dataSource}, #{item.departName}, #{item.frequency}, #{item.dutyName}, #{item.remark} )
+ </foreach>
+ </insert>
<update id="updateQualityTargetById">
<foreach collection="qualityTargets" item="item" index="index" separator=";">
@@ -75,6 +83,10 @@
<update id="deleteByQualityIds">
UPDATE quality_target set del_flag =2 where quality_id = #{qualityId}
</update>
+ <delete id="deletedByQualityTargetId">
+ DELETE FROM quality_target_mess
+ WHERE quality_target_id = #{qualityTargetId};
+ </delete>
<select id="selectByQualityId" resultType="com.gkhy.exam.system.domain.QualityTarget">
select `id`,`company_id`,`quality_id`,`message`,`num`,`method`,`calculate`,`data_source`,`depart_name`,
@@ -85,4 +97,20 @@
and quality_id = #{qualityId}
</if>
</select>
+ <select id="selectBYQualityTargetId" resultType="com.gkhy.exam.system.domain.QualityTargetMess">
+ SELECT
+ `id`,
+ `quality_target_id`,
+ `num`,
+ `method`,
+ `calculate`,
+ `data_source`,
+ `depart_name`,
+ `frequency`,
+ `duty_name`,
+ `remark`
+ FROM
+ `quality_target_mess`
+ where quality_target_id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.2