From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Mapper/mybatis/SafetyInspectionItemMapper.xml | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 112 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Mapper/mybatis/SafetyInspectionItemMapper.xml b/src/main/java/com/gk/hotwork/Mapper/mybatis/SafetyInspectionItemMapper.xml
index 6df66a3..d5b351d 100644
--- a/src/main/java/com/gk/hotwork/Mapper/mybatis/SafetyInspectionItemMapper.xml
+++ b/src/main/java/com/gk/hotwork/Mapper/mybatis/SafetyInspectionItemMapper.xml
@@ -12,12 +12,14 @@
<result column="element_a" property="elementA" jdbcType="BIGINT" />
<result column="element_b" property="elementB" jdbcType="BIGINT" />
+ <result column="element_c" property="elementC" jdbcType="BIGINT" />
<result column="standardization_requirements" property="standardizationRequirements" jdbcType="VARCHAR" />
<result column="enterprise_standard" property="enterpriseStandard" jdbcType="VARCHAR" />
<result column="review_method" property="reviewMethod" jdbcType="VARCHAR" />
<result column="veto" property="veto" jdbcType="VARCHAR" />
<result column="element_a_name" property="elementAName" jdbcType="VARCHAR" />
<result column="element_b_name" property="elementBName" jdbcType="VARCHAR" />
+ <result column="element_c_name" property="elementCName" jdbcType="VARCHAR" />
</resultMap>
<select id="selectPages" resultMap="BaseResultMap">
@@ -29,14 +31,27 @@
left join element_management as c on a.element_b = c.id and c.valid_flag = 1
where a.valid_flag = 1 and a.element_b= #{params.elementB}
</select>
+ <select id="selectCPages" resultMap="BaseResultMap">
+ select a.*,
+ b.name element_a_name,
+ c.name element_b_name,
+ d.name element_c_name
+ from safety_inspection_item as a
+ left join element_management as b on a.element_a = b.id and b.valid_flag = 1
+ left join element_management as c on a.element_b = c.id and c.valid_flag = 1
+ left join element_management as d on a.element_c = d.id and d.valid_flag = 1
+ where a.valid_flag = 1 and a.element_c= #{params.elementC}
+ </select>
<select id="infoElementA" resultMap="BaseResultMap">
select a.*,
- b.name element_a_name,
- c.name element_b_name
+ b.name element_a_name,
+ c.name element_b_name,
+ d.name element_c_name
from safety_inspection_item as a
- left join element_management as b on a.element_a = b.id and b.valid_flag = 1
- left join element_management as c on a.element_b = c.id and c.valid_flag = 1
+ left join element_management as b on a.element_a = b.id and b.valid_flag = 1
+ left join element_management as c on a.element_b = c.id and c.valid_flag = 1
+ left join element_management as d on a.element_c = d.id and d.valid_flag = 1
where a.valid_flag = 1 and a.element_a= #{id}
</select>
@@ -44,11 +59,103 @@
<select id="getById" resultMap="BaseResultMap">
select a.*,
b.name element_a_name,
- c.name element_b_name
+ c.name element_b_name,
+ d.name element_c_name
from safety_inspection_item as a
left join element_management as b on a.element_a = b.id and b.valid_flag = 1
left join element_management as c on a.element_b = c.id and c.valid_flag = 1
+ left join element_management as d on a.element_c = d.id and d.valid_flag = 1
where a.valid_flag = 1 and a.id= #{id}
</select>
+ <update id="updateBatch">
+ <foreach collection="itemList" item="item" index="index" open="" close="" separator=";">
+ update safety_inspection_item
+ set
+ <trim prefix="" suffix="" suffixOverrides=",">
+ <if test="item.validFlag != null">
+ valid_flag = #{item.validFlag},
+ </if>
+ <if test="item.createTime != null and item.createTime != '' ">
+ create_time = #{item.createTime},
+ </if>
+ <if test="item.createBy != null and item.createBy != '' ">
+ create_by = #{item.createBy},
+ </if>
+ <if test="item.updateTime != null and item.updateTime != '' ">
+ update_time = #{item.updateTime},
+ </if>
+ <if test="item.updateBy != null and item.updateBy != '' ">
+ update_by = #{item.updateBy},
+ </if>
+ <if test="item.elementA != null">
+ element_a = #{item.elementA},
+ </if>
+ <if test="item.elementB != null">
+ element_b = #{item.elementB},
+ </if>
+ <if test="item.elementC != null">
+ element_c = #{item.elementC},
+ </if>
+ <if test="item.standardizationRequirements != null and item.standardizationRequirements != '' ">
+ standardization_requirements = #{item.standardizationRequirements},
+ </if>
+ <if test="item.enterpriseStandard != null and item.enterpriseStandard != '' ">
+ enterprise_standard = #{item.enterpriseStandard},
+ </if>
+ <if test="item.reviewMethod != null and item.reviewMethod != '' ">
+ review_method = #{item.reviewMethod},
+ </if>
+ <if test="item.veto != null and item.veto != '' ">
+ veto = #{item.veto},
+ </if>
+ </trim>
+ where id=#{item.id}
+ </foreach>
+
+ </update>
+ <update id="updateSafetyInspectionItem">
+ update safety_inspection_item
+ <trim prefix="set" suffix="" suffixOverrides=",">
+ <if test="item.validFlag != null">
+ valid_flag = #{item.validFlag},
+ </if>
+ <if test="item.createTime != null">
+ create_time = #{item.createTime},
+ </if>
+ <if test="item.createBy != null and item.createBy != '' ">
+ create_by = #{item.createBy},
+ </if>
+ <if test="item.updateTime != null">
+ update_time = #{item.updateTime},
+ </if>
+ <if test="item.updateBy != null and item.updateBy != '' ">
+ update_by = #{item.updateBy},
+ </if>
+ <if test="item.elementA != null">
+ element_a = #{item.elementA},
+ </if>
+ <if test="item.elementB != null">
+ element_b = #{item.elementB},
+ </if>
+ <if test="item.elementC != null">
+ element_c = #{item.elementC},
+ </if>
+ <if test="item.standardizationRequirements != null and item.standardizationRequirements != '' ">
+ standardization_requirements = #{item.standardizationRequirements},
+ </if>
+ <if test="item.enterpriseStandard != null and item.enterpriseStandard != '' ">
+ enterprise_standard = #{item.enterpriseStandard},
+ </if>
+ <if test="item.reviewMethod != null and item.reviewMethod != '' ">
+ review_method = #{item.reviewMethod},
+ </if>
+ <if test="item.veto != null and item.veto != '' ">
+ veto = #{item.veto},
+ </if>
+ </trim>
+ where id=#{item.id}
+
+ </update>
+
</mapper>
--
Gitblit v1.9.2