diff --git a/src/main/java/com/dbnt/faisp/equip/EquipController.java b/src/main/java/com/dbnt/faisp/equip/EquipController.java index 8d040ba7..b14d775f 100644 --- a/src/main/java/com/dbnt/faisp/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/equip/EquipController.java @@ -98,6 +98,7 @@ public class EquipController { String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); mav.addObject("userId", loginUser.getUserId()); + mav.addObject("wrtId", equipService.selectEquipFirstId(equip)); mav.addObject("equInfo", equipService.selectEquipInfo(equip)); return mav; } diff --git a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java b/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java index 7e451dce..d11e0a36 100644 --- a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java +++ b/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java @@ -27,6 +27,8 @@ public interface EquipMapper { Integer selectEquipLogListCnt(EquipLog equipLog); + String selectEquipFirstId(Equip equip); + } diff --git a/src/main/java/com/dbnt/faisp/equip/model/Equip.java b/src/main/java/com/dbnt/faisp/equip/model/Equip.java index e4365868..966c0cce 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/Equip.java +++ b/src/main/java/com/dbnt/faisp/equip/model/Equip.java @@ -83,15 +83,14 @@ public static class EquipId implements Serializable { private Integer versionNo; } - @Override public String toString() { return "Equip [equKey=" + equKey + ", versionNo=" + versionNo + ", mgtOrgan=" + mgtOrgan + ", equType=" + equType - + ", detailType=" + detailType + ", storedYear=" + storedYear + ", mgtType=" + mgtType + ", itemQty=" - + itemQty + ", itemCondition=" + itemCondition + ", note=" + note + ", wrtOrgan=" + wrtOrgan + ", wrtNm=" - + wrtNm + ", wrtDt=" + wrtDt + ", sosok=" + sosok + ", detailSosok=" + detailSosok + ", detailName=" - + detailName + ", origNm=" + origNm + ", convNm=" + convNm + ", filePath=" + filePath + ", deleteFileKey=" - + deleteFileKey + ", deleteFileVnum=" + deleteFileVnum + "]"; + + ", detailType=" + detailType + ", storedYear=" + storedYear + ", itemQty=" + itemQty + ", itemCondition=" + + itemCondition + ", note=" + note + ", wrtOrgan=" + wrtOrgan + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt + + ", sosok=" + sosok + ", detailSosok=" + detailSosok + ", detailName=" + detailName + ", origNm=" + origNm + + ", convNm=" + convNm + ", filePath=" + filePath + ", deleteFileKey=" + deleteFileKey + ", deleteFileVnum=" + + deleteFileVnum + ", noUpdateImg=" + noUpdateImg + "]"; } @@ -110,6 +109,9 @@ public String toString() { + + + diff --git a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java b/src/main/java/com/dbnt/faisp/equip/service/EquipService.java index de6610ae..cf229d68 100644 --- a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/faisp/equip/service/EquipService.java @@ -288,6 +288,10 @@ public class EquipService { public Integer selectEquipLogListCnt(EquipLog equipLog) { return equipMapper.selectEquipLogListCnt(equipLog); } + + public String selectEquipFirstId(Equip equip) { + return equipMapper.selectEquipFirstId(equip); + } diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index 531c17f8..21888f62 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -398,6 +398,14 @@ order by el.wrt_dt desc ) a + + \ No newline at end of file diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html index cd625d07..232d5a02 100644 --- a/src/main/resources/templates/equip/equipModifyModal.html +++ b/src/main/resources/templates/equip/equipModifyModal.html @@ -87,7 +87,7 @@