From c2da2f1b47c4388c529c87100087f2d1e18d357e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 4 Oct 2022 18:41:46 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=9D=BC=EA=B4=84=EA=B2=B0=EC=9E=AC=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/fpiMgt/affair/AffairController.java | 8 +- .../fpiMgt/affair/service/AffairService.java | 56 ++++----- .../resources/mybatisMapper/AffairMapper.xml | 4 + .../igActivities/fpiMgt/affair/affairMgt.js | 111 ++++++++++++++---- .../igActivities/fpiMgt/affair/affairMgt.html | 69 ++++++++--- .../fpiMgt/affair/affairViewModal.html | 12 +- 6 files changed, 181 insertions(+), 79 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java index 870ea282..218a4ca6 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java @@ -14,6 +14,7 @@ import org.springframework.web.servlet.ModelAndView; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -96,6 +97,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 break; } } + mav.addObject("userOrgan", loginUser.getOgCd()); mav.addObject("accessAuth", accessAuth); mav.addObject("apprvAuth", apprvAuth); affairBoard.setQueryInfo(); @@ -188,6 +190,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 } mav.addObject("affair", affairBoard); mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("userOrgan", loginUser.getOgCd()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth()); String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth(); @@ -207,7 +210,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 } @PostMapping("/affairStateChange") - public Integer affairStateChange(@AuthenticationPrincipal UserInfo loginUser, AffairRating rating){ - return affairService.affairStateChange(loginUser, rating); + @ResponseBody + public Integer affairStateChange(@AuthenticationPrincipal UserInfo loginUser, @RequestBody List ratingList){ + return affairService.affairStateChange(loginUser, ratingList); } } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java index 1e592116..b2065648 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java @@ -119,36 +119,38 @@ public class AffairService extends BaseService { // 견문보고 } @Transactional - public Integer affairStateChange(UserInfo loginUser, AffairRating rating) { - AffairRating savedRating = affairRatingRepository.findById(new AffairRating.AffairRatingId(rating.getAffairKey(), rating.getRatingOrgan())).orElse(null); - if(savedRating != null){ - if(rating.getHeadApprv() == null){ - savedRating.setSectionNm(loginUser.getUserNm()); - savedRating.setSectionApprvDt(LocalDateTime.now()); - savedRating.setSectionApprv(rating.getSectionApprv()); - savedRating.setSectionEtc(rating.getSectionEtc()); - savedRating.setAffairStatus(rating.getSectionApprv()); - }else{ - savedRating.setHeadNm(loginUser.getUserNm()); - savedRating.setHeadApprvDt(LocalDateTime.now()); - savedRating.setHeadApprv(rating.getHeadApprv()); - savedRating.setHeadEtc(rating.getHeadEtc()); - savedRating.setAffairRate(rating.getAffairRate()); - savedRating.setOrganUp(rating.getOrganUp()==null?"F":rating.getOrganUp()); - savedRating.setAffairStatus(rating.getHeadApprv()); - if(savedRating.getOrganUp().equals("T")){ - List organList = loginUser.getUpOrganCdList(); - String upOrgan = organList.get(organList.indexOf(savedRating.getRatingOrgan())-1); - AffairRating upRating = new AffairRating(); - upRating.setRatingOrgan(upOrgan); - upRating.setAffairKey(savedRating.getAffairKey()); - upRating.setAffairStatus("DST002"); - affairRatingRepository.save(upRating); + public Integer affairStateChange(UserInfo loginUser, List ratingList) { + for(AffairRating rating : ratingList){ + AffairRating savedRating = affairRatingRepository.findById(new AffairRating.AffairRatingId(rating.getAffairKey(), loginUser.getOgCd())).orElse(null); + if(savedRating != null){ + if(rating.getHeadApprv() == null){ + savedRating.setSectionNm(loginUser.getUserNm()); + savedRating.setSectionApprvDt(LocalDateTime.now()); + savedRating.setSectionApprv(rating.getSectionApprv()); + savedRating.setSectionEtc(rating.getSectionEtc()); + savedRating.setAffairStatus(rating.getSectionApprv()); + }else{ + savedRating.setHeadNm(loginUser.getUserNm()); + savedRating.setHeadApprvDt(LocalDateTime.now()); + savedRating.setHeadApprv(rating.getHeadApprv()); + savedRating.setHeadEtc(rating.getHeadEtc()); + savedRating.setAffairRate(rating.getAffairRate()); + savedRating.setOrganUp(rating.getOrganUp()==null?"F":rating.getOrganUp()); + savedRating.setAffairStatus(rating.getHeadApprv()); + if(savedRating.getOrganUp().equals("T")){ + List organList = loginUser.getUpOrganCdList(); + String upOrgan = organList.get(organList.indexOf(savedRating.getRatingOrgan())-1); + AffairRating upRating = new AffairRating(); + upRating.setRatingOrgan(upOrgan); + upRating.setAffairKey(savedRating.getAffairKey()); + upRating.setAffairStatus("DST002"); + affairRatingRepository.save(upRating); + } } + affairRatingRepository.save(savedRating); } - affairRatingRepository.save(savedRating); } - return rating.getAffairKey(); + return ratingList.size()>1?0:ratingList.get(0).getAffairKey(); } public FileInfo selectAffairFile(Integer parentKey, Integer fileSeq) { diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index d2e6d885..61f27c1c 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -60,6 +60,10 @@ + + + + + + + + + + + + @@ -111,29 +127,46 @@ - 임시저장 - 결재대기 - 계장반려 - 계장결재 - 부장반려 - 부장결재 + + + - - + + + - + + + - - + + +
+
+ + + + + + +
+
+ +
+
+ + +
+
@@ -183,7 +216,7 @@
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index 7c1e88a0..e157a1c8 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -142,7 +142,6 @@
-

@@ -164,7 +163,7 @@
- +
@@ -185,7 +184,7 @@
- +
@@ -196,12 +195,11 @@
-
- +
@@ -216,7 +214,7 @@
- +
@@ -227,7 +225,7 @@
-
+