From 6b9f98ce3b8f40aca4be660b8558ed60ddf534cc Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Sat, 28 Jan 2023 13:44:16 +0900 Subject: [PATCH 1/3] =?UTF-8?q?leftMenu=20=EC=88=98=EC=A0=95=EC=A4=91,=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/css/common.css | 8 ++++++++ .../templates/faStatistics/asfCov/asfCov.html | 4 +++- .../faStatistics/asfCov/asfCovViewModal.html | 2 +- .../crackdownStatus/crackdownStatus.html | 5 +++-- .../faStatistics/fishingBoat/fishingBoatMgt.html | 6 +++--- .../processResult/processResult.html | 5 +++-- .../resources/templates/fragments/leftMenu.html | 16 ++++++++-------- .../templates/police/career/careerMgt.html | 8 ++++---- .../templates/police/career/careerModal.html | 2 +- .../templates/police/education/eduEditModal.html | 2 +- .../templates/police/education/educationMgt.html | 10 +++++----- .../police/personnelStatus/personnelStatus.html | 4 ++-- .../templates/police/police/policeEditModal.html | 2 +- .../templates/police/police/policeList.html | 11 ++++++----- .../templates/translator/translator.html | 8 ++++---- .../translator/translatorCareerInsert.html | 2 +- 16 files changed, 54 insertions(+), 41 deletions(-) diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 93304453..c9f409fd 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -67,6 +67,14 @@ content: url("/img/bootstrap-icons-1.9.1/caret-down.svg"); } +.btn-toggle3::before { + content: url("/img/bootstrap-icons-1.9.1/chevron-right.svg"); + filter: invert(100%); +} +.btn-toggle3[aria-expanded="true"]::before { + content: url("/img/bootstrap-icons-1.9.1/chevron-down.svg"); +} + .f-invert{ filter: invert(100%); } diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCov.html b/src/main/resources/templates/faStatistics/asfCov/asfCov.html index 09e4baf1..4a4953ec 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCov.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCov.html @@ -89,6 +89,7 @@ + @@ -123,7 +124,8 @@ - + + diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html index 658cf686..f10a9216 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html @@ -47,7 +47,7 @@
- + diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index f3d4e7a1..4fdc6abe 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -338,7 +338,7 @@
순번 사건번호 나포일시 선명
- + @@ -562,9 +562,10 @@ - + + + + @@ -101,8 +103,6 @@ - -
순번 나포일시 위반내용 위반장소
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index 375e0116..cf17a888 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -165,7 +165,7 @@ - + @@ -184,9 +184,9 @@ - + - + + @@ -127,14 +128,15 @@ - + + - + diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html index b78fa1de..ebaebffb 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html @@ -27,7 +27,7 @@
- +
- - + + - +
순번 나포일시 나포해점 사건담당경찰서
diff --git a/src/main/resources/templates/faStatistics/processResult/processResult.html b/src/main/resources/templates/faStatistics/processResult/processResult.html index b1912620..38fcd8dd 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResult.html +++ b/src/main/resources/templates/faStatistics/processResult/processResult.html @@ -114,7 +114,7 @@ - + @@ -132,8 +132,9 @@ - + + diff --git a/src/main/resources/templates/fragments/leftMenu.html b/src/main/resources/templates/fragments/leftMenu.html index 8ee0625a..66ba94c5 100644 --- a/src/main/resources/templates/fragments/leftMenu.html +++ b/src/main/resources/templates/fragments/leftMenu.html @@ -7,15 +7,15 @@
-
    -
  • +
      +
    • - -
      +
      • @@ -23,13 +23,13 @@
        • - -
          @@ -39,12 +39,12 @@
          • -
          - +
      diff --git a/src/main/resources/templates/police/career/careerMgt.html b/src/main/resources/templates/police/career/careerMgt.html index 7d59e57a..aebdfd24 100644 --- a/src/main/resources/templates/police/career/careerMgt.html +++ b/src/main/resources/templates/police/career/careerMgt.html @@ -81,11 +81,11 @@
+ + - - @@ -100,11 +100,11 @@ + + - - + + - - + - @@ -99,11 +99,11 @@ + + - - diff --git a/src/main/resources/templates/police/personnelStatus/personnelStatus.html b/src/main/resources/templates/police/personnelStatus/personnelStatus.html index c6ea8cdc..9781f2a5 100644 --- a/src/main/resources/templates/police/personnelStatus/personnelStatus.html +++ b/src/main/resources/templates/police/personnelStatus/personnelStatus.html @@ -156,7 +156,7 @@
- +
@@ -174,7 +174,7 @@
- +
diff --git a/src/main/resources/templates/police/police/policeEditModal.html b/src/main/resources/templates/police/police/policeEditModal.html index d74039c1..07ced379 100644 --- a/src/main/resources/templates/police/police/policeEditModal.html +++ b/src/main/resources/templates/police/police/policeEditModal.html @@ -153,7 +153,7 @@
- +
diff --git a/src/main/resources/templates/police/police/policeList.html b/src/main/resources/templates/police/police/policeList.html index b86b45f1..693d9708 100644 --- a/src/main/resources/templates/police/police/policeList.html +++ b/src/main/resources/templates/police/police/policeList.html @@ -95,11 +95,11 @@ + + - - @@ -123,19 +123,20 @@ + + - - - + + diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index 4e2a84e4..b4d0826c 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -109,8 +109,8 @@
순번 사건번호 사건담당경찰서 피의자(선박명)
순번관서부서 직책 계급 성명청부서 생년월일 성별 외사경력
diff --git a/src/main/resources/templates/police/career/careerModal.html b/src/main/resources/templates/police/career/careerModal.html index 5e1728ab..346f6b4d 100644 --- a/src/main/resources/templates/police/career/careerModal.html +++ b/src/main/resources/templates/police/career/careerModal.html @@ -111,6 +111,6 @@
- +
\ No newline at end of file diff --git a/src/main/resources/templates/police/education/eduEditModal.html b/src/main/resources/templates/police/education/eduEditModal.html index b21abcb6..c7744385 100644 --- a/src/main/resources/templates/police/education/eduEditModal.html +++ b/src/main/resources/templates/police/education/eduEditModal.html @@ -51,7 +51,7 @@
- +
diff --git a/src/main/resources/templates/police/education/educationMgt.html b/src/main/resources/templates/police/education/educationMgt.html index 60ecd20b..37fe14fd 100644 --- a/src/main/resources/templates/police/education/educationMgt.html +++ b/src/main/resources/templates/police/education/educationMgt.html @@ -82,14 +82,14 @@
순번관서부서 직책 계급 성명청현부서
과		생년월일 성별최종수정일
순번관서부서 직책 계급 성명청현부서
과		 생년월일 성별 최초
임용		 O X
- - + + @@ -313,8 +313,8 @@
- - + +
diff --git a/src/main/resources/templates/translator/translatorCareerInsert.html b/src/main/resources/templates/translator/translatorCareerInsert.html index 771beeb3..d3ce80f5 100644 --- a/src/main/resources/templates/translator/translatorCareerInsert.html +++ b/src/main/resources/templates/translator/translatorCareerInsert.html @@ -21,7 +21,7 @@
- +
From 199fc8e79bee7e4e09e8c3fffb32612454ca6a50 Mon Sep 17 00:00:00 2001 From: Hyung Geun Date: Sat, 28 Jan 2023 14:16:45 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EB=B3=B4=EA=B3=A0=20=EC=88=98=EC=82=AC=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=88=9C=EC=84=9C=20=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/css/common.css | 4 ++ .../resources/templates/faRpt/faRptBoard.html | 43 +++++++++++-------- .../templates/faRpt/faRptEditModal.html | 2 + .../templates/faRpt/faRptViewModal.html | 2 + src/main/resources/templates/ivsgt/ivsgt.html | 6 ++- .../majorStatus/majorStatusEditModal.html | 4 +- .../ivsgt/majorStatus/majorStatusPage.html | 6 +-- .../majorStatus/majorStatusViewModal.html | 4 +- .../publicBoard/reference/referencePage.html | 4 +- 9 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 93304453..07788d43 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -214,3 +214,7 @@ top: 0px; } + +.titleLeft { + text-align: left !important; +} \ No newline at end of file diff --git a/src/main/resources/templates/faRpt/faRptBoard.html b/src/main/resources/templates/faRpt/faRptBoard.html index 3a9fa9d7..a40fbb51 100644 --- a/src/main/resources/templates/faRpt/faRptBoard.html +++ b/src/main/resources/templates/faRpt/faRptBoard.html @@ -87,43 +87,46 @@
연번관서명순번관서 언어 경력 성명
- - + + - + + - - + - + + + + + + + - - +
상태순번관서 분류 제목관서첨부파일열람수 부서 작성자 작성일시첨부파일열람수상태
+ + + + + + + +
@@ -200,7 +203,9 @@
+
diff --git a/src/main/resources/templates/faRpt/faRptEditModal.html b/src/main/resources/templates/faRpt/faRptEditModal.html index cf9c507a..e5b6172c 100644 --- a/src/main/resources/templates/faRpt/faRptEditModal.html +++ b/src/main/resources/templates/faRpt/faRptEditModal.html @@ -123,7 +123,9 @@
+
\ No newline at end of file diff --git a/src/main/resources/templates/faRpt/faRptViewModal.html b/src/main/resources/templates/faRpt/faRptViewModal.html index bbe7608d..6c6bd4eb 100644 --- a/src/main/resources/templates/faRpt/faRptViewModal.html +++ b/src/main/resources/templates/faRpt/faRptViewModal.html @@ -119,5 +119,7 @@ + \ No newline at end of file diff --git a/src/main/resources/templates/ivsgt/ivsgt.html b/src/main/resources/templates/ivsgt/ivsgt.html index 288a2053..75155fd1 100644 --- a/src/main/resources/templates/ivsgt/ivsgt.html +++ b/src/main/resources/templates/ivsgt/ivsgt.html @@ -118,6 +118,7 @@
순번 관서 검거유형1 검거유형2
순번작성일시종류분류 제목 내용 첨부파일작성일시
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html index 9631964f..dcf17b17 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html @@ -76,6 +76,8 @@ - + + \ No newline at end of file diff --git a/src/main/resources/templates/publicBoard/reference/referencePage.html b/src/main/resources/templates/publicBoard/reference/referencePage.html index df9ba9af..4a030db1 100644 --- a/src/main/resources/templates/publicBoard/reference/referencePage.html +++ b/src/main/resources/templates/publicBoard/reference/referencePage.html @@ -90,6 +90,8 @@ -->
From 30df322f4e7bb1c1b812cb2bb12b0790a9ae76e1 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Sat, 28 Jan 2023 14:26:03 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=EC=99=B8=EC=82=AC=EB=B6=84?= =?UTF-8?q?=EC=8B=A4=EC=9A=B4=EC=98=81=ED=98=84=ED=99=A9,=EC=8B=A4?= =?UTF-8?q?=EC=A0=81=20=EC=88=98=EC=A0=95=20=EC=88=98=EC=A0=95=EB=B2=88?= =?UTF-8?q?=ED=98=B8=2014?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/equip/EquipController.java | 4 +- .../main/fipTarget/FipTargetController.java | 18 +++--- .../faisp/main/fipTarget/model/PartInfo.java | 2 + .../fipTarget/service/FipTargetService.java | 1 + .../resources/mybatisMapper/FipTarget.xml | 14 ++++- .../mybatisMapper/UserInfoMapper.xml | 6 +- .../resources/static/js/fipTarget/partInfo.js | 41 ++++++++++--- .../fipTarget/partInfoEditModal.html | 2 + .../fipTarget/partInfoHistoryDiv.html | 30 +++++----- .../templates/fipTarget/partInfoList.html | 59 +++++++++++++------ .../fipTarget/partInfoModifyModal.html | 14 +++-- 11 files changed, 126 insertions(+), 65 deletions(-) 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 @@
+