수정이력 등록 로직수정

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java

@@ -5,10 +5,12 @@ import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.CrackdownStatusMapper;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusVersion;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResultVersion;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -127,39 +129,8 @@ public class CrackdownStatusService extends BaseService {
         int versionNo = lastVersion==null?1:(lastVersion.getVersionNo()+1);
 
         CrackdownStatusVersion crackdownStatusVersion = new CrackdownStatusVersion();
+        BeanUtils.copyProperties(crackdownStatus, crackdownStatusVersion);
         crackdownStatusVersion.setVersionNo(versionNo);
-        crackdownStatusVersion.setCdsKey(crackdownStatus.getCdsKey());
-        crackdownStatusVersion.setCaseNum(crackdownStatus.getCaseNum());
-        crackdownStatusVersion.setNapoDt(crackdownStatus.getNapoDt());
-        crackdownStatusVersion.setNapoSeaPointLon(crackdownStatus.getNapoSeaPointLon());
-        crackdownStatusVersion.setNapoSeaPointLat(crackdownStatus.getNapoSeaPointLat());
-        crackdownStatusVersion.setNapoSeaPointDetail(crackdownStatus.getNapoSeaPointDetail());
-        crackdownStatusVersion.setInvasionType(crackdownStatus.getInvasionType());
-        crackdownStatusVersion.setNll(crackdownStatus.getNll());
-        crackdownStatusVersion.setCaseAgency(crackdownStatus.getCaseAgency());
-        crackdownStatusVersion.setCasePoliceOfficer(crackdownStatus.getCasePoliceOfficer());
-        crackdownStatusVersion.setCrackdownBoat(crackdownStatus.getCrackdownBoat());
-        crackdownStatusVersion.setCrackdownPolice(crackdownStatus.getCrackdownPolice());
-        crackdownStatusVersion.setMmsi(crackdownStatus.getMmsi());
-        crackdownStatusVersion.setFieldIvsgt(crackdownStatus.getFieldIvsgt());
-        crackdownStatusVersion.setPersonDamageCnt(crackdownStatus.getPersonDamageCnt());
-        crackdownStatusVersion.setPersonDamageAmount(crackdownStatus.getPersonDamageAmount());
-        crackdownStatusVersion.setPersonDamageDetail(crackdownStatus.getPersonDamageDetail());
-        crackdownStatusVersion.setMaterialDamageCnt(crackdownStatus.getMaterialDamageCnt());
-        crackdownStatusVersion.setMaterialDamageAmount(crackdownStatus.getMaterialDamageAmount());
-        crackdownStatusVersion.setMaterialDamageDetail(crackdownStatus.getMaterialDamageDetail());
-        crackdownStatusVersion.setFieldIvsgtNapoDt(crackdownStatus.getFieldIvsgtNapoDt());
-        crackdownStatusVersion.setFieldIvsgtReleaseDt(crackdownStatus.getFieldIvsgtReleaseDt());
-        crackdownStatusVersion.setFieldIvsgtTimeTaken(crackdownStatus.getFieldIvsgtTimeTaken());
-        crackdownStatusVersion.setPressurizedStartDt(crackdownStatus.getPressurizedStartDt());
-        crackdownStatusVersion.setPressurizedEndDt(crackdownStatus.getPressurizedEndDt());
-        crackdownStatusVersion.setDistance(crackdownStatus.getDistance());
-        crackdownStatusVersion.setWrtOrgan(crackdownStatus.getWrtOrgan());
-        crackdownStatusVersion.setWrtPart(crackdownStatus.getWrtPart());
-        crackdownStatusVersion.setWrtUserSeq(crackdownStatus.getWrtUserSeq());
-        crackdownStatusVersion.setWrtUserGrd(crackdownStatus.getWrtUserGrd());
-        crackdownStatusVersion.setWrtUserNm(crackdownStatus.getWrtUserNm());
-        crackdownStatusVersion.setWrtDt(crackdownStatus.getWrtDt());
 
         crackdownStatusVersionRepository.save(crackdownStatusVersion);
     }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java

@@ -12,6 +12,7 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.SailorVers
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
 import com.dbnt.faisp.util.Utils;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -114,39 +115,8 @@ public class ProcessResultService extends BaseService {
         int versionNo = lastVersion==null?1:(lastVersion.getVersionNo()+1);
 
         ProcessResultVersion processResultVersion = new ProcessResultVersion();
+        BeanUtils.copyProperties(processResult, processResultVersion);
         processResultVersion.setVersionNo(versionNo);
-        processResultVersion.setPrKey(processResult.getPrKey());
-        processResultVersion.setProcessStatus(processResult.getProcessStatus());
-        processResultVersion.setPressurizedTimeTaken(processResult.getPressurizedTimeTaken());
-        processResultVersion.setWarrantReqTakeTime(processResult.getWarrantReqTakeTime());
-        processResultVersion.setIsIvsgtStop(processResult.getIsIvsgtStop());
-        processResultVersion.setEvictionDt(processResult.getEvictionDt());
-        processResultVersion.setDirectHandoverDt(processResult.getDirectHandoverDt());
-        processResultVersion.setHandoverSeaPointLon(processResult.getHandoverSeaPointLon());
-        processResultVersion.setHandoverSeaPointLat(processResult.getHandoverSeaPointLat());
-        processResultVersion.setHandoverSeaPointDetail(processResult.getHandoverSeaPointDetail());
-        processResultVersion.setHandoverBoat(processResult.getHandoverBoat());
-        processResultVersion.setMiddleTakeoverBoat(processResult.getMiddleTakeoverBoat());
-        processResultVersion.setConsignmentStartDt(processResult.getConsignmentStartDt());
-        processResultVersion.setConsignmentEndDt(processResult.getConsignmentEndDt());
-        processResultVersion.setConfiscationDt(processResult.getConfiscationDt());
-        processResultVersion.setBoatDisposalDt(processResult.getBoatDisposalDt());
-        processResultVersion.setBoatDisposalType(processResult.getBoatDisposalType());
-        processResultVersion.setReturnDt(processResult.getReturnDt());
-        processResultVersion.setExileCnt(processResult.getExileCnt());
-        processResultVersion.setFlight(processResult.getFlight());
-        processResultVersion.setImmigrationOfficeName(processResult.getImmigrationOfficeName());
-        processResultVersion.setImmigrationOfficeOfficerName(processResult.getImmigrationOfficeOfficerName());
-        processResultVersion.setImmigrationOfficeOfficerContact(processResult.getImmigrationOfficeOfficerContact());
-        processResultVersion.setSentencingCourt(processResult.getSentencingCourt());
-        processResultVersion.setSentencingDetail(processResult.getSentencingDetail());
-        processResultVersion.setExecutionDetail(processResult.getExecutionDetail());
-        processResultVersion.setWrtOrgan(processResult.getWrtOrgan());
-        processResultVersion.setWrtPart(processResult.getWrtPart());
-        processResultVersion.setWrtUserSeq(processResult.getWrtUserSeq());
-        processResultVersion.setWrtUserGrd(processResult.getWrtUserGrd());
-        processResultVersion.setWrtUserNm(processResult.getWrtUserNm());
-        processResultVersion.setWrtDt(processResult.getWrtDt());
 
         processResultVersionRepository.save(processResultVersion);
     }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/SailorService.java

@@ -11,6 +11,7 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.SailorVers
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
 import com.dbnt.faisp.util.Utils;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -103,30 +104,8 @@ public class SailorService extends BaseService {
         int versionNo = lastVersion==null?1:(lastVersion.getVersionNo()+1);
 
         SailorVersion sailorVersion = new SailorVersion();
+        BeanUtils.copyProperties(sailor, sailorVersion);
         sailorVersion.setVersionNo(versionNo);
-        sailorVersion.setSailorKey(sailor.getSailorKey());
-        sailorVersion.setSailorNameKr(sailor.getSailorNameKr());
-        sailorVersion.setSailorNameCn(sailor.getSailorNameCn());
-        sailorVersion.setSailorNamePinyin(sailor.getSailorNamePinyin());
-        sailorVersion.setSailorContact(sailor.getSailorContact());
-        sailorVersion.setBirthdate(sailor.getBirthdate());
-        sailorVersion.setResidence(sailor.getResidence());
-        sailorVersion.setEducation(sailor.getEducation());
-        sailorVersion.setPosition(sailor.getPosition());
-        sailorVersion.setCareer(sailor.getCareer());
-        sailorVersion.setSimilarCriminalHistory(sailor.getSimilarCriminalHistory());
-        sailorVersion.setHeterogeneousCriminalHistory(sailor.getHeterogeneousCriminalHistory());
-        sailorVersion.setArrestHistory(sailor.getArrestHistory());
-        sailorVersion.setCriminalHistoryDetail(sailor.getCriminalHistoryDetail());
-        sailorVersion.setMonthlyWages(sailor.getMonthlyWages());
-        sailorVersion.setIsRestriction(sailor.getIsRestriction());
-        sailorVersion.setNote(sailor.getNote());
-        sailorVersion.setWrtOrgan(sailor.getWrtOrgan());
-        sailorVersion.setWrtPart(sailor.getWrtPart());
-        sailorVersion.setWrtUserSeq(sailor.getWrtUserSeq());
-        sailorVersion.setWrtUserGrd(sailorVersion.getWrtUserGrd());
-        sailorVersion.setWrtUserNm(sailor.getWrtUserNm());
-        sailorVersion.setWrtDt(sailor.getWrtDt());
 
         sailorVersionRepository.save(sailorVersion);
     }