diff --git a/WebContent/ui/cfs/standard/SD011P02.xml b/WebContent/ui/cfs/standard/SD011P02.xml index bd6027f..ab08189 100644 --- a/WebContent/ui/cfs/standard/SD011P02.xml +++ b/WebContent/ui/cfs/standard/SD011P02.xml @@ -130,7 +130,7 @@ } scwin.sub_search_submitdone = function(e) { - console.log(resCode.getCellData( 0 , "cardIssue" )+"11111"+reqUpdate.get( "cardAgencyId" )); + if(resCode.getCellData( 0 , "cardIssue" ) == reqUpdate.get( "cardAgencyId" )){ alert("중복된 데이터가 존재합니다"); return false; diff --git a/WebContent/ui/cfs/standard/SD011P03.xml b/WebContent/ui/cfs/standard/SD011P03.xml index ff5b119..62e1549 100644 --- a/WebContent/ui/cfs/standard/SD011P03.xml +++ b/WebContent/ui/cfs/standard/SD011P03.xml @@ -16,7 +16,8 @@ - + + diff --git a/src/main/java/cfs/standard/dao/mapper/StandardCodeInfo_mapper.xml b/src/main/java/cfs/standard/dao/mapper/StandardCodeInfo_mapper.xml index fc58a5c..3399cfd 100644 --- a/src/main/java/cfs/standard/dao/mapper/StandardCodeInfo_mapper.xml +++ b/src/main/java/cfs/standard/dao/mapper/StandardCodeInfo_mapper.xml @@ -179,18 +179,18 @@ - SELECT issue_office_id AS catalog_id, - (select card_office_full_name from card_office_code_info T where - T.card_office_id=a.card_office_id) AS catalog_full_name, - issue_abb_name AS Catalog_abb_name, - use_Yn, - to_char(Create_date,'yyyy/MM/dd') as - Create_date, - creater, - to_char(update_date,'yyyy/MM/dd') as update_date, - updater - FROM issue_office_code_info a - order by catalog_id + SELECT issue_office_id AS catalog_id + , (select card_office_full_name + from card_office_code_info T + where T.card_office_id=a.card_office_id) AS catalog_full_name + , issue_abb_name AS Catalog_abb_name + , use_Yn + , to_char(Create_date,'yyyy/MM/dd') as Create_date + , creater + , to_char(update_date,'yyyy/MM/dd') as update_date + , updater + FROM issue_office_code_info a + order by catalog_id @@ -1396,107 +1396,122 @@ - UPDATE join_card_info - SET join_card_name = #{franchiseeName}, - charge_rate = #{discountRate}, - typical_name = #{cardAgency}, - use_yn = #{useYn}, - end_Date = to_date(#{inEdDate},'yyyy-MM-dd') - WHERE fare_office_id = #{fareOfficeInfo} - AND join_card_number = #{franchiseeNum} - AND to_char(stt_date,'yyyymmdd') = #{inStDate} + UPDATE join_card_info + SET join_card_name = #{franchiseeName} + , charge_rate = #{discountRate} + , typical_name = #{cardAgency} + , use_yn = #{useYn} + , end_Date = to_date(#{inEdDate},'yyyy-MM-dd') + WHERE fare_office_id = #{fareOfficeInfo} + AND join_card_number = #{franchiseeNum} + AND to_char(stt_date,'yyyymmdd') = #{inStDate} - INSERT INTO JOIN_CARD_HISTORY_INFO - VALUES (#{fareOfficeInfo}, - #{franchiseeNum}, - (SELECT COUNT (*) + 1 FROM JOIN_CARD_HISTORY_INFO), - #{franchiseeName}, - to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd'), - #{changReason}, - to_date(#{inStDate},'yyyy/mm/dd'), - to_date(#{inEdDate},'yyyy/mm/dd'), - #{collectId}, - #{cardAgencyId}, - #{discountRate}, - #{discountAmt}, - to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd'), - #{sessionUserNm}, - to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd'), - #{sessionUserNm}) + INSERT + INTO JOIN_CARD_HISTORY_INFO + VALUES ( + #{fareOfficeInfo} + , #{franchiseeNum} + , (SELECT COUNT (*) + 1 FROM JOIN_CARD_HISTORY_INFO) + , #{franchiseeName} + , to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd') + , #{changReason} + , to_date(#{inStDate},'yyyy/mm/dd') + , to_date(#{inEdDate},'yyyy/mm/dd') + , #{collectId} + , #{cardAgencyId} + , #{discountRate} + , #{discountAmt} + , to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd') + , #{sessionUserNm} + , to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd') + , #{sessionUserNm} + ) - INSERT INTO join_card_info - VALUES (#{fareOfficeInfo}, - #{franchiseeNum}, - to_date(#{inStDate},'yyyy/mm/dd'), - to_date(#{inEdDate},'yyyy/mm/dd'), - decode(#{motionId},'선불','21','22'), - (SELECT card_office_id - FROM CARD_OFFICE_CODE_INFO T - WHERE card_office_id = #{cardAgencyId}), - #{cardAgency}, - #{discountRate}, - '0', - '', - '', - '', - '', - '', - '0', - #{useYn}, - to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd'), - #{sessionUserNm}, - to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd'), - #{sessionUserNm}, - '1', - (SELECT card_office_id - FROM CARD_OFFICE_CODE_INFO T - WHERE card_office_id = #{cardAgencyId}), - (SELECT card_office_full_name - FROM CARD_OFFICE_CODE_INFO T - WHERE card_office_id = #{cardAgencyId})) + INSERT + INTO join_card_info + VALUES ( + #{fareOfficeInfo} + , #{franchiseeNum} + , to_date(#{inStDate},'yyyy/mm/dd') + , to_date(#{inEdDate},'yyyy/mm/dd') + , decode(#{motionId},'선불','21','22') + , (SELECT card_office_id + FROM CARD_OFFICE_CODE_INFO T + WHERE card_office_id = #{cardAgencyId}) + , #{cardAgency} + , #{discountRate} + , '0' + , '' + , '' + , '' + , '' + , '' + , '0' + , #{useYn} + , to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd') + , #{sessionUserNm} + , to_date(to_char(SYSDATE,'yyyy/MM/dd'),'yyyy/mm/dd') + , #{sessionUserNm} + , '1' + , (SELECT card_office_id + FROM CARD_OFFICE_CODE_INFO T + WHERE card_office_id = #{cardAgencyId}) + , (SELECT card_office_full_name + FROM CARD_OFFICE_CODE_INFO T + WHERE card_office_id = #{cardAgencyId}) + )