diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index 59955895..1d338d98 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -239,7 +239,10 @@ public class FileController extends BaseService{ downloadFile = monitoringService.selectDesignationFile(parentKey, fileSeq); break; case "monitoringResult": - downloadFile = monitoringService.selectmonitoringResultFile(parentKey, fileSeq); + downloadFile = monitoringService.selectMonitoringResultFile(parentKey, fileSeq); + break; + case "monitoringReport": + downloadFile = monitoringService.selectMonitoringReportFile(parentKey, fileSeq); break; } return downloadFile; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/model/MonitoringResult.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/model/MonitoringResult.java index 2ea9bc34..3f66c748 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/model/MonitoringResult.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/model/MonitoringResult.java @@ -36,6 +36,10 @@ public class MonitoringResult extends BaseModel { private String mrTitle; @Column(name = "clear_title") private String clearTitle; + @Column(name = "monitoring_yn") + private String monitoringYn; + @Column(name = "monitoring_reason") + private String monitoringReason; @Column(name = "mr_sdate") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate mrSdate; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java index e79a4291..f6e69750 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java @@ -20,6 +20,7 @@ import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationApprv; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationFile; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationFile.monitoringDesignationFileId; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringReport; +import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringReport.MonitoringReportId; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringResult; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringResultApprv; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringResultClearInfo; @@ -182,8 +183,8 @@ public class MonitoringService extends BaseService { } if(mr.getMrState().equals("DST002")){ //작성완료일 때 계장 결재 사용자에게 알림 발송. - userAlarmService.sendAlarmToApprvUser(mrKey, mr.getWrtOrgan(), "APC003", 37, "해양외사 모니터링 모니터링보고에 결재대기 문서가 있습니다."); - userAlarmService.sendAlarmToApprvUser(mrKey, mr.getWrtOrgan(), "APC004", 37, "해양외사 모니터링 모니터링보고에 결재대기 문서가 있습니다."); + userAlarmService.sendAlarmToApprvUser(mrKey, mr.getWrtOrgan(), "APC003", 37, "해양외사 모니터링 청산보고서에 결재대기 문서가 있습니다."); + userAlarmService.sendAlarmToApprvUser(mrKey, mr.getWrtOrgan(), "APC004", 37, "해양외사 모니터링 청산보고서에 결재대기 문서가 있습니다."); } return mrKey; } @@ -237,6 +238,16 @@ public class MonitoringService extends BaseService { } private void saveReportList(Integer mrKey, List reportList){ + //파일삭제 + List fileList = monitoringReportRepository.findByMrKey(mrKey); + if(fileList != null) { + for(MonitoringReport file: fileList){ + if(file.getOrigNm() != null) { + deleteStoredFile(new File(file.getSavePath(), file.getConvNm())); + } + } + } + monitoringReportRepository.deleteByMrKey(mrKey); for(MonitoringReport info: reportList){ if(info.getFile() != null) { @@ -277,7 +288,8 @@ public class MonitoringService extends BaseService { } return savedReslut; } - + + @Transactional public Integer resultStateChange(MonitoringResultApprv apprv) { MonitoringResult saveResult = monitoringResultRepository.findById(apprv.getMrKey()).orElse(null); saveResult.setMrState(apprv.getState()); @@ -288,8 +300,8 @@ public class MonitoringService extends BaseService { switch (apprv.getState()){ case "DST004": // 계장승인시 부장 결재권자에게 알림 발송. - userAlarmService.sendAlarmToApprvUser(saveResult.getMrKey(), saveResult.getWrtOrgan(), "APC001", 37, "해양외사 모니터링 모니터링보고에 결재대기 문서가 있습니다."); - userAlarmService.sendAlarmToApprvUser(saveResult.getMrKey(), saveResult.getWrtOrgan(), "APC002", 37, "해양외사 모니터링 모니터링보고에 결재대기 문서가 있습니다."); + userAlarmService.sendAlarmToApprvUser(saveResult.getMrKey(), saveResult.getWrtOrgan(), "APC001", 37, "해양외사 모니터링 청산보고서에 결재대기 문서가 있습니다."); + userAlarmService.sendAlarmToApprvUser(saveResult.getMrKey(), saveResult.getWrtOrgan(), "APC002", 37, "해양외사 모니터링 청산보고서에 결재대기 문서가 있습니다."); break; case "DST003": case "DST005": @@ -304,10 +316,14 @@ public class MonitoringService extends BaseService { return apprv.getMrKey(); } - public MonitoringResultFile selectmonitoringResultFile(Integer parentKey, Integer fileSeq) { + public MonitoringResultFile selectMonitoringResultFile(Integer parentKey, Integer fileSeq) { return monitoringResultFileRepository.findById(new MonitoringResultFileId(parentKey,fileSeq)).orElse(null); } + public MonitoringReport selectMonitoringReportFile(Integer parentKey, Integer infoSeq) { + return monitoringReportRepository.findById(new MonitoringReportId(parentKey,infoSeq)).orElse(null); + } + diff --git a/src/main/resources/mybatisMapper/MonitoringMapper.xml b/src/main/resources/mybatisMapper/MonitoringMapper.xml index 23fbf8cf..d488345c 100644 --- a/src/main/resources/mybatisMapper/MonitoringMapper.xml +++ b/src/main/resources/mybatisMapper/MonitoringMapper.xml @@ -108,8 +108,8 @@ and mr.wrt_organ = #{wrtOrgan} - - and mr.mr_title like '%'||#{mrTitle}||'%' + + and mr.clear_title like '%'||#{clearTitle}||'%' and mr.mr_state = #{mrState} @@ -161,6 +161,7 @@ + + + + + +
+ +
+ + +
@@ -189,19 +206,19 @@
- +
- +
- +
- +
@@ -293,6 +310,7 @@
+
@@ -304,27 +322,27 @@
-
-
+
+
-
+
-
-
+
+
-
+
- -
@@ -414,6 +432,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultList.html b/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultList.html index 0bc9a0db..752da906 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultList.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultList.html @@ -11,8 +11,8 @@
-

모니터링 보고

-

첩보수집활동 > 해양외사 모니터링 > 모니터링 보고

+

청산 보고서

+

첩보수집활동 > 해양외사 모니터링 > 청산보고서

@@ -59,7 +59,7 @@
- +