LY bug fix 批文重复问题

master/src/main/resources/mybatis/ehs/TEnvironapprovalMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.ehs.mapper.TEnvironapprovalMapper">
-    
+
     <resultMap type="TEnvironapproval" id="TEnvironapprovalResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -47,12 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTEnvironapprovalVo">
         select d.id, d.plant_code, d.approvalname, t.name, d.certno, d.effetivedate, d.is_permanent, d.validity_before, CONCAT(TO_CHAR(d.validity_before,'YYYY.MM.dd-'), TO_CHAR(d.validity_after,'YYYY.MM.dd')) AS validity, d.relatedlaw, d.responsauth, d.owner, d.reviewdate, d.nextreviewdate, d.conttype, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.scope, d.follow, d.allowance, d.requirements, d.req_pic, d.req_water, d.req_exhaust, d.reviewer, d.validity_after, d.review_result, d.content, d.con_pic, d.con_water, d.con_exhaust ,s.dept_name from t_environapproval d
       left join sys_dept s on s.dept_id = d.dept_id
-      left join t_staffmgr t on t.staffid = d.reviewer
+      left join t_staffmgr t on t.staffid = d.reviewer and t.del_flag = 0
     </sql>
 
     <select id="selectTEnvironapprovalList" parameterType="TEnvironapproval" resultMap="TEnvironapprovalResult">
         <include refid="selectTEnvironapprovalVo"/>
-        <where>  
+        <where>
             <if test="approvalname != null  and approvalname != ''"> and approvalname like concat(concat('%', #{approvalname}), '%')</if>
             <if test="certno != null  and certno != ''"> and certno like concat(concat('%', #{certno}), '%')</if>
             <if test="effetiveYear != null ">  and to_char(effetivedate,'yyyy') = #{effetiveYear}</if>
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${params.dataScope}
         order by d.id desc
     </select>
-    
+
     <select id="selectTEnvironapprovalById" parameterType="Long" resultMap="TEnvironapprovalResult">
         <include refid="selectTEnvironapprovalVo"/>
         where d.id = #{id}
@@ -207,5 +207,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

master/src/main/resources/mybatis/ehs/TFireapprovalMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.ehs.mapper.TFireapprovalMapper">
-    
+
     <resultMap type="TFireapproval" id="TFireapprovalResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -39,9 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTFireapprovalVo">
-        select d.id, t.name, d.plant_code, d.division, d.approvalname, d.fileno, d.effetivedate, d.validity_before, CONCAT(TO_CHAR(d.validity_before,'YYYY.MM.dd-'), TO_CHAR(d.validity_after,'YYYY.MM.dd')) AS validity, d.relatedlaw, d.responsauth, d.owner, d.reviewdate, d.nextreviewdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks , d.scope, d.follow, d.allowance, d.requirements, d.reviewer, d.validity_after, d.review_result, d.content, d.is_permanent ,s.dept_name from t_fireapproval d
+      select d.id, t.name, d.plant_code, d.division, d.approvalname, d.fileno, d.effetivedate, d.validity_before, CONCAT(TO_CHAR(d.validity_before,'YYYY.MM.dd-'), TO_CHAR(d.validity_after,'YYYY.MM.dd')) AS validity, d.relatedlaw, d.responsauth, d.owner, d.reviewdate, d.nextreviewdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks , d.scope, d.follow, d.allowance, d.requirements, d.reviewer, d.validity_after, d.review_result, d.content, d.is_permanent ,s.dept_name from t_fireapproval d
       left join sys_dept s on s.dept_id = d.dept_id
-      left join t_staffmgr t on t.staffid = d.reviewer
+      left join t_staffmgr t on t.staffid = d.reviewer and t.del_flag = 0
     </sql>
 
     <select id="selectTFireapprovalList" parameterType="TFireapproval" resultMap="TFireapprovalResult">
@@ -66,12 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${params.dataScope}
         order by d.id desc
     </select>
-    
+
     <select id="selectTFireapprovalById" parameterType="Long" resultMap="TFireapprovalResult">
         <include refid="selectTFireapprovalVo"/>
         where d.id = #{id}
     </select>
-        
+
     <insert id="insertTFireapproval" parameterType="TFireapproval">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_fireapproval.NEXTVAL as id FROM DUAL
@@ -183,5 +183,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

master/src/main/resources/mybatis/ehs/THealthapprovalMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.ehs.mapper.THealthapprovalMapper">
-    
+
     <resultMap type="THealthapproval" id="THealthapprovalResult">
         <result property="id"    column="id"    />
         <result property="approvalname"    column="approvalname"    />
@@ -39,12 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTHealthapprovalVo">
         select d.id, t.name, d.approvalname, d.certno, d.effetivedate, d.validity_before, CONCAT(TO_CHAR(d.validity_before,'YYYY.MM.dd-'), TO_CHAR(d.validity_after,'YYYY.MM.dd')) AS validity, d.relatedlaw, d.responsauth, d.owner, d.reviewdate, d.nextreviewdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.is_permanent, d.scope, d.follow, d.allowance, d.requirements, d.reviewer, d.review_result, d.validity_after , d.content, s.dept_name from t_healthapproval d
       left join sys_dept s on s.dept_id = d.dept_id
-      left join t_staffmgr t on t.staffid = d.reviewer
+      left join t_staffmgr t on t.staffid = d.reviewer and t.del_flag = 0
     </sql>
 
     <select id="selectTHealthapprovalList" parameterType="THealthapproval" resultMap="THealthapprovalResult">
         <include refid="selectTHealthapprovalVo"/>
-        <where>  
+        <where>
             <if test="approvalname != null  and approvalname != ''"> and approvalname like concat(concat('%', #{approvalname}), '%')</if>
             <if test="certno != null  and certno != ''"> and certno like concat(concat('%', #{certno}), '%')</if>
             <if test="effetiveYear != null ">  and to_char(effetivedate,'yyyy') = #{effetiveYear}</if>
@@ -53,12 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTHealthapprovalById" parameterType="Long" resultMap="THealthapprovalResult">
         <include refid="selectTHealthapprovalVo"/>
         where d.id = #{id}
     </select>
-        
+
     <insert id="insertTHealthapproval" parameterType="THealthapproval">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_healthapproval.NEXTVAL as id FROM DUAL
@@ -164,5 +164,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

master/src/main/resources/mybatis/ehs/TMsdsMapper.xml

@@ -45,7 +45,7 @@
     <sql id="selectTMsdsVo">
         select d.id, d.item, d.productcategory, d.en_name, d.cn_name, d.cas_no, d.dept_id, d.del_flag, d.hazard_phrases, d.cmr, d.remarks, d.creater_code, d.ghs_pictogram, d.createdate, d.holdup, d.updater_code, d.work_area, d.form, d.updatedate, d.explosion_limit, d.melting_point, d.boiling_point, d.density, d.purity, d.responsible_company, d.issue_time, d.version, d.reviewer, t.name, d.reviewdate, d.review_state, d.next_reviewdate, d.issuetime_two, d.issuetime_three ,s.dept_name from t_msds d
       left join sys_dept s on s.dept_id = d.dept_id
-      left join t_staffmgr t on t.staffid = d.reviewer
+      left join t_staffmgr t on t.staffid = d.reviewer and t.del_flag = 0
     </sql>
 
     <select id="selectTMsdsList" parameterType="TMsds" resultMap="TMsdsResult">

master/src/main/resources/mybatis/ehs/TSafetyapprovalMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTSafetyapprovalVo">
         select d.id, d.plant_code, d.approvalname, t.name, d.certno, d.effetivedate, d.validity_before, CONCAT(TO_CHAR(d.validity_before,'YYYY.MM.dd-'), TO_CHAR(d.validity_after,'YYYY.MM.dd')) AS validity, d.relatedlaw, d.responsauth, d.owner, d.reviewdate, d.nextreviewdate, d.conttype, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.scope, d.follow, d.allowance, d.requirements, d.reviewer, d.validity_after, d.review_result , d.content, d.con_pic, d.con_url, d.is_permanent, s.dept_name from t_safetyapproval d
       left join sys_dept s on s.dept_id = d.dept_id
-      left join t_staffmgr t on t.staffid = d.reviewer
+      left join t_staffmgr t on t.staffid = d.reviewer and t.del_flag = 0
     </sql>
 
     <select id="selectTSafetyapprovalList" parameterType="TSafetyapproval" resultMap="TSafetyapprovalResult">