diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java
index 75e0d97b..92ddeb8b 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java
@@ -80,6 +80,9 @@ public class CrackdownStatusController {
crackdownStatus.setViolationList(violationRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey()));
crackdownStatus.setSailorList(sailorRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey()));
}else{
+ crackdownStatus.setWrtOrgan(loginUser.getOgCd());
+ crackdownStatus.setWrtPart(loginUser.getOfcCd());
+ crackdownStatus.setWrtUserGrd(loginUser.getGroupCd());
crackdownStatus.setWrtOrgan(loginUser.getOgCd());
crackdownStatus.setWrtUserNm(loginUser.getUserNm());
crackdownStatus.setWrtDt(LocalDateTime.now());
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java
index 0228dafd..ab6959bf 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java
@@ -78,6 +78,8 @@ public class ProcessResultController {
processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey()));
}else{
processResult.setWrtOrgan(loginUser.getOgCd());
+ processResult.setWrtPart(loginUser.getOfcCd());
+ processResult.setWrtUserGrd(loginUser.getGroupCd());
processResult.setWrtUserNm(loginUser.getUserNm());
processResult.setWrtDt(LocalDateTime.now());
}
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java
index 05b57162..81e238d8 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java
@@ -111,6 +111,8 @@ public class SailorController {
sailor.setFishingBoatList(fishingBoatRepository.findAll());
sailor.setWrtOrgan(loginUser.getOgCd());
+ sailor.setWrtPart(loginUser.getOfcCd());
+ sailor.setWrtUserGrd(loginUser.getGroupCd());
sailor.setWrtUserNm(loginUser.getUserNm());
sailor.setWrtDt(LocalDateTime.now());
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java
index 9920af84..a2478472 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java
@@ -8,8 +8,10 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
+import java.time.LocalDateTime;
import java.util.List;
@Getter
@@ -28,7 +30,9 @@ public class ProcessResult extends ProcessResultBaseEntity {
@Column(name = "cds_key")
private Integer cdsKey;
-
+ @Transient
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDateTime updDt;
@Transient
private CrackdownStatus crackdownStatus;
@Transient
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java
index b3ff26d5..205a722b 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java
@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
import java.time.LocalDate;
@@ -31,6 +32,9 @@ public class Sailor extends SailorBaseEntity {
@Column(name = "fb_key")
private Integer fbKey;
+ @Transient
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDateTime updDt;
@Transient
private Integer cdsKey;
@Transient
diff --git a/src/main/resources/mybatisMapper/ProcessResultMapper.xml b/src/main/resources/mybatisMapper/ProcessResultMapper.xml
index 581ec755..bc7d2841 100644
--- a/src/main/resources/mybatisMapper/ProcessResultMapper.xml
+++ b/src/main/resources/mybatisMapper/ProcessResultMapper.xml
@@ -66,6 +66,7 @@
, pr.confiscation_dt
, pr.boat_disposal_dt
, pr.wrt_dt
+ , prv.upd_dt AS updDt
FROM process_result pr
INNER JOIN crackdown_status cs
ON pr.cds_key = cs.cds_key
@@ -73,6 +74,12 @@
ON pr.cds_key = fb.cds_key
LEFT JOIN violation v
ON fb.fb_key = v.fb_key
+ INNER JOIN (
+ SELECT pr_key ,MAX(wrt_dt) AS upd_dt
+ FROM process_result_version
+ GROUP BY pr_key
+ ) prv
+ ON pr.pr_key = prv.pr_key