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 36523343..dd71bfab 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.fpiMgt.affair; import com.dbnt.faisp.authMgt.service.AuthMgtService; import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.fpiMgt.affair.model.AffairRating; import com.dbnt.faisp.fpiMgt.affair.service.AffairService; import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; @@ -186,11 +187,17 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 return affairService.saveAffairBoard(affairBoard, deleteFileSeq); } - /*@PostMapping("/affairStateChange") - public Integer affairStateChange(@AuthenticationPrincipal UserInfo loginUser, AffairApprv apprv){ - apprv.setUserSeq(loginUser.getUserSeq()); - apprv.setUserNm(loginUser.getUserNm()); - apprv.setSaveDt(LocalDateTime.now()); - return affairService.affairStateChange(apprv); - }*/ + @PostMapping("/affairStateChange") + public Integer affairStateChange(@AuthenticationPrincipal UserInfo loginUser, AffairRating rating){ + String apprvType = "section"; + if(rating.getHeadApprv() == null){ + rating.setSectionNm(loginUser.getUserNm()); + rating.setSectionApprvDt(LocalDateTime.now()); + }else{ + apprvType = "head"; + rating.setHeadNm(loginUser.getUserNm()); + rating.setHeadApprvDt(LocalDateTime.now()); + } + return affairService.affairStateChange(apprvType, rating); + } } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java b/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java index f28ba8e3..63ed16f6 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java @@ -56,6 +56,11 @@ public class AffairBoard extends BaseModel { @Column(name = "report_dt") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate reportDt; + @Column(name = "auto_delete") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate autoDelete; + @Column(name = "view_status") + private String viewStatus; @Transient diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairRating.java b/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairRating.java index 1d75ac96..2cff1b43 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairRating.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairRating.java @@ -6,6 +6,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; +import java.time.LocalDateTime; @Getter @Setter @@ -24,12 +25,16 @@ public class AffairRating{ private String ratingOrgan; @Column(name = "section_nm") private String sectionNm; + @Column(name = "section_apprv_dt") + private LocalDateTime sectionApprvDt; @Column(name = "section_apprv") private String sectionApprv; @Column(name = "section_etc") private String sectionEtc; @Column(name = "head_nm") private String headNm; + @Column(name = "head_apprv_dt") + private LocalDateTime headApprvDt; @Column(name = "head_apprv") private String headApprv; @Column(name = "head_etc") 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 61c9ebaa..4021b3ef 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 @@ -5,8 +5,7 @@ import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.fpiMgt.affair.mapper.AffairMapper; import com.dbnt.faisp.fpiMgt.affair.model.*; import com.dbnt.faisp.fpiMgt.affair.repository.*; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,6 +44,15 @@ public class AffairService extends BaseService { // 견문보고 @Transactional public Integer saveAffairBoard(AffairBoard affair, List deleteFileSeq){ Integer affairKey = affairBoardRepository.save(affair).getAffairKey(); + if(affair.getAffairStatus().equals("DST002")){ + AffairRating rating = affairRatingRepository.findById(new AffairRating.AffairRatingId(affairKey,affair.getWrtOrgan())).orElse(null); + if(rating == null){ + rating = new AffairRating(); + rating.setAffairKey(affairKey); + rating.setRatingOrgan(affair.getWrtOrgan()); + affairRatingRepository.save(rating); + } + } String[] hashTagAry = affair.getHashTags().split(" "); if(hashTagAry.length>0){ saveHashTagLink(affairKey, hashTagAry); @@ -106,4 +114,23 @@ public class AffairService extends BaseService { // 견문보고 affairFileRepository.save(fileInfo); } } + + public Integer affairStateChange(String apprvType, AffairRating rating) { + AffairRating savedRating = affairRatingRepository.findById(new AffairRating.AffairRatingId(rating.getAffairKey(), rating.getRatingOrgan())).orElse(null); + if(savedRating != null){ + if(apprvType.equals("section")){ + savedRating.setSectionNm(rating.getSectionNm()); + savedRating.setSectionApprvDt(rating.getSectionApprvDt()); + savedRating.setSectionApprv(rating.getSectionApprv()); + savedRating.setSectionEtc(rating.getSectionEtc()); + }else{ + savedRating.setHeadNm(rating.getHeadNm()); + savedRating.setHeadApprvDt(rating.getHeadApprvDt()); + savedRating.setHeadApprv(rating.getHeadApprv()); + savedRating.setHeadEtc(rating.getHeadEtc()); + } + affairRatingRepository.save(savedRating); + } + return rating.getAffairKey(); + } } diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 5b08f518..d37a8f02 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -21,7 +21,7 @@ spring.datasource.username=dbnt0031 spring.datasource.password=dbnt0928! #jpa -spring.jpa.show-sql=true +spring.jpa.show-sql=false spring.jpa.generate-ddl=false spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index 171b4123..08d9a51f 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -21,13 +21,11 @@ and a.affair_status = #{affairStatus} - - - and a.wrt_dt >= #{startDate}::date - - - and a.wrt_dt <= #{endDate}::date - + + and a.wrt_dt >= #{startDate}::date + + + and a.wrt_dt <= #{endDate}::date+1 and a.wrt_organ in @@ -35,6 +33,26 @@ #{organCd} + + + and a.affair_status in ('DST002', 'DST004') + + + and a.affair_status in ('DST003', 'DST005', 'DST006') + + + and a.affair_status in ('DST003', 'DST004', 'DST005', 'DST006') + + + and a.affair_status in ('DST003', 'DST005', 'DST006') + + + and a.affair_status in ('DST002', 'DST004') + + + and a.affair_status in ('DST003', 'DST005', 'DST006') + +
- +
- +
- +
- -
- -
- +
- + +
+ +
+ +
+ +
+ +
+ +
+
+
+
- +
- +
- +
+
- -
- -
-
-
- +
- +
- + +
+
+
+ +
+
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index e4bf9667..5f8929ce 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -11,55 +11,71 @@
- +
- +
- +
- +
- -
- -
- + +
+
- +
- + +
+ +
+ +
+ +
+ +
+ + + + + +
+
+
+
- +
- +
- +
- +
- +
- +
- +
@@ -70,13 +86,7 @@
- -
-
-
- -
- +

@@ -86,10 +96,17 @@
+
+
+ +
+ +
+
- +
@@ -120,25 +137,54 @@
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html index 0092e833..72355dbf 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html @@ -16,7 +16,7 @@