Compare commits

..

No commits in common. "07830d7c57f18705e0ddc30a7b4efb6fa81e5d4b" and "bac8ab8220064d74687bea12be0388da62d72ac5" have entirely different histories.

2 changed files with 33 additions and 26 deletions

View File

@ -170,7 +170,7 @@ public class EquipmentServiceImpl implements EquipmentService {
while (it.hasNext()) { while (it.hasNext()) {
HashMap<String, Object> value = paramMap.get(it.next()); HashMap<String, Object> value = paramMap.get(it.next());
HashMap<String, Object> record = equipmentMapper.getEquipUseStateInfoByCode(value); HashMap<String, Object> record = equipmentMapper.getEquipUseStateInfoByCode(value);
boolean isInsert = record == null; boolean isInsert = (record == null) ? true : false;
if (isInsert) { if (isInsert) {
success = equipmentMapper.insertEquipUseState(value); success = equipmentMapper.insertEquipUseState(value);

View File

@ -2,6 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="Equip"> <mapper namespace="Equip">
<resultMap id="resultMap" type="hashmap">
<result property="EU_DETAIL" column="EU_DETAIL" jdbcType="CLOB" javaType="java.lang.String" />
</resultMap>
<resultMap id="useStateResult" type="useStateVO"> <resultMap id="useStateResult" type="useStateVO">
<result property="police" column="EU_POLICE" /> <result property="police" column="EU_POLICE" />
<result property="policeStr" column="EU_POLICE_NM" /> <result property="policeStr" column="EU_POLICE_NM" />
@ -171,23 +175,27 @@
]]> ]]>
</select> </select>
<select id="Equip.getEquipUseStateInfo" parameterType="equipSearchVO" resultType="hashmap"> <select id="Equip.getEquipUseStateInfo" parameterType="equipSearchVO" resultMap="resultMap">
<![CDATA[ <![CDATA[
SELECT B.CODENM, SELECT
B.CODE2, B.CODENM, B.CODE2, A.*
A.* FROM
FROM (SELECT * (
FROM H3_EQUIP_USE_STATE SELECT *
WHERE EU_YEAR = (#{year}||'') FROM H3_EQUIP_USE_STATE
AND EU_QUATER = (#{quater}||'') WHERE EU_YEAR = (#{year}||'')
AND EU_POLICE = #{police}) A AND EU_QUATER = (#{quater}||'')
RIGHT JOIN AND EU_POLICE = #{police}
(SELECT CODE2, CODENM ) A
FROM TCODE RIGHT JOIN
WHERE CODE1 = 'EQUI' (
AND CODE_USE_YN = 'Y' SELECT CODE2, CODENM
ORDER BY CODE2 ) B FROM TCODE
ON A.EU_CODE = B.CODE2 WHERE CODE1 = 'EQUI'
AND CODE_USE_YN = 'Y'
ORDER BY CODE2
) B
ON A.EU_CODE = B.CODE2
ORDER BY B.CODE2 ORDER BY B.CODE2
]]> ]]>
</select> </select>
@ -215,15 +223,14 @@
</insert> </insert>
<update id="Equip.updateEquipUseState" parameterType="hashmap"> <update id="Equip.updateEquipUseState" parameterType="hashmap">
UPDATE H3_EQUIP_USE_STATE UPDATE
SET EU_CNT = #{cnt}, H3_EQUIP_USE_STATE
EU_DETAIL = #{detail}, SET
EU_STATE = #{state}, EU_CNT = #{cnt}, EU_DETAIL = #{detail},
EU_CHECK = #{check} EU_STATE = #{state}, EU_CHECK = #{check}
WHERE EU_POLICE = #{police} WHERE
AND EU_YEAR = (#{year}||'') EU_POLICE = #{police} AND EU_YEAR = #{year} AND
AND EU_QUATER = (#{quater}||'') EU_QUATER = #{quater} AND EU_CODE = #{code}
AND EU_CODE = #{code}
</update> </update>
<!-- 사용실적 결재 --> <!-- 사용실적 결재 -->