From 12e5867ff9af6a6c2bd00cb54299804ef0ea6426 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 09:57:29 +0900 Subject: [PATCH 1/2] =?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=EC=9E=AC=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 --- .../service/impl/EquipmentServiceImpl.java | 2 +- .../resources/sqlmapper/mappers/fa/equip.xml | 57 ++++++++----------- 2 files changed, 26 insertions(+), 33 deletions(-) diff --git a/src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java b/src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java index 07c81bd..41167cb 100644 --- a/src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java +++ b/src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java @@ -170,7 +170,7 @@ public class EquipmentServiceImpl implements EquipmentService { while (it.hasNext()) { HashMap value = paramMap.get(it.next()); HashMap record = equipmentMapper.getEquipUseStateInfoByCode(value); - boolean isInsert = (record == null) ? true : false; + boolean isInsert = record == null; if (isInsert) { success = equipmentMapper.insertEquipUseState(value); diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml index a6dc9cd..6b1ade2 100644 --- a/src/main/resources/sqlmapper/mappers/fa/equip.xml +++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml @@ -2,10 +2,6 @@ - - - - @@ -175,27 +171,23 @@ ]]> - @@ -223,14 +215,15 @@ - UPDATE - H3_EQUIP_USE_STATE - SET - EU_CNT = #{cnt}, EU_DETAIL = #{detail}, - EU_STATE = #{state}, EU_CHECK = #{check} - WHERE - EU_POLICE = #{police} AND EU_YEAR = #{year} AND - EU_QUATER = #{quater} AND EU_CODE = #{code} + UPDATE H3_EQUIP_USE_STATE + SET EU_CNT = #{cnt}, + EU_DETAIL = #{detail}, + EU_STATE = #{state}, + EU_CHECK = #{check} + WHERE EU_POLICE = #{police} + AND EU_YEAR = (#{year}||'') + AND EU_QUATER = (#{quater}||'') + AND EU_CODE = #{code} From f6f94152cc0946aa6ae5589ad6a8599e8ca77e28 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:17:06 +0900 Subject: [PATCH 2/2] =?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?=EB=93=B1=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 --- src/main/java/kcg/faics/equip/vo/EquipVO.java | 6 +- .../faics/equip/web/EquipmentController.java | 18 +-- .../resources/sqlmapper/mappers/fa/equip.xml | 106 +++++++++--------- 3 files changed, 64 insertions(+), 66 deletions(-) diff --git a/src/main/java/kcg/faics/equip/vo/EquipVO.java b/src/main/java/kcg/faics/equip/vo/EquipVO.java index aa6a5f4..80d7ef0 100644 --- a/src/main/java/kcg/faics/equip/vo/EquipVO.java +++ b/src/main/java/kcg/faics/equip/vo/EquipVO.java @@ -10,7 +10,7 @@ package kcg.faics.equip.vo; * */ public class EquipVO { - private String serNo; + private Integer serNo; private String num; private String equipType; private String equipTypeName; @@ -41,7 +41,7 @@ public class EquipVO { /** * @return the serNo */ - public String getSerNo() { + public Integer getSerNo() { return serNo; } @@ -90,7 +90,7 @@ public class EquipVO { /** * @param serNo the serNo to set */ - public void setSerNo(String serNo) { + public void setSerNo(Integer serNo) { this.serNo = serNo; } /** diff --git a/src/main/java/kcg/faics/equip/web/EquipmentController.java b/src/main/java/kcg/faics/equip/web/EquipmentController.java index 6efd1ad..bedca79 100644 --- a/src/main/java/kcg/faics/equip/web/EquipmentController.java +++ b/src/main/java/kcg/faics/equip/web/EquipmentController.java @@ -596,24 +596,24 @@ public class EquipmentController { // 파일 저장 및 데이터 입력 String[] deleteFiles = multiRequest.getParameterValues("deleteFile"); final Map fileMap = multiRequest.getFileMap(); - - - if( equipVO.getSerNo().equals("") || equipVO.getSerNo().equals(null)){ + + + if(equipVO.getSerNo()==null || equipVO.getSerNo() == 0){ /* 등록 처리 */ - + equipVO.setWriter(loginUserVO.getUserid()); - + equipVO.print(); - + /* 외사장비 등록 */ result = equipmentService.insertEquipment(equipVO, fileMap); }else{ /* 수정 처리 */ result = equipmentService.updateEquipment(equipVO, fileMap, deleteFiles); } - - - equipVO.print(); + + + equipVO.print(); diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml index 6b1ade2..48ecebf 100644 --- a/src/main/resources/sqlmapper/mappers/fa/equip.xml +++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml @@ -327,60 +327,58 @@ - - - SELECT TEQUIPMENT_SERNO_SEQ.CURRVAL FROM DUAL + INSERT INTO TEQUIPMENT( + NUM, + POLICE, + EQUIPGUBUN, + EQUIPNAME, + BYEAR,BMON, + BDAY,USETERM, + STANDARD, + PURPOSE, + BPLACE, + PRICE, + MADEIN, + SERIALNO, + OPERATE, + USESECTION, + BIGO, + FILENAME1, + FILENAME2, + FILENAME3, + CREADATE, + WRITER, + LOGDATE) + values ( + (CASE + WHEN (SELECT MAX(NUM) FROM TEQUIPMENT WHERE POLICE = #{police}) IS NULL THEN 1 + ELSE (SELECT MAX(NUM) + 1 FROM TEQUIPMENT WHERE POLICE = #{police}) + END), + #{police}, + #{equipType}, + #{equipName}, + #{buyYear}, + #{buyMonth}, + #{buyDay}, + #{useTerm}, + #{standard}, + #{purpose}, + #{buyPlace}, + #{price}, + #{madeIn}, + #{serialNo}, + #{operate}, + #{useSection}, + #{bigo}, + #{fileName1}, + #{fileName2}, + #{fileName3}, + TO_CHAR(NOW(), 'YYYYMMDDHH24MISS'), + #{writer}, + NULL + ) + + SELECT currval('tequip_seq') as seq