From 7a91e8351125f8138b6caf59eb9011432277cb2b Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Fri, 3 Oct 2025 20:36:56 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=BC=ED=83=9C=EB=A3=8C=20=EA=B3=84?= =?UTF-8?q?=EC=82=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/bean/CrdnPayerAddrHstryBean.java | 4 +- .../xit/fims/crdn/service/bean/CrdnBean.java | 42 +++++++------------ .../fims/payer/service/bean/PayerBean.java | 21 ++++++---- .../xit/fims/sndb/web/Sndb01Controller.java | 4 +- .../mapper/fims/cmmn/crdnSttsHstry-mapper.xml | 2 +- .../sql/mapper/fims/payer-mapper.xml | 2 +- 6 files changed, 34 insertions(+), 41 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerAddrHstryBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerAddrHstryBean.java index 5c19e407..ba484759 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerAddrHstryBean.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerAddrHstryBean.java @@ -84,12 +84,12 @@ public class CrdnPayerAddrHstryBean extends AbstractBean { // 단속 납부자 주소 이력(TB_CRDN_PAYER_ADDR_HSTRY) 대장을 등록한다. int rtnNocs = crdnPayerAddrHstryMapper.insertCrdnPayerAddrHstry(crdnPayerAddrHstry); // if (rtnNocs != 1) -// throw new RuntimeException("납부자주소 이력 대장 등록 중 오류가 발생하였습니다."); // 예외를 발생시켜서 DB Rollback +// throw new RuntimeException("납부자주소 이력 대장 등록 중 오류가 발생하였습니다."); // 단속 대장(TB_CRDN)을 수정한다. rtnNocs = updateCrdnPayerAddr(crdnPayerAddrHstry); // if (rtnNocs != 1) -// throw new RuntimeException("단속 대장에 납부자, 주소 정보 수정 중 오류가 발생하였습니다."); // 예외를 발생시켜서 DB Rollback +// throw new RuntimeException("단속 대장에 납부자, 주소 정보 수정 중 오류가 발생하였습니다."); return true; } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java index f9ad7dde..8c4a8770 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java @@ -3,7 +3,6 @@ package cokr.xit.fims.crdn.service.bean; import java.io.File; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -58,6 +57,14 @@ public class CrdnBean extends AbstractBean { @Resource(name = "levyExclBean") protected LevyExclBean levyExclBean; + public List getCrdns(List crdnIds) { + return crdnInfoMapper.selectCrdns(crdnIds); + } + + public Crdn getCrdn(String crdnId) { + return crdnInfoMapper.selectCrdn(crdnId); + } + public List create(List crdns, boolean exclude) { TaskProcessor taskProcessor = TaskProcessor.get(); List duplicates = taskProcessor.getDuplicates(crdns), // 중복 단속목록 @@ -211,12 +218,13 @@ public class CrdnBean extends AbstractBean { crdn.setCrdnSttsCd(orgStts); // 단속상태이력(TB_CRDN_STTS_HSTRY) 대장 등록 + String crdnId = crdn.getCrdnId(); CrdnSttsHstry crdnSttsHstry = new CrdnSttsHstry(); - crdnSttsHstry.setCrdnId(crdn.getCrdnId()); + crdnSttsHstry.setCrdnId(crdnId); crdnSttsHstry.setBfrSttsCd(""); crdnSttsHstry.setBfrSttsChgDt(""); crdnSttsHstry.setCrdnSttsCd(crdnSttsCd); - crdnSttsHstry.setTaskDtlId(crdn.getCrdnId()); + crdnSttsHstry.setTaskDtlId(crdnId); crdnSttsHstry.setEtcCn(""); crdnSttsHstryBean.create(crdnSttsHstry); @@ -272,20 +280,14 @@ public class CrdnBean extends AbstractBean { DataObject infoCrdn = crdnInfoMapper.selectCrdnInfo(crdn.getCrdnId()); // 단속상태이력(TB_CRDN_STTS_HSTRY) - CrdnSttsHstry crdnSttsHstry = new CrdnSttsHstry(); - crdnSttsHstry.setCrdnId(infoCrdn.string("CRDN_ID")); - crdnSttsHstry.setBfrSttsCd(infoCrdn.string("CRDN_STTS_CD")); - crdnSttsHstry.setBfrSttsChgDt(infoCrdn.string("CRDN_STTS_CHG_DT")); - crdnSttsHstry.setCrdnSttsCd("99"); - + CrdnSttsHstry crdnSttsHstry = CrdnSttsHstry.create("99", null, null, infoCrdn); // 단속 상태 이력(TB_CRDN_STTS_HSTRY) 대장에 등록한다. boolean rtnScs = crdnSttsHstryBean.createHstryUpdateCrdnSttsCd(crdnSttsHstry); if (!rtnScs) throw new RuntimeException("단속 삭제 중 단속 대장의 단속상태코드 변경에 실패하였습니다."); Map paramMap = new HashMap(); - List crdnIdList = Arrays.asList(crdn.getCrdnId()); - paramMap.put("crdnIds", crdnIdList); + paramMap.put("crdnIds", List.of(crdn.getCrdnId())); paramMap.put("removedBy", UserInfo.current().getId()); paramMap.put("delRsn", crdn.getDelRsn()); @@ -320,12 +322,7 @@ public class CrdnBean extends AbstractBean { throw new RuntimeException("단속 대장에 납부자 삭제에 실패하였습니다."); // 단속 상태 코드 변경 - CrdnSttsHstry crdnSttsHstry = new CrdnSttsHstry(); - crdnSttsHstry.setCrdnId(crdnInfo.string("CRDN_ID")); // 단속 ID - crdnSttsHstry.setBfrSttsCd(crdnInfo.string("CRDN_STTS_CD")); // 이전 단속 상태 코드 - crdnSttsHstry.setBfrSttsChgDt(crdnInfo.string("CRDN_STTS_CHG_DT")); // 이전 단속 상태 변경 일시 - crdnSttsHstry.setEtcCn(crdn.getEtcCn()); // 기타 - crdnSttsHstry.setCrdnSttsCd("01"); // 초기상태 + CrdnSttsHstry crdnSttsHstry = CrdnSttsHstry.create("01", null, crdn.getEtcCn(), crdnInfo); // 단속 상태 이력(TB_CRDN_STTS_HSTRY) 대장에 등록한다. if (!crdnSttsHstryBean.createHstryUpdateCrdnSttsCd(crdnSttsHstry)) @@ -348,17 +345,10 @@ public class CrdnBean extends AbstractBean { DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdn.getCrdnId()); // 단속상태이력(TB_CRDN_STTS_HSTRY) - CrdnSttsHstry crdnSttsHstry = new CrdnSttsHstry(); - crdnSttsHstry.setCrdnId(crdnInfo.string("CRDN_ID")); - crdnSttsHstry.setBfrSttsCd(crdnInfo.string("CRDN_STTS_CD")); - crdnSttsHstry.setBfrSttsChgDt(crdnInfo.string("CRDN_STTS_CHG_DT")); - String etcCn = crdn.getEtcCn(); - crdnSttsHstry.setEtcCn("[개별총정보-단속상태변경] " + etcCn); - crdnSttsHstry.setCrdnSttsCd(crdn.getCrdnSttsCd()); + CrdnSttsHstry crdnSttsHstry = CrdnSttsHstry.create(crdn.getCrdnSttsCd(), null, "[개별총정보-단속상태변경] " + crdn.getEtcCn(), crdnInfo); // 단속 상태 이력(TB_CRDN_STTS_HSTRY) 대장에 등록한다. - boolean rtnScs = crdnSttsHstryBean.createHstryUpdateCrdnSttsCd(crdnSttsHstry); - if (!rtnScs) + if (!crdnSttsHstryBean.createHstryUpdateCrdnSttsCd(crdnSttsHstry)) throw new RuntimeException("단속 대장의 단속상태코드 변경에 실패하였습니다."); return "[S] 작업이 정상 처리 되었습니다."; diff --git a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java index 819a3916..28e3491d 100644 --- a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java +++ b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java @@ -16,6 +16,8 @@ import cokr.xit.fims.cmmn.CrdnPayerAddrHstry; import cokr.xit.fims.cmmn.CrdnSttsHstry; import cokr.xit.fims.cmmn.service.bean.CrdnPayerAddrHstryBean; import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; +import cokr.xit.fims.crdn.Crdn; +import cokr.xit.fims.crdn.service.bean.CrdnBean; import cokr.xit.fims.payer.Payer; import cokr.xit.fims.payer.PayerQuery; import cokr.xit.fims.payer.dao.PayerAddrMapper; @@ -52,6 +54,9 @@ public class PayerBean extends AbstractBean { /** 단속 상태 이력 정보 Bean */ @Resource(name = "crdnSttsHstryBean") private CrdnSttsHstryBean crdnSttsHstryBean; + /** 단속 관리 Bean */ + @Resource(name = "crdnBean") + private CrdnBean crdnBean; /** 단속 납부자 이력 정보 Bean */ @Resource(name = "crdnPayerAddrHstryBean") private CrdnPayerAddrHstryBean crdnPayerAddrHstryBean; @@ -415,14 +420,14 @@ public class PayerBean extends AbstractBean { updtPayer.setRtpyrId(""); updtPayer.setRtpyrNm(payer.getRtpyrNm()); - String str = result.getRtpyrTelno(); // 전화번호 + String str = result.getRtpyrTelno(); // 전화번호 if (!isEmpty(str)) updtPayer.setRtpyrTelno(str); if (!isEmpty(str = result.getRtpyrMblTelno())) // 휴대전화번호 updtPayer.setRtpyrMblTelno(str); - if (!isEmpty(str = result.getRtpyrEml())) // 이메일 + if (!isEmpty(str = result.getRtpyrEml())) // 이메일 updtPayer.setRtpyrEml(str); - if (!isEmpty(str = result.getRtpyrSttsCd())) // 납부자 상태 코드 + if (!isEmpty(str = result.getRtpyrSttsCd())) // 납부자 상태 코드 updtPayer.setRtpyrSttsCd(str); if (!isEmpty(str)) @@ -442,6 +447,9 @@ public class PayerBean extends AbstractBean { if (bInstHstry) createAddrHistory(result); + Crdn crdn = crdnBean.getCrdn(crdnId); + crdnBean.updateCrackdown(crdn); + createCrdnSttsHistory(crdnPayerAddrInfo); return "[S] 작업이 정상 처리 되었습니다."; @@ -456,12 +464,7 @@ public class PayerBean extends AbstractBean { // 납부자 등록 완료 // 단속 상태 이력(TB_CRDN_STTS_HSTRY) 대장에 등록하고, 단속(TB_CRDN) 대장을 수정한다. - CrdnSttsHstry crdnSttsHstry = new CrdnSttsHstry(); - crdnSttsHstry.setCrdnId(info.string("CRDN_ID")); - crdnSttsHstry.setBfrSttsCd(info.string("CRDN_STTS_CD")); - crdnSttsHstry.setBfrSttsChgDt(info.string("CRDN_STTS_CHG_DT")); - crdnSttsHstry.setCrdnSttsCd("21"); - + CrdnSttsHstry crdnSttsHstry = CrdnSttsHstry.create("21", null, null, info); crdnSttsHstryBean.createHstryUpdateCrdnSttsCd(crdnSttsHstry); } diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index 2a248642..65092f30 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -2257,8 +2257,8 @@ public class Sndb01Controller extends ApplicationController { rtnMsg = "[S]"; return new ModelAndView("jsonView") - .addObject("saved", saved) - .addObject("rtnMsg", rtnMsg); + .addObject("saved", saved) + .addObject("rtnMsg", rtnMsg); */ } } \ No newline at end of file diff --git a/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml index b01baef2..a25567d4 100644 --- a/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cmmn/crdnSttsHstry-mapper.xml @@ -173,4 +173,4 @@ WHERE CRDN_ID = #{crdnId} - + \ No newline at end of file diff --git a/src/main/resources/sql/mapper/fims/payer-mapper.xml b/src/main/resources/sql/mapper/fims/payer-mapper.xml index f82b2e82..97dd40e3 100644 --- a/src/main/resources/sql/mapper/fims/payer-mapper.xml +++ b/src/main/resources/sql/mapper/fims/payer-mapper.xml @@ -307,4 +307,4 @@ - + \ No newline at end of file