77681 1 日 前
コミット
4a86a01798

+ 4 - 4
gw-slaj/src/main/resources/mapper/slaj/acci/ObjAcciMapper.xml

@@ -67,10 +67,10 @@
             <if test="endTime != null and endTime != ''">AND a.occu_time &lt;= #{endTime}</if>
             <if test="ifDuty != null and ifDuty != ''">AND bi.if_resp_acci = #{ifDuty}</if>
             <if test="orgName != null and orgName != ''">AND a.sgdw_name like '%' || #{orgName} || '%'</if>
-            <if test="sgdwName != null and sgdwName != ''">AND sgdw_name like '%' || #{sgdwName} || '%'</if>
-            <if test="acciGrad != null and acciGrad != ''">AND acci_grad = #{acciGrad}</if>
-            <if test="engGuid != null and engGuid != ''">AND eng_guid = #{engGuid}</if>
-            <if test="recPers != null and recPers != ''">AND rec_pers = #{recPers}</if>
+            <if test="sgdwName != null and sgdwName != ''">AND a.sgdw_name like '%' || #{sgdwName} || '%'</if>
+            <if test="acciGrad != null and acciGrad != ''">AND a.acci_grad = #{acciGrad}</if>
+            <if test="engGuid != null and engGuid != ''">AND a.eng_guid = #{engGuid}</if>
+            <if test="recPers != null and recPers != ''">AND a.rec_pers = #{recPers}</if>
         </where>
     </select>
     <insert id="insertObjAcci" parameterType="com.goldenwater.slaj.acci.domain.ObjAcci">

+ 12 - 12
gw-slaj/src/main/resources/mapper/slaj/hazard/ObjHazMapper.xml

@@ -72,24 +72,24 @@
     </sql>
     <select id="selectObjHazByGuid" parameterType="String" resultMap="ObjHazResult">
         <include refid="selectObjHazVo"/>
-        where guid = #{guid}
+        where h.guid = #{guid}
     </select>
     <select id="selectObjHazList" parameterType="com.goldenwater.slaj.hazard.domain.ObjHazVo" resultMap="ObjHazResult">
         <include refid="selectObjHazVo"/>
         <where>
-            <if test="hazName != null and hazName != ''">AND haz_name like '%' || #{hazName} || '%'</if>
-            <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
-            <if test="engGuid != null and engGuid != ''">AND eng_guid = #{engGuid}</if>
-            <if test="hiddGrad != null and hiddGrad != ''">AND hidd_grad = #{hiddGrad}</if>
-            <if test="hazStat != null and hazStat != ''">AND haz_stat = #{hazStat}</if>
-            <if test="riskGrad != null and riskGrad != ''">AND risk_grad = #{riskGrad}</if>
-            <if test="type != null and type != ''">AND type = #{type}</if>
-            <if test="guid != null and guid != ''">AND guid = #{guid}</if>
+            <if test="hazName != null and hazName != ''">AND h.haz_name like '%' || #{hazName} || '%'</if>
+            <if test="orgGuid != null and orgGuid != ''">AND h.org_guid = #{orgGuid}</if>
+            <if test="engGuid != null and engGuid != ''">AND h.eng_guid = #{engGuid}</if>
+            <if test="hiddGrad != null and hiddGrad != ''">AND h.hidd_grad = #{hiddGrad}</if>
+            <if test="hazStat != null and hazStat != ''">AND h.haz_stat = #{hazStat}</if>
+            <if test="riskGrad != null and riskGrad != ''">AND h.risk_grad = #{riskGrad}</if>
+            <if test="type != null and type != ''">AND h.type = #{type}</if>
+            <if test="guid != null and guid != ''">AND h.guid = #{guid}</if>
             <if test="orgName != null and orgName != ''">AND o.org_name like '%' || #{orgName} || '%'</if>
             <if test="engName != null and engName != ''">AND e.eng_name like '%' || #{engName} || '%'</if>
-            <if test="ifControl != null and ifControl != ''">AND if_control = #{ifControl}</if>
-            <if test="beginSupTime != null and beginSupTime != ''">AND sup_time >= #{beginSupTime}</if>
-            <if test="endSupTime != null and endSupTime != ''">AND sup_time &lt;= #{endSupTime}</if>
+            <if test="ifControl != null and ifControl != ''">AND h.if_control = #{ifControl}</if>
+            <if test="beginSupTime != null and beginSupTime != ''">AND h.sup_time >= #{beginSupTime}</if>
+            <if test="endSupTime != null and endSupTime != ''">AND h.sup_time &lt;= #{endSupTime}</if>
         </where>
     </select>
     <insert id="insertObjHaz" parameterType="com.goldenwater.slaj.hazard.domain.ObjHaz">