From 601db491f15a15e7b220594eacb38bdd7fbece20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 20 Apr 2022 11:30:47 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84>?= =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sqlmapper/mappers/fa/equip.xml | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml index 48ecebf..e6a93ce 100644 --- a/src/main/resources/sqlmapper/mappers/fa/equip.xml +++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml @@ -382,12 +382,9 @@ - - + UPDATE TEQUIPMENT + SET NUM = #{num}, EQUIPGUBUN = #{equipType}, EQUIPNAME = #{equipName}, POLICE = #{police}, @@ -408,20 +405,11 @@ FILENAME2 = #{fileName2}, FILENAME3 = #{fileName3}, LOGDATE = TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') - WHERE - SERNO = #{serNo} - - - - - - ]]> + WHERE SERNO = #{serNo} - From d8ee817fac5d9e6d8584c5d7a71165d6aa26a6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 20 Apr 2022 13:32:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20>=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=8B=A4=EC=A0=81=20=EA=B2=B0=EC=9E=AC=20>?= =?UTF-8?q?=20=EC=82=AC=EC=9A=A9=EC=8B=A4=EC=A0=81=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B2=B0=EC=9E=AC=20=EC=A0=80=EC=9E=A5=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcg/faics/equip/service/impl/ApproveServiceImpl.java | 4 +--- src/main/java/kcg/faics/equip/web/EquipmentController.java | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/kcg/faics/equip/service/impl/ApproveServiceImpl.java b/src/main/java/kcg/faics/equip/service/impl/ApproveServiceImpl.java index 0801530..8b16955 100644 --- a/src/main/java/kcg/faics/equip/service/impl/ApproveServiceImpl.java +++ b/src/main/java/kcg/faics/equip/service/impl/ApproveServiceImpl.java @@ -59,10 +59,8 @@ public class ApproveServiceImpl implements ApproveService { } @Override - public HashMap insert(final ApproveVO dataVO, - final Map fileMap) throws Exception { + public HashMap insert(final ApproveVO dataVO, final Map fileMap) throws Exception { HashMap result = new HashMap(); - // 이미 결재 내역이 있으면 결재하지 않는다. ApproveVO vo = select(dataVO); if (vo == null) { diff --git a/src/main/java/kcg/faics/equip/web/EquipmentController.java b/src/main/java/kcg/faics/equip/web/EquipmentController.java index bedca79..cc61d36 100644 --- a/src/main/java/kcg/faics/equip/web/EquipmentController.java +++ b/src/main/java/kcg/faics/equip/web/EquipmentController.java @@ -431,10 +431,8 @@ public class EquipmentController { public String approve(final ApproveVO approveVO, final Model model) throws Exception { HashMap result = approveService.insert(approveVO, null); if ("1".equals(result.get("result").toString())) { - return String - .format("redirect:/equip/useStateWaiting.do?police=%s&year=%s&quater=%s", - approveVO.getPolice(), approveVO.getYear(), - approveVO.getQuater()); + return String.format("redirect:/equip/useStateWaiting.do?police=%s&year=%s&quater=%s", + approveVO.getPolice(), approveVO.getYear(), approveVO.getQuater()); } return useStateApprove(approveVO, model); } From 309813dd6e13fcd426d7d9281d7b40ddde83023c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 20 Apr 2022 17:25:37 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=88=98=EC=82=AC=20>=20?= =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=88=98=EC=82=AC=EC=82=AC=EB=A1=80=20>=20?= =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=88=98=EC=82=AC=EC=82=AC=EB=A1=80=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcg/faics/susa/web/PromotController.java | 12 +++--- .../resources/sqlmapper/mappers/susa/susa.xml | 39 ++++++++++++------- .../sqlmapper/mappers/susa/susaFile.xml | 17 ++++---- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/src/main/java/kcg/faics/susa/web/PromotController.java b/src/main/java/kcg/faics/susa/web/PromotController.java index 2139ec2..9bfe521 100644 --- a/src/main/java/kcg/faics/susa/web/PromotController.java +++ b/src/main/java/kcg/faics/susa/web/PromotController.java @@ -235,9 +235,9 @@ public class PromotController { */ @RequestMapping(value = "/add.do", method = RequestMethod.POST) public String add(final MultipartHttpServletRequest multiRequest, - @Valid @ModelAttribute("promotVO") final PromotVO promotVO, - final BindingResult bindingResult, final Model model, - final SessionStatus status) throws Exception { + @Valid @ModelAttribute("promotVO") final PromotVO promotVO, + final BindingResult bindingResult, final Model model, + final SessionStatus status) throws Exception { // 사용자 인증 검사 Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); @@ -253,10 +253,8 @@ public class PromotController { promotVO.setWriter(loginUserVO.getUserid()); // 파일 저장 및 데이터 입력 - final Map fileMap = multiRequest - .getFileMap(); - HashMap map = susaService.insert(promotVO, - fileMap); + final Map fileMap = multiRequest.getFileMap(); + HashMap map = susaService.insert(promotVO, fileMap); status.setComplete(); diff --git a/src/main/resources/sqlmapper/mappers/susa/susa.xml b/src/main/resources/sqlmapper/mappers/susa/susa.xml index 7e5e4c4..cc19e42 100644 --- a/src/main/resources/sqlmapper/mappers/susa/susa.xml +++ b/src/main/resources/sqlmapper/mappers/susa/susa.xml @@ -129,20 +129,33 @@ - INSERT INTO H3_SUSA_LIST - ( - SS_TYPE, SS_AGENCY, SS_CHARGE_NM, SS_SDATE, SS_REGDATE, - SS_CONTENTS, SS_PLACE1, SS_EDATE, SS_TITLE, SS_RESULT, - SS_WRITER - ) - VALUES - ( - #{type}, #{agency}, #{chargeNm}, #{sdate}, NOW(), - #{contents}, #{place1}, #{edate}, #{title}, #{result}, - #{writer} - ) + insert into H3_SUSA_LIST ( + SS_TYPE, + SS_AGENCY, + SS_CHARGE_NM, + SS_SDATE, + SS_REGDATE, + SS_CONTENTS, + SS_PLACE1, + SS_EDATE, + SS_TITLE, + SS_RESULT, + SS_WRITER + ) values ( + #{type}, + #{agency}, + #{chargeNm}, + #{sdate}, + NOW(), + #{contents}, + #{place1}, + #{edate}, + #{title}, + #{result}, + #{writer} + ) - SELECT H3_SUSA_LIST_SS_IDX_SEQ.CURRVAL FROM DUAL + SELECT currval('susa_list_seq') as idx diff --git a/src/main/resources/sqlmapper/mappers/susa/susaFile.xml b/src/main/resources/sqlmapper/mappers/susa/susaFile.xml index 81aa147..8b76dcd 100644 --- a/src/main/resources/sqlmapper/mappers/susa/susaFile.xml +++ b/src/main/resources/sqlmapper/mappers/susa/susaFile.xml @@ -38,21 +38,18 @@ ]]> - - + INSERT INTO H3_SUSA_FILE ( + SF_ORDER, + SF_ORG_NAME, + SF_SAVE_NAME, + SF_SS_SEQ ) VALUES ( #{orders}, #{orgName}, #{saveName}, #{parentSeq} - ) - ]]> + )