diff --git a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java index b00dbc86..6a035763 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java @@ -75,8 +75,10 @@ public class EquipController { @PostMapping("/saveEquip") public void saveEquip(@AuthenticationPrincipal UserInfo loginUser,Equip equip, MultipartHttpServletRequest request){ - equip.setWrtNm(loginUser.getUserId()); + equip.setWrtNm(loginUser.getUserNm()); equip.setWrtOrgan(loginUser.getOgCd()); + equip.setWrtPart(loginUser.getOfcCd()); + equip.setWrtTitle(loginUser.getTitleCd()); equip.setWrtDt(LocalDateTime.now()); equipService.saveEquip(equip,request); } @@ -107,8 +109,8 @@ 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("userSeq", loginUser.getUserSeq()); + mav.addObject("wrtUserSeq", equipService.selectEquipFirstUserSeq(equip)); mav.addObject("equInfo", equipService.selectEquipInfo(equip)); return mav; } @@ -116,8 +118,10 @@ public class EquipController { @PostMapping("/updateEquip") @ResponseBody public int updateEquip(@AuthenticationPrincipal UserInfo loginUser,Equip equip, MultipartHttpServletRequest request){ - equip.setWrtNm(loginUser.getUserId()); + equip.setWrtNm(loginUser.getUserNm()); equip.setWrtOrgan(loginUser.getOgCd()); + equip.setWrtPart(loginUser.getOfcCd()); + equip.setWrtTitle(loginUser.getTitleCd()); equip.setWrtDt(LocalDateTime.now()); int result = equipService.updateEquip(equip,request); return result; @@ -126,7 +130,7 @@ public class EquipController { @GetMapping("/historyView") public ModelAndView historyView(Equip equip) { ModelAndView mav = new ModelAndView("equip/equipHistory"); - mav.addObject("equList", equipService.selectHistoryView(equip)); + mav.addObject("equList", equipService.selectHistoryList(equip)); return mav; } @@ -243,17 +247,20 @@ public class EquipController { @GetMapping("/cellPhoneEditModal") public ModelAndView cellPhoneEditModal(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone) { - ModelAndView mav = new ModelAndView("equip/cellPhoneEditModal"); + ModelAndView mav = new ModelAndView("equip/cellPhoneEditModal"); + if(cellPhone.getPhoneKey() != null) { cellPhone = equipService.selectCellPhoneInfo(cellPhone.getPhoneKey()); ParamMap param = new ParamMap(); param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(cellPhone.getMgtOrgan())); mav.addObject("managerList", userInfoService.selectManagerList(param)); + mav.addObject("userSeq", loginUser.getUserSeq()); } - if (cellPhone.getPhoneKey() == null) { + if(cellPhone.getPhoneKey() == null) { cellPhone.setWrtOrgan(loginUser.getOgCd()); cellPhone.setWrtPart(loginUser.getOfcCd()); + cellPhone.setWrtTitle(loginUser.getTitleCd()); cellPhone.setWrtUserSeq(loginUser.getUserSeq()); cellPhone.setWrtNm(loginUser.getUserNm()); } @@ -343,8 +350,9 @@ public class EquipController { public void saveUse(@AuthenticationPrincipal UserInfo loginUser,UseList useList){ useList.setWrtOrgan(loginUser.getOgCd()); useList.setWrtPart(loginUser.getOfcCd()); + useList.setWrtTitle(loginUser.getTitleCd()); useList.setWrtUserSeq(loginUser.getUserSeq()); - useList.setWrtNm(loginUser.getUserId()); + useList.setWrtNm(loginUser.getUserNm()); useList.setWrtDt(LocalDateTime.now()); equipService.saveUse(useList); } @@ -355,6 +363,9 @@ public class EquipController { useList.setDownOrganCdList(loginUser.getDownOrganCdList()); mav.addObject("organList", equipService.selectOrganList(useList)); mav.addObject("info", equipService.selectUseInfo(useList)); + mav.addObject("wrtUserSeq", equipService.selectFirstWrtUserSeq(useList)); + mav.addObject("userSeq", loginUser.getUserSeq()); + //메뉴권한 확인 String accessAuth; if(useList.getUseType().equals("PVRE")) { @@ -371,8 +382,9 @@ public class EquipController { public UseList uadateUse(@AuthenticationPrincipal UserInfo loginUser,UseList useList){ useList.setWrtOrgan(loginUser.getOgCd()); useList.setWrtPart(loginUser.getOfcCd()); + useList.setWrtTitle(loginUser.getTitleCd()); useList.setWrtUserSeq(loginUser.getUserSeq()); - useList.setWrtNm(loginUser.getUserId()); + useList.setWrtNm(loginUser.getUserNm()); useList.setWrtDt(LocalDateTime.now()); return equipService.updateUse(useList); } @@ -380,7 +392,7 @@ public class EquipController { @GetMapping("/useHistory") public ModelAndView useHistory(@AuthenticationPrincipal UserInfo loginUser,UseList useList) { ModelAndView mav = new ModelAndView("equip/useHistory"); - mav.addObject("infoList", equipService.selectUseInfoList(useList)); + mav.addObject("infoList", equipService.selectUseHistoryList(useList)); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java b/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java index 3f12fff5..68fdf6d5 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java +++ b/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java @@ -29,7 +29,7 @@ public interface EquipMapper { Integer selectEquipLogListCnt(EquipLog equipLog); - String selectEquipFirstId(Equip equip); + String selectEquipFirstUserSeq(Equip equip); List selectCellPhoneList(CellPhone cellPhone); @@ -47,6 +47,10 @@ public interface EquipMapper { UseList selectUseInfo(UseList useList); + List selectHistoryList(Equip equip); + + List selectUseHistoryList(UseList useList); + diff --git a/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java b/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java index 7fff30af..f9691b55 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java @@ -47,6 +47,8 @@ public class CellPhone extends BaseModel{ private String wrtOrgan; @Column(name = "wrt_part") private String wrtPart; + @Column(name = "wrt_title") + private String wrtTitle; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; @Column(name = "wrt_nm") diff --git a/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java b/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java index 96175013..498e5af0 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java @@ -46,7 +46,13 @@ public class Equip extends BaseModel implements Serializable{ @Column(name = "note") private String note; @Column(name = "wrt_organ") - private String wrtOrgan; + private String wrtOrgan; + @Column(name = "wrt_part") + private String wrtPart; + @Column(name = "wrt_title") + private String wrtTitle; + @Column(name = "wrt_user_seq") + private String wrtUserSeq; @Column(name = "wrt_nm") private String wrtNm; @Column(name = "wrt_dt") diff --git a/src/main/java/com/dbnt/faisp/main/equip/model/EquipLog.java b/src/main/java/com/dbnt/faisp/main/equip/model/EquipLog.java index 299008aa..551078bb 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/model/EquipLog.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/EquipLog.java @@ -32,6 +32,10 @@ public class EquipLog extends BaseModel{ private String elContents; @Column(name = "wrt_nm") private String wrtNm; + @Column(name = "wrt_part") + private String wrtPart; + @Column(name = "wrt_title") + private String wrtTitle; @Column(name = "wrt_organ") private String wrtOrgan; @Column(name = "wrt_dt") diff --git a/src/main/java/com/dbnt/faisp/main/equip/model/UseList.java b/src/main/java/com/dbnt/faisp/main/equip/model/UseList.java index 945951ad..25f811d2 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/model/UseList.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/UseList.java @@ -54,8 +54,8 @@ public class UseList extends BaseModel implements Serializable{ private String wrtOrgan; @Column(name = "wrt_part") private String wrtPart; - @Column(name = "wrt_user_grd") - private String wrtUserGrd; + @Column(name = "wrt_title") + private String wrtTitle; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; @Column(name = "wrt_nm") @@ -75,17 +75,20 @@ public class UseList extends BaseModel implements Serializable{ @Transient private String detailTypeName; - + @Override public String toString() { return "UseList [mgtOrgan=" + mgtOrgan + ", useNo=" + useNo + ", versionNo=" + versionNo + ", useType=" + useType + ", useDt=" + useDt + ", detailType=" + detailType + ", detailSelf=" + detailSelf + ", peopleCnt=" + peopleCnt + ", description=" + description + ", wrtOrgan=" + wrtOrgan + ", wrtPart=" + wrtPart - + ", wrtUserGrd=" + wrtUserGrd + ", wrtUserSeq=" + wrtUserSeq + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt + + ", wrtTitle=" + wrtTitle + ", wrtUserSeq=" + wrtUserSeq + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt + ", excel=" + excel + ", sosok=" + sosok + ", year=" + year + ", detailTypeName=" + detailTypeName + "]"; } + + + @Embeddable @Data @NoArgsConstructor diff --git a/src/main/java/com/dbnt/faisp/main/equip/repository/UseListRepository.java b/src/main/java/com/dbnt/faisp/main/equip/repository/UseListRepository.java index 1cacbc4c..f944074b 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/repository/UseListRepository.java +++ b/src/main/java/com/dbnt/faisp/main/equip/repository/UseListRepository.java @@ -5,6 +5,8 @@ import com.dbnt.faisp.main.equip.model.UseList; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; @@ -13,6 +15,9 @@ public interface UseListRepository extends JpaRepository findByMgtOrganAndUseNoAndUseTypeOrderByVersionNoDesc(String mgtOrgan, String useNo, String useType); void deleteByMgtOrganAndUseNoAndUseType(String mgtOrgan, String useNo, String useType); + + @Query(value = "SELECT wrt_user_seq FROM use_list WHERE mgt_organ=:mgtOrgan AND use_no=:useNo And use_type=:useType order by version_no asc limit 1", nativeQuery = true) + Integer getWrtUserSeq(@Param("mgtOrgan") String mgtOrgan,@Param("useNo") String useNo,@Param("useType") String useType); diff --git a/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java index fb535350..bbd9497b 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java @@ -70,6 +70,8 @@ public class EquipService { equLog.setElContents("입력"); equLog.setWrtNm(equip.getWrtNm()); equLog.setWrtOrgan(equip.getWrtOrgan()); + equLog.setWrtPart(equip.getWrtPart()); + equLog.setWrtTitle(equip.getWrtTitle()); equLog.setWrtDt(equip.getWrtDt()); equipLogRepository.save(equLog); } catch (Exception e) { @@ -164,6 +166,8 @@ public class EquipService { equipTmp.setItemCondition(equip.getItemCondition()); equipTmp.setNote(equip.getNote()); equipTmp.setWrtOrgan(equip.getWrtOrgan()); + equipTmp.setWrtPart(equip.getWrtPart()); + equipTmp.setWrtTitle(equip.getWrtTitle()); equipTmp.setWrtNm(equip.getWrtNm()); equipTmp.setWrtDt(equip.getWrtDt()); equipRepository.save(equipTmp); @@ -175,6 +179,8 @@ public class EquipService { equLog.setWrtNm(equip.getWrtNm()); equLog.setWrtOrgan(equip.getWrtOrgan()); equLog.setWrtDt(equip.getWrtDt()); + equLog.setWrtPart(equip.getWrtPart()); + equLog.setWrtTitle(equip.getWrtTitle()); equipLogRepository.save(equLog); } catch (Exception e) { e.printStackTrace(); @@ -257,8 +263,8 @@ public class EquipService { return equipMapper.selectEduType(equip); } - public List selectHistoryView(Equip equip) { - return equipRepository.findByEquKeyOrderByWrtDtDesc(equip.getEquKey()); + public List selectHistoryList(Equip equip) { + return equipMapper.selectHistoryList(equip); } public Equip selectHistoryDetail(Equip equip) { @@ -284,8 +290,10 @@ public class EquipService { equLog.setEquType(dbEquip.getEquType()); equLog.setDetailType(dbEquip.getDetailType()); equLog.setElContents("삭제"); - equLog.setWrtNm(loginUser.getUserId()); + equLog.setWrtNm(loginUser.getUserNm()); equLog.setWrtOrgan(loginUser.getOgCd()); + equLog.setWrtPart(loginUser.getOfcCd()); + equLog.setWrtTitle(loginUser.getTitleCd()); equLog.setWrtDt(LocalDateTime.now()); equipLogRepository.save(equLog); } @@ -300,8 +308,8 @@ public class EquipService { return equipMapper.selectEquipLogListCnt(equipLog); } - public String selectEquipFirstId(Equip equip) { - return equipMapper.selectEquipFirstId(equip); + public String selectEquipFirstUserSeq(Equip equip) { + return equipMapper.selectEquipFirstUserSeq(equip); } @Transactional @@ -373,6 +381,7 @@ public class EquipService { useTmp.setDescription(useList.getDescription()); useTmp.setWrtOrgan(useList.getWrtOrgan()); useTmp.setWrtPart(useList.getWrtPart()); + useTmp.setWrtTitle(useList.getWrtTitle()); useTmp.setWrtUserSeq(useList.getWrtUserSeq()); useTmp.setWrtNm(useList.getWrtNm()); useTmp.setWrtDt(useList.getWrtDt()); @@ -380,8 +389,8 @@ public class EquipService { } - public List selectUseInfoList(UseList useList) { - return useListRepository.findByMgtOrganAndUseNoAndUseTypeOrderByVersionNoDesc(useList.getMgtOrgan(),useList.getUseNo(),useList.getUseType()); + public List selectUseHistoryList(UseList useList) { + return equipMapper.selectUseHistoryList(useList); } @Transactional @@ -390,6 +399,10 @@ public class EquipService { useListRepository.deleteByMgtOrganAndUseNoAndUseType(use.getMgtOrgan(),use.getUseNo(),use.getUseType()); } } + + public Integer selectFirstWrtUserSeq(UseList useList) { + return useListRepository.getWrtUserSeq(useList.getMgtOrgan(),useList.getUseNo(),useList.getUseType()); + } diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index 532277c8..50881d1f 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -307,6 +307,20 @@ and em.equ_key = #{equKey} + + - + select wrt_user_seq from equ_mgt where equ_key = #{equKey} order by version_no asc @@ -607,6 +621,23 @@ and use_type = #{useType} and mgt_organ = #{mgtOrgan} + + \ No newline at end of file diff --git a/src/main/resources/static/js/equip/cellPhone.js b/src/main/resources/static/js/equip/cellPhone.js index 6ed480c5..300321ff 100644 --- a/src/main/resources/static/js/equip/cellPhone.js +++ b/src/main/resources/static/js/equip/cellPhone.js @@ -15,7 +15,7 @@ $(document).on('change', '#mgtOrgan', function (){ function changeManager(ogCd){ $.ajax({ - url: '/target/partInfoSelecBox', + url: '/equip/cellPhoneSelecBox', data: { ogCd, }, diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js index b54fb1b2..6795c905 100644 --- a/src/main/resources/static/js/equip/equip.js +++ b/src/main/resources/static/js/equip/equip.js @@ -293,11 +293,7 @@ $(document).on('click', '#statusExcel', function (){ } }) -$(document).on('click', '#closeModal', function (){ - location.reload(); -}) - -$(document).on('click', '.btn-close', function (){ +$(document).on('click', '#btn-close', function (){ location.reload(); }) diff --git a/src/main/resources/templates/equip/cellPhoneEditModal.html b/src/main/resources/templates/equip/cellPhoneEditModal.html index c841e517..d9f1bc62 100644 --- a/src/main/resources/templates/equip/cellPhoneEditModal.html +++ b/src/main/resources/templates/equip/cellPhoneEditModal.html @@ -17,6 +17,7 @@ +
@@ -39,12 +40,12 @@
-
+
@@ -94,10 +95,12 @@ - + + + th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">삭제 +
\ No newline at end of file diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html index 38184366..753330fc 100644 --- a/src/main/resources/templates/equip/cellPhoneList.html +++ b/src/main/resources/templates/equip/cellPhoneList.html @@ -41,7 +41,7 @@
- +
@@ -54,7 +54,7 @@ - +
카카오톡 ID
@@ -71,7 +71,10 @@
-
+
+
+ +
-
-
- - +
+ +
diff --git a/src/main/resources/templates/equip/cellPhoneSelecBox.html b/src/main/resources/templates/equip/cellPhoneSelecBox.html index cb36fb68..8e989dcc 100644 --- a/src/main/resources/templates/equip/cellPhoneSelecBox.html +++ b/src/main/resources/templates/equip/cellPhoneSelecBox.html @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/main/resources/templates/equip/equipHistory.html b/src/main/resources/templates/equip/equipHistory.html index 7ffddc24..ef5cda96 100644 --- a/src/main/resources/templates/equip/equipHistory.html +++ b/src/main/resources/templates/equip/equipHistory.html @@ -30,7 +30,7 @@ - + @@ -93,7 +93,7 @@
- +
diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html index 2a48b745..c0d1289f 100644 --- a/src/main/resources/templates/equip/equipList.html +++ b/src/main/resources/templates/equip/equipList.html @@ -39,7 +39,7 @@
- +
@@ -52,7 +52,7 @@ - +
비고
@@ -73,7 +73,10 @@
-
+
+
+ +
-
-
- +
+
diff --git a/src/main/resources/templates/equip/equipLogList.html b/src/main/resources/templates/equip/equipLogList.html index 33933c1e..2d9f98e0 100644 --- a/src/main/resources/templates/equip/equipLogList.html +++ b/src/main/resources/templates/equip/equipLogList.html @@ -44,7 +44,7 @@
- +
@@ -56,13 +56,13 @@ - + - + diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html index f725c293..c31ef417 100644 --- a/src/main/resources/templates/equip/equipModifyModal.html +++ b/src/main/resources/templates/equip/equipModifyModal.html @@ -2,7 +2,7 @@
- +
@@ -90,9 +90,9 @@
- - - + + +
\ No newline at end of file diff --git a/src/main/resources/templates/equip/equipStatus.html b/src/main/resources/templates/equip/equipStatus.html index 9dc0d8be..a1bc652d 100644 --- a/src/main/resources/templates/equip/equipStatus.html +++ b/src/main/resources/templates/equip/equipStatus.html @@ -36,7 +36,7 @@
-
분류수정일시
+
@@ -78,7 +78,7 @@ - + diff --git a/src/main/resources/templates/equip/pvreUseList.html b/src/main/resources/templates/equip/pvreUseList.html index 1e8079fb..dbbb9151 100644 --- a/src/main/resources/templates/equip/pvreUseList.html +++ b/src/main/resources/templates/equip/pvreUseList.html @@ -67,7 +67,7 @@
-
연번서귀포서
+
@@ -80,7 +80,7 @@ - + @@ -96,7 +96,10 @@
최종수정일
-
+
+
+ +
-
-
- - +
+ +
diff --git a/src/main/resources/templates/equip/qirUseList.html b/src/main/resources/templates/equip/qirUseList.html index 4b51345f..9145fc74 100644 --- a/src/main/resources/templates/equip/qirUseList.html +++ b/src/main/resources/templates/equip/qirUseList.html @@ -67,7 +67,7 @@
- +
@@ -80,7 +80,7 @@ - + @@ -90,13 +90,15 @@ - - +
최종수정일
-
+
+
+ +
-
-
- - +
+ +
diff --git a/src/main/resources/templates/equip/useHistory.html b/src/main/resources/templates/equip/useHistory.html index f51ba616..6ca32d45 100644 --- a/src/main/resources/templates/equip/useHistory.html +++ b/src/main/resources/templates/equip/useHistory.html @@ -29,7 +29,7 @@ - + diff --git a/src/main/resources/templates/equip/useModifyModal.html b/src/main/resources/templates/equip/useModifyModal.html index 76fc95f7..c94b4b3f 100644 --- a/src/main/resources/templates/equip/useModifyModal.html +++ b/src/main/resources/templates/equip/useModifyModal.html @@ -71,7 +71,7 @@
- +