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 1d7005a4..f87ec861 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java @@ -251,7 +251,7 @@ public class EquipController { if(cellPhone.getPhoneKey() != null) { cellPhone = equipService.selectCellPhoneInfo(cellPhone.getPhoneKey()); ParamMap param = new ParamMap(); - param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(cellPhone.getMgtOrgan())); + param.put("opCd", cellPhone.getMgtOrgan()); mav.addObject("managerList", userInfoService.selectManagerList(param)); mav.addObject("userSeq", loginUser.getUserSeq()); } @@ -276,7 +276,7 @@ public class EquipController { public ModelAndView cellPhoneSelecBox(String ogCd) { ModelAndView mav = new ModelAndView("equip/cellPhoneSelecBox"); ParamMap param = new ParamMap(); - param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(ogCd)); + param.put("ogCd", ogCd); mav.addObject("managerList", userInfoService.selectManagerList(param)); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java index b1da70d8..b3180317 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java @@ -63,19 +63,20 @@ public class FipTargetController { String[] headerNames2 = null; if(header != null) { headerNames2 = new String[] { "", "", "", "상주 "+header.getString("mp_sangju")+"개소 "+header.getString("mp_sangju_total")+"명" - ,"비상주 "+header.getString("mp_bsangju")+"개소 "+header.getString("mp_bsangju_total")+"명" - ,"폐쇄 "+header.getString("mp_closure")+"개소 "+header.getString("mp_closure_total")+"명" + ,"비상주 "+header.getString("mp_bsangju")+"개소" + ,"폐쇄 "+header.getString("mp_closure")+"개소" ,"상주 "+header.getString("pl_sangju")+"개소 "+header.getString("pl_sangju_total")+"명" - ,"비상주 "+header.getString("pl_bsangju")+"개소 "+header.getString("pl_bsangju_total")+"명" - ,"폐쇄 "+header.getString("pl_closure")+"개소 "+header.getString("pl_closure_total")+"명" + ,"비상주 "+header.getString("pl_bsangju")+"개소" + ,"폐쇄 "+header.getString("pl_closure")+"개소" , "", "", "", "" }; }else { headerNames2 = new String[] { "", "","", "상주 0개소 0명","비상주 0개소 0명","폐쇄 0개소 0명","상주 0개소 0명","비상주 0개소 0명","폐쇄 0개소 0명", "", "", "", "" }; } - String[] headerNames3 = { "", "","", "근무방법", "명", "비고", "근무방법", "명", "비고", "담당자", "임차료", "공공요금", "최종수정일" }; + String[] headerNames3 = { "", "","", "근무방법",Integer.parseInt(header.getString("mp_sangju_total"))+Integer.parseInt(header.getString("mp_bsangju_total"))+Integer.parseInt(header.getString("mp_closure_total"))+"명", "비고", "근무방법",Integer.parseInt(header.getString("pl_sangju_total"))+Integer.parseInt(header.getString("pl_bsangju_total"))+Integer.parseInt(header.getString("pl_closure_total"))+"명", "비고", "담당자", "임차료", "공공요금", "최종수정일" }; String[] columnType = { "String", "String","String", "String", "int", "String", "String", "int", "String", "String", "String","String", "String"}; String sheetName = "외사 분실 현황"; String excelFileName = "외사 분실 현황"; + partInfo.setPiState("DST007"); List partInfoList= fipTargetService.selectPartInfoList(partInfo); try { @@ -94,6 +95,7 @@ public class FipTargetController { partInfo.setContentCnt(fipTargetService.selectPartInfoListCnt(partInfo)); partInfo.setPaginationInfo(); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + mav.addObject("loginUser", loginUser.getUserSeq()); mav.addObject("searchParams", partInfo); return mav; } @@ -114,7 +116,7 @@ public class FipTargetController { public ModelAndView equipTypeSelecBox(String ogCd) { ModelAndView mav = new ModelAndView("fipTarget/partInfoSelecBox"); ParamMap param = new ParamMap(); - param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(ogCd)); + param.put("ogCd", ogCd); mav.addObject("managerList", userInfoService.selectManagerList(param)); return mav; } @@ -137,7 +139,7 @@ public class FipTargetController { mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); PartInfo partInfoView = fipTargetService.selectPartInfo(partInfo); ParamMap param = new ParamMap(); - param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(partInfoView.getMgtOrgan())); + param.put("ogCd", partInfoView.getMgtOrgan()); mav.addObject("managerList", userInfoService.selectManagerList(param)); partInfoView.setFileList(fipTargetService.selectPartInfoFile(partInfo)); mav.addObject("partInfo", partInfoView); @@ -180,7 +182,7 @@ public class FipTargetController { mav.addObject("partInfo", partInfoHistory); ParamMap param = new ParamMap(); - param.put("downOrganCdList", organConfigService.selectDownOrganListWhereUserOgCd(partInfoHistory.getMgtOrgan())); + param.put("ogCd", partInfoHistory.getMgtOrgan()); mav.addObject("managerList", userInfoService.selectManagerList(param)); String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/target/partInfoList").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java index f087daa5..e3d15b13 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java @@ -75,6 +75,8 @@ public class PartInfo extends BaseModel implements Serializable{ @Column(name = "wrt_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; + @Column(name = "pi_state") + private String piState; @Transient private List multipartFileList; diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java index bc8b384f..a960f98a 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java @@ -147,6 +147,7 @@ public class FipTargetService extends BaseService { partTmp.setWrtOrgan(partInfo.getWrtOrgan()); partTmp.setWrtTitle(partInfo.getWrtTitle()); partTmp.setWrtDt(partInfo.getWrtDt()); + partTmp.setPiState(partInfo.getPiState()); partInfoRepository.save(partTmp); //업데이트하는 버전 파일조회 List fileList = partInfoFileRepository.findByPiSeqAndVersionNoOrderByFileSeqAsc(partInfo.getPiSeq(),partInfo.getVersionNo()); diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml index d0a5bd6e..b2242f80 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -22,12 +22,17 @@ rent_price, utility_type, utility_price, - wrt_dt + wrt_user_seq, + wrt_dt, + pi_state from part_info pi, (select pi_seq,max(version_no) as lastVer from part_info group by pi_seq) b where pi.pi_seq = b.pi_seq and pi.version_no = b.lastVer + + and pi_state = #{piState} + and mgt_organ in #{item} @@ -172,7 +177,8 @@ from part_info pi, (select pi_seq,max(version_no) as lastVer from part_info group by pi_seq) b - where pi.pi_seq = b.pi_seq + where pi.pi_state = 'DST007' + and pi.pi_seq = b.pi_seq and pi.version_no = b.lastVer and mgt_organ in @@ -218,7 +224,8 @@ rent_price, utility_type, utility_price, - wrt_dt + wrt_dt, + pi_state from part_info pi, (select pi_seq,max(version_no) as lastVer from part_info group by pi_seq) b @@ -271,6 +278,7 @@ from part_info group by pi_seq) b where pi.pi_seq = b.pi_seq and pi.version_no = b.lastVer + and pi.pi_state = 'DST007' and mgt_organ in #{item} diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml index 3e5d55c9..1c5cb9a5 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -72,10 +72,8 @@ (select item_value from code_mgt where item_cd = title_cd) as title_cd, user_nm from user_info - where og_cd in - - #{item} - + where og_cd = #{ogCd} + and user_status = 'USC003' order by user_nm asc diff --git a/src/main/resources/static/js/fipTarget/partInfo.js b/src/main/resources/static/js/fipTarget/partInfo.js index 07566953..bd9e9c4f 100644 --- a/src/main/resources/static/js/fipTarget/partInfo.js +++ b/src/main/resources/static/js/fipTarget/partInfo.js @@ -145,7 +145,19 @@ $(document).on('click', '#savePartInfo', function (){ } } if(confirm("저장하시겠습니까?")){ - document.getElementById("mgtOrgan").disabled = false; + savePartInfo('DST007'); + } +}) + +$(document).on('click', '#saveTempBtn', function (){ + if(confirm("임시저장 하시겠습니까?")){ + savePartInfo('DST001'); + } +}) + +function savePartInfo(piState){ + $("#piState").val(piState); + document.getElementById("mgtOrgan").disabled = false; contentFade("in"); const formData = new FormData($("#partInfoSave")[0]); for(const file of files) { @@ -168,8 +180,7 @@ $(document).on('click', '#savePartInfo', function (){ contentFade("out"); } }) - } -}) +} $(document).on('click', '.partInfoTr', function (){ const piSeq = (Number($(this).find(".piSeq").val())); @@ -238,9 +249,9 @@ $(document).on('change', '#mUtilityType', function (){ }); $(document).on('click', '#updatePartInfo', function (){ - if($('#mgtOrgan').val() == ''){ + if($('#mMgtOrgan').val() == ''){ alert('해경서를 선택해주세요'); - $('#mgtOrgan').focus(); + $('#mMgtOrgan').focus(); return false; } if($('#mPiUserSeq').val() == ''){ @@ -282,7 +293,20 @@ $(document).on('click', '#updatePartInfo', function (){ } } if(confirm("수정하시겠습니까?")){ - document.getElementById("mgtOrgan").disabled = false; + updatePartInfo('DST007'); + } +}) + +$(document).on('click', '#mSaveTempBtn', function (){ + if(confirm("임시저장 하시겠습니까?")){ + updatePartInfo('DST001'); + } +}) + +function updatePartInfo(piState){ + document.getElementById("mMgtOrgan").disabled = false; + document.getElementById("mPiUserSeq").disabled = false; + $("#mPiState").val(piState); contentFade("in"); const formData = new FormData($("#partInfoUpdate")[0]); for(const file of files) { @@ -307,9 +331,8 @@ $(document).on('click', '#updatePartInfo', function (){ alert("수정에 실패하였습니다.") contentFade("out"); } - }) - } -}) + }) +} function showHistory(piSeq){ $.ajax({ diff --git a/src/main/resources/templates/fipTarget/partInfoEditModal.html b/src/main/resources/templates/fipTarget/partInfoEditModal.html index 499ec097..120acf89 100644 --- a/src/main/resources/templates/fipTarget/partInfoEditModal.html +++ b/src/main/resources/templates/fipTarget/partInfoEditModal.html @@ -9,6 +9,7 @@
+
@@ -135,6 +136,7 @@
+
diff --git a/src/main/resources/templates/fipTarget/partInfoHistoryDiv.html b/src/main/resources/templates/fipTarget/partInfoHistoryDiv.html index 92cb5892..5e9dda26 100644 --- a/src/main/resources/templates/fipTarget/partInfoHistoryDiv.html +++ b/src/main/resources/templates/fipTarget/partInfoHistoryDiv.html @@ -6,31 +6,31 @@
- +
-
- +
-
- +
@@ -41,11 +41,11 @@
- - + @@ -63,7 +63,7 @@
- @@ -72,13 +72,13 @@
- +
- +
@@ -89,11 +89,11 @@
- +
- @@ -102,13 +102,14 @@
- + +
- +
@@ -124,7 +125,6 @@ diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html index 5de76368..99eeb7b6 100644 --- a/src/main/resources/templates/fipTarget/partInfoList.html +++ b/src/main/resources/templates/fipTarget/partInfoList.html @@ -127,25 +127,48 @@ - - - + + + + + + + + + + + + + + + + + 무상 + + 무상 + + + + + + + + + + + + + + + + + + + 무상 + + 무상 + - - - - - - - - - - - - 무상 - - 무상 - diff --git a/src/main/resources/templates/fipTarget/partInfoModifyModal.html b/src/main/resources/templates/fipTarget/partInfoModifyModal.html index 6b578a60..0c398c0c 100644 --- a/src/main/resources/templates/fipTarget/partInfoModifyModal.html +++ b/src/main/resources/templates/fipTarget/partInfoModifyModal.html @@ -19,6 +19,7 @@ +
@@ -31,25 +32,25 @@
-
- +
-
- +
@@ -60,7 +61,7 @@
- @@ -71,7 +72,7 @@
- @@ -159,6 +160,7 @@
+