오늘치 커밋

src/com/pms/mapper/admin.xml

@@ -8042,6 +8042,61 @@ FROM (
 		DELETE FROM SUPPLY_CHARGER_MNG WHERE SUPPLY_OBJID = #{objid} 
 	</delete>
 	
+	<!-- 일반거래처 담당자 목록 조회 (SUPPLY_OBJID를 공용으로 사용) -->
+	<select id="getClientChargerList" parameterType="map" resultType="map">
+		SELECT
+			ROW_NUMBER() OVER(ORDER BY REGDATE DESC) RNUM,
+			OBJID,
+			CHARGER_TYPE,
+			SUPPLY_OBJID,
+			CHARGER_NAME,
+			PHONE,
+			TEL,
+			FAX,
+			EMAIL,
+			WRITER,
+			REGDATE,
+			TO_CHAR(REGDATE,'YYYY-MM-DD') AS REGDATE_TITLE
+		FROM
+			SUPPLY_CHARGER_MNG
+		WHERE SUPPLY_OBJID::VARCHAR = #{client_objid}::VARCHAR
+	</select>
+	
+	<!-- 일반거래처 담당자 저장 (SUPPLY_OBJID를 공용으로 사용) -->
+	<insert id="mergeClientCharger" parameterType="map">
+		INSERT INTO SUPPLY_CHARGER_MNG
+		(
+			OBJID,
+			CHARGER_TYPE,
+			SUPPLY_OBJID,
+			CHARGER_NAME,
+			PHONE,
+			TEL,
+			FAX,
+			EMAIL,
+			WRITER,
+			REGDATE
+		)
+		VALUES
+		(
+			#{OBJID}::INTEGER,
+			#{CHARGER_TYPE},
+			#{CLIENT_OBJID},
+			#{CHARGER_NAME},
+			#{PHONE},
+			#{TEL},
+			#{FAX},
+			#{EMAIL},
+			#{WRITER},
+			NOW()
+		)
+	</insert>
+	
+	<!-- 일반거래처 담당자 삭제 (SUPPLY_OBJID를 공용으로 사용) -->
+	<delete id="initClientCharger" parameterType="map">
+		DELETE FROM SUPPLY_CHARGER_MNG WHERE SUPPLY_OBJID::VARCHAR = #{objid}::VARCHAR
+	</delete>
+	
 	<update id="deletesupplyMngInfo" parameterType="map">
 		DELETE FROM ADMIN_SUPPLY_MNG WHERE OBJID = #{objId}::NUMERIC
 	</update>
@@ -8864,8 +8919,8 @@ SELECT
     SELECT * 
     FROM CLIENT_MNG
     WHERE 1=1
-    <if test="OBJID != null and OBJID != ''">
-        AND OBJID != #{OBJID}::numeric
+    <if test="objid != null and objid != ''">
+        AND OBJID != #{objid}::numeric
     </if>
     <if test="CLIENT_CD != null and CLIENT_CD != ''">
         AND TRIM(UPPER(CLIENT_CD)) = TRIM(UPPER(#{CLIENT_CD}))
@@ -8932,8 +8987,8 @@ SELECT
         #{BIZCON_FG}, #{BIZCON_NM}, #{SHIP_TP}, #{SHIP_NM},
         #{PLAN_DAY_TYPE}, #{PLAN_DAY}, #{PURPOSE_TYPE}, #{FOR_YN},
         #{CHECK_DATA}, #{CHECK_STATE},
-        CASE WHEN #{CHECK_ORDER} = '' THEN NULL ELSE #{CHECK_ORDER}::numeric END,
-        #{FIXED_ORDER},
+        CASE WHEN #{CHECK_ORDER} = '' OR #{CHECK_ORDER} !~ '^[0-9]+$' THEN NULL ELSE #{CHECK_ORDER}::numeric END,
+        CASE WHEN #{FIXED_ORDER} = '' OR #{FIXED_ORDER} !~ '^[0-9]+$' THEN NULL ELSE #{FIXED_ORDER}::numeric END,
         #{INSERT_ID}, #{INSERT_IP}, 
         CASE WHEN #{INSERT_DT} = '' THEN NOW() ELSE COALESCE(#{INSERT_DT}::timestamp, NOW()) END,
         #{MODIFY_ID}, #{MODIFY_IP},
@@ -9048,8 +9103,8 @@ SELECT
         FOR_YN = #{FOR_YN},
         CHECK_DATA = #{CHECK_DATA},
         CHECK_STATE = #{CHECK_STATE},
-        CHECK_ORDER = CASE WHEN #{CHECK_ORDER} = '' THEN NULL ELSE #{CHECK_ORDER}::numeric END,
-        FIXED_ORDER = #{FIXED_ORDER},
+        CHECK_ORDER = CASE WHEN #{CHECK_ORDER} = '' OR #{CHECK_ORDER} !~ '^[0-9]+$' THEN NULL ELSE #{CHECK_ORDER}::numeric END,
+        FIXED_ORDER = CASE WHEN #{FIXED_ORDER} = '' OR #{FIXED_ORDER} !~ '^[0-9]+$' THEN NULL ELSE #{FIXED_ORDER}::numeric END,
         MODIFY_ID = #{MODIFY_ID},
         MODIFY_IP = #{MODIFY_IP},
         MODIFY_DT = NOW()