diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java index 7f16d85e..e76dd305 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java @@ -123,8 +123,8 @@ public class AffairService extends BaseService { // 견문보고 } } - private String makeDocNo(String wrtOrgan){ - String docNo = ((Integer)LocalDate.now().getYear()).toString(); + private String makeDocNo(String wrtOrgan, Integer year){ + String docNo = year.toString(); Map params = new HashMap<>(); params.put("wrtOrgan", wrtOrgan); params.put("year", docNo); @@ -138,6 +138,7 @@ public class AffairService extends BaseService { // 견문보고 AffairRating savedRating = affairRatingRepository.findById(new AffairRating.AffairRatingId(rating.getAffairKey(), loginUser.getOgCd())).orElse(null); if(savedRating != null){ if(rating.getHeadApprv() == null){ + savedRating.setSectionTitle(loginUser.getTitleCd()); savedRating.setSectionNm(loginUser.getUserNm()); savedRating.setSectionApprvDt(LocalDateTime.now()); savedRating.setSectionApprv(rating.getSectionApprv()); @@ -156,6 +157,7 @@ public class AffairService extends BaseService { // 견문보고 break; } }else{ + savedRating.setHeadTitle(loginUser.getTitleCd()); savedRating.setHeadNm(loginUser.getUserNm()); savedRating.setHeadApprvDt(LocalDateTime.now()); savedRating.setHeadApprv(rating.getHeadApprv()); @@ -167,7 +169,7 @@ public class AffairService extends BaseService { // 견문보고 AffairBoard affairBoard = affairBoardRepository.findById(savedRating.getAffairKey()).orElse(null); if(affairBoard.getDocNo() == null && affairBoard.getWrtOrgan().equals(savedRating.getRatingOrgan())){ - affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan())); + affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear())); } } if(savedRating.getOrganUp().equals("T")){ @@ -261,7 +263,7 @@ public class AffairService extends BaseService { // 견문보고 AffairBoard affairBoard = affairBoardRepository.findById(rating.getAffairKey()).orElse(null); if(affairBoard.getDocNo() == null && affairBoard.getWrtOrgan().equals(rating.getRatingOrgan())){ - affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan())); + affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear())); } } }else if(!Utils.isEmpty(rating.getSectionApprv())) { diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index 9fa634e5..05cde30b 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -144,6 +144,7 @@ inner join affair_rating b on a.affair_key = b.affair_key and a.wrt_organ = b.rating_organ and b.affair_status = 'DST006' where wrt_organ = #{wrtOrgan} + and a.doc_no is not null and EXTRACT(YEAR FROM report_dt) = #{year}::numeric diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index 8eae8509..22bae91e 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -145,7 +145,12 @@ - + @@ -172,7 +177,12 @@ - +