diff --git a/src/main/java/cokr/xit/fims/epst/EpostGdcc.java b/src/main/java/cokr/xit/fims/epst/EpostGdcc.java index f38afa34..147367ef 100644 --- a/src/main/java/cokr/xit/fims/epst/EpostGdcc.java +++ b/src/main/java/cokr/xit/fims/epst/EpostGdcc.java @@ -50,7 +50,7 @@ public class EpostGdcc extends AbstractEntity { /** * 안내문 IDs */ - private String[] gdccIDs; + private String[] gdccIds; } diff --git a/src/main/java/cokr/xit/fims/epst/EpostQuery.java b/src/main/java/cokr/xit/fims/epst/EpostQuery.java index a95e71a1..8cf3e0a2 100644 --- a/src/main/java/cokr/xit/fims/epst/EpostQuery.java +++ b/src/main/java/cokr/xit/fims/epst/EpostQuery.java @@ -17,18 +17,18 @@ public class EpostQuery extends CmmnQuery { private static final long serialVersionUID = 1L; // ID - private String[] crdnIDs; // 단속 IDs - private String crdnId; // 단속 ID - private String[] sndngIds; // 발송 IDs - private String sndngId; // 발송 ID - private String[] sndngDtlIds; // 발송 상세 IDs - private String sndngDtlId; // 발송 상세 ID - private String[] svbtcIDs; // 공시송달 IDs - private String svbtcId; // 공시송달 ID - private String[] gdccIDs; // 안내문 IDs - private String gdccId; // 안내문 ID - private String[] rcptRsltIDs; // 접수 결과 IDs - private String rcptRsltId; // 접수 결과 ID + private String[] crdnIds; // 단속 Ids + private String crdnId; // 단속 Id + private String[] sndngIds; // 발송 Ids + private String sndngId; // 발송 Id + private String[] sndngDtlIds; // 발송 상세 Ids + private String sndngDtlId; // 발송 상세 Id + private String[] svbtcIds; // 공시송달 Ids + private String svbtcId; // 공시송달 Id + private String[] gdccIds; // 안내문 Ids + private String gdccId; // 안내문 Id + private String[] rcptRsltIds; // 접수 결과 Ids + private String rcptRsltId; // 접수 결과 Id private String conKey; // 외부연계식별키 private String regino; // 등기번호 // 검색 조건 @@ -66,12 +66,12 @@ public class EpostQuery extends CmmnQuery { private String delRsn; // 삭제 사유 private String crdnDelYn; // 단속 삭제 여부 - public String[] getCrdnIDs() { - return ifEmpty(crdnIDs, () -> null); + public String[] getCrdnIds() { + return ifEmpty(crdnIds, () -> null); } - public T setCrdnIDs(String... crdnIDs) { - this.crdnIDs = crdnIDs; + public T setCrdnIds(String... crdnIds) { + this.crdnIds = crdnIds; return self(); } @@ -120,12 +120,12 @@ public class EpostQuery extends CmmnQuery { return self(); } - public String[] getSvbtcIDs() { - return ifEmpty(svbtcIDs, () -> null); + public String[] getSvbtcIds() { + return ifEmpty(svbtcIds, () -> null); } - public T setSvbtcIDs(String... svbtcIDs) { - this.svbtcIDs = svbtcIDs; + public T setSvbtcIds(String... svbtcIds) { + this.svbtcIds = svbtcIds; return self(); } @@ -138,12 +138,12 @@ public class EpostQuery extends CmmnQuery { return self(); } - public String[] getGdccIDs() { - return ifEmpty(gdccIDs, () -> null); + public String[] getGdccIds() { + return ifEmpty(gdccIds, () -> null); } - public T setGdccIDs(String... gdccIDs) { - this.gdccIDs = gdccIDs; + public T setGdccIds(String... gdccIds) { + this.gdccIds = gdccIds; return self(); } @@ -156,12 +156,12 @@ public class EpostQuery extends CmmnQuery { return self(); } - public String[] getRcptRsltIDs() { - return ifEmpty(rcptRsltIDs, () -> null); + public String[] getRcptRsltIds() { + return ifEmpty(rcptRsltIds, () -> null); } - public T setRcptRsltIDs(String... rcptRsltIDs) { - this.rcptRsltIDs = rcptRsltIDs; + public T setRcptRsltIds(String... rcptRsltIds) { + this.rcptRsltIds = rcptRsltIds; return self(); } diff --git a/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java b/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java index 1a100bab..93db74b7 100644 --- a/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java +++ b/src/main/java/cokr/xit/fims/epst/dao/EpostRcptRegMapper.java @@ -58,7 +58,7 @@ public interface EpostRcptRegMapper extends AbstractMapper { * @param req 전자우편 접수 등록 조회 조건 * @return 전자우편 발송 상태 객체 정보 */ - List selectEpostSndngSttses(EpostQuery req); + List selectEpostRcptRegDtlList(EpostQuery req); /**지정한 조건에 따라 전자우편 접수 등록 목록을 조회하여 반환한다.
* @param req 전자우편 조회 조건 diff --git a/src/main/java/cokr/xit/fims/epst/service/EpostRcptRegService.java b/src/main/java/cokr/xit/fims/epst/service/EpostRcptRegService.java index 517dcd08..370aac0a 100644 --- a/src/main/java/cokr/xit/fims/epst/service/EpostRcptRegService.java +++ b/src/main/java/cokr/xit/fims/epst/service/EpostRcptRegService.java @@ -41,7 +41,7 @@ public interface EpostRcptRegService { * @param req 전자우편 접수 등록 조회 조건 * @return 전자우편 발송 상태 객체 정보 */ - List getEpostSndngSttsInfo(EpostQuery req); + List getEpostRcptRegDtlList(EpostQuery req); /**전자우편 접수 등록 정보를 등록한다. * @param epostRcptReg 전자우편 접수 등록 diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java index c4792431..6c4e5041 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccBean.java @@ -148,17 +148,10 @@ public class EpostGdccBean extends AbstractComponent { boolean rtnScs = false; // DB 처리 결과 String rtnMsg = "[F] "; // 처리 결과 메시지 - // ID를 확인하여 자료가 없다면.. 종료 - if (epostGdcc.getGdccId() == null && epostGdcc.getGdccIDs().length < 1) { - rtnMsg = "작업 중 선택 자료가 존재하지 않습니다."; - return rtnMsg; - } - // 전자우편 안내문 정보를 삭제한다. rtnScs = epostGdccMapper.delete(epostGdcc); // 삭제 if (!rtnScs) { - rtnMsg = "전자우편 안내문 정보 수정에 실패하였습니다."; - throw new RuntimeException(rtnMsg); // 예외를 발생시켜서 DB Rollback + throw new RuntimeException("전자우편 안내문 정보 수정에 실패하였습니다."); // 예외를 발생시켜서 DB Rollback } rtnMsg = "[S] 작업이 정상 처리 되었습니다."; diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccServiceBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccServiceBean.java index d36e0878..03696b3a 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccServiceBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostGdccServiceBean.java @@ -57,7 +57,23 @@ public class EpostGdccServiceBean extends AbstractServiceBean implements EpostGd @Override public String removeEpostGdcc(EpostGdcc epostGdcc) { - return epostGdccBean.removeEpostGdcc(epostGdcc); + // 변수 선언 + String rtnMsg = "[F] "; // 처리 결과 메시지 + + // ID를 확인하여 자료가 없다면.. 종료 + if (epostGdcc.getGdccId() == null && epostGdcc.getGdccIds().length < 1) { + rtnMsg = "작업 중 선택 자료가 존재하지 않습니다."; + return rtnMsg; + } + + // 삭제 호출 + rtnMsg = epostGdccBean.removeEpostGdcc(epostGdcc); + // 오류가 발생하였으면 종료.. + if (rtnMsg.contains("[F]")) { + return rtnMsg; + } + + return rtnMsg; } @Override diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegBean.java index 06753eac..73edde5d 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegBean.java @@ -97,11 +97,7 @@ public class EpostRcptRegBean extends AbstractComponent { * @param req 전자우편 접수 등록 조회 조건 * @return 전자우편 발송 상태 객체 정보 */ - List getEpostSndngSttsInfo(EpostQuery req) { - // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); - } + List getEpostRcptRegDtlList(EpostQuery req) { // 삭제 여부 확인 if (req.getDelYN() == null) { req.setDelYN("N"); @@ -115,7 +111,7 @@ public class EpostRcptRegBean extends AbstractComponent { } } - return epostRcptRegMapper.selectEpostSndngSttses(req); + return epostRcptRegMapper.selectEpostRcptRegDtlList(req); } /**등기 번호 diff --git a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegServiceBean.java b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegServiceBean.java index 165cd310..78e18d90 100644 --- a/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegServiceBean.java +++ b/src/main/java/cokr/xit/fims/epst/service/bean/EpostRcptRegServiceBean.java @@ -46,8 +46,8 @@ public class EpostRcptRegServiceBean extends AbstractServiceBean implements Epos } @Override - public List getEpostSndngSttsInfo(EpostQuery req) { - return epostRcptRegBean.getEpostSndngSttsInfo(req); + public List getEpostRcptRegDtlList(EpostQuery req) { + return epostRcptRegBean.getEpostRcptRegDtlList(req); } @Override diff --git a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java index 1756df00..d43c2f9a 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -1,7 +1,7 @@ package cokr.xit.fims.epst.web; import java.text.SimpleDateFormat; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -10,8 +10,6 @@ import javax.annotation.Resource; import org.apache.poi.ss.usermodel.CellStyle; import org.springframework.web.servlet.ModelAndView; -import com.fasterxml.jackson.core.type.TypeReference; - import cokr.xit.base.code.CommonCode; import cokr.xit.base.file.xls.XLSWriter; import cokr.xit.base.file.xls.XLSWriter.CellDef; @@ -45,20 +43,21 @@ public class Epst02Controller extends ApplicationController { public class METHOD_URL { public static final String - epostGuidanceDocumentMain = "/010/main.do" // 전자우편 안내문 메인 - , getEpostGuidanceDocumentList = "/010/list.do" // 전자우편 안내문 목록 조회 - , getEpostGuidanceDocumentInfo = "/020/info.do" // 전자우편 안내문 상세 정보 조회 - , createEpostGuidanceDocument = "/020/create.do" // 전자우편 안내문 등록 - , updateEpostGuidanceDocument = "/020/update.do" // 전자우편 안내문 수정 - , removeEpostGuidanceDocument = "/010/remove.do" // 전자우편 안내문 삭제 - , epostSendingStatusMain = "/030/main.do" // 전자우편 우편발송 메인 - , getEpostSendingStatusList = "/030/list.do" // 전자우편 발송 목록 조회 - , getEpostSendingStatusInfo = "/040/info.do" // 전자우편 발송 상세 정보 조회 - , updateEpostSendingProcessStatus = "/030/updateSttsCd.do" // 전자우편 발송 처리상태코드 수정 - , removeEpostSendingStatus = "/030/remove.do" // 전자우편 발송 삭제 - , epostReceiptResultMain = "/050/main.do" // 전자우편 접수 결과 메인 - , getEpostReceiptResultList = "/050/list.do" // 전자우편 접수 결과 목록 조회 - , getEpostReceiptResultSumAmount = "/050/sumAmt.do" // 전자우편 접수 결과 합계 금액 조회 + epostGuidanceDocumentMain = "/010/main.do" // 전자우편 안내문 메인 + , getEpostGuidanceDocumentList = "/010/list.do" // 전자우편 안내문 목록 조회 + , removeEpostGuidanceDocument = "/010/remove.do" // 전자우편 안내문 삭제 + , getEpostGuidanceDocumentInfo = "/020/info.do" // 전자우편 안내문 상세 정보 조회 + , createEpostGuidanceDocument = "/020/create.do" // 전자우편 안내문 등록 + , updateEpostGuidanceDocument = "/020/update.do" // 전자우편 안내문 수정 + , epostReceiptRegistrationMain = "/030/main.do" // 전자우편 우편발송 메인 + , getEpostReceiptRegistrationList = "/030/list.do" // 전자우편 우편발송 목록 조회 + , updateEpostSendingProcessStatus = "/030/updateSttsCd.do" // 전자우편 우편발송 처리상태코드 수정 + , removeEpostSendingStatus = "/030/remove.do" // 전자우편 우편발송 삭제 + , getEpostReceiptRegistrationDetailInfo = "/040/info.do" // 전자우편 발송 상세 정보 조회 + , getEpostReceiptRegistrationDetailList = "/040/list.do" // 전자우편 발송 상세 정보 조회 + , epostReceiptResultMain = "/050/main.do" // 전자우편 접수 결과 메인 + , getEpostReceiptResultList = "/050/list.do" // 전자우편 접수 결과 목록 조회 + , getEpostReceiptResultSumAmount = "/050/sumAmt.do" // 전자우편 접수 결과 합계 금액 조회 ; } @@ -78,7 +77,6 @@ public class Epst02Controller extends ApplicationController { @Resource(name="epostRcptRsltService") private EpostRcptRsltService epostRcptRsltService; - @Resource(name="stngBean") private StngBean stngBean; @@ -125,7 +123,7 @@ public class Epst02Controller extends ApplicationController { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); String dateTime = dateFormat.format(System.currentTimeMillis()); - ArrayList cellDefs = fromJson(req.getCellDefs(), new TypeReference>() {}); + List cellDefs = fromJson(req.getCellDefs(), CellDef.listType()); XLSWriter xlsx = new XLSWriter() .setFilename("우편통합안내문" + "_목록_" + dateTime + ".xlsx") @@ -137,19 +135,20 @@ public class Epst02Controller extends ApplicationController { List list = epostGdccService.getEpostGdccList(req.setFetchSize(0)); - CellDef.setValues(cellDefs, Map.ofEntries( - Map.entry("업무구분", xlsx.style("TASK_SE_NM", center)) - , Map.entry("발송구분", xlsx.style("SNDNG_SE_NM", center)) - , Map.entry("사용여부", xlsx.style("USE_YN_NM", center)) - , Map.entry("최종사용일시", xlsx.format(o -> xlsx.str2date(o.get("LAST_USE_DT"))).style(dateDT)) - , Map.entry("제목", "TTL_NM") - , Map.entry("문구내용", "WORDS_CN") - , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) - , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) - , Map.entry("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)) - , Map.entry("수정사용자", xlsx.style("MDFR_NM", center)) - ) - ); + Map valueMap = new HashMap(); + + valueMap.put("업무구분", xlsx.style("TASK_SE_NM", center)); + valueMap.put("발송구분", xlsx.style("SNDNG_SE_NM", center)); + valueMap.put("사용여부", xlsx.style("USE_YN_NM", center)); + valueMap.put("최종사용일시", xlsx.format(o -> xlsx.str2date(o.get("LAST_USE_DT"))).style(dateDT)); + valueMap.put("제목", "TTL_NM"); + valueMap.put("문구내용", "WORDS_CN"); + valueMap.put("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)); + valueMap.put("등록사용자", xlsx.style("RGTR_NM", center)); + valueMap.put("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)); + valueMap.put("수정사용자", xlsx.style("MDFR_NM", center)); + + CellDef.setValues(cellDefs, valueMap); xlsx.cell(0, 0) .value("우편통합 안내문", center) @@ -261,7 +260,7 @@ public class Epst02Controller extends ApplicationController { /**전자우편 접수 등록 관리 메인화면(fims/epst/epst02030-main)을 연다. * @return /fims/epst/epst02030-main */ - public ModelAndView epostSendingStatusMain() { + public ModelAndView epostReceiptRegistrationMain() { ModelAndView mav = new ModelAndView("fims/epst/epst02030-main"); // 사용자 정보 @@ -295,7 +294,7 @@ public class Epst02Controller extends ApplicationController { * "epostRcptRegTotal": 조회 결과 찾은 전체 전자우편 접수 등록 수 * } */ - public ModelAndView getEpostSendingStatusList(EpostQuery req) { + public ModelAndView getEpostReceiptRegistrationList(EpostQuery req) { if (!"xls".equals(req.getDownload())) { List result = epostRcptRegService.getEpostRcptRegList(setFetchSize(req)); return setCollectionInfo(new ModelAndView("jsonView"), result, "epostRcptReg"); @@ -304,7 +303,7 @@ public class Epst02Controller extends ApplicationController { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); String dateTime = dateFormat.format(System.currentTimeMillis()); - ArrayList cellDefs = fromJson(req.getCellDefs(), new TypeReference>() {}); + List cellDefs = fromJson(req.getCellDefs(), CellDef.listType()); XLSWriter xlsx = new XLSWriter() .setFilename("우편통합우편발송" + "_목록_" + dateTime + ".xlsx") @@ -318,18 +317,18 @@ public class Epst02Controller extends ApplicationController { List list = epostRcptRegService.getEpostRcptRegList(req.setFetchSize(0)); - CellDef.setValues(cellDefs, Map.ofEntries( - Map.entry("발송일자", xlsx.format(o -> xlsx.str2date(o.get("SEND_DATE"))).style(dateYMD)) - , Map.entry("발송내역", xlsx.style("JOB_CD", center)) - , Map.entry("취급구분", xlsx.style("DIV_KB_NM", center)) - , Map.entry("접수일자", xlsx.format(o -> xlsx.str2date(o.get("RCEPT_YMD"))).style(dateYMD)) - , Map.entry("자료키", xlsx.style("CON_KEY", center)) - , Map.entry("발송건수", xlsx.style("RECEV_CNT", numeric)) - , Map.entry("우편처리상태", xlsx.style("POST_PRCS_STTS_NM", center)) - , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) - , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) - ) - ); + Map valueMap = new HashMap(); + valueMap.put("발송일자", xlsx.format(o -> xlsx.str2date(o.get("SEND_DATE"))).style(dateYMD)); + valueMap.put("발송내역", xlsx.style("JOB_CD", center)); + valueMap.put("취급구분", xlsx.style("DIV_KB_NM", center)); + valueMap.put("접수일자", xlsx.format(o -> xlsx.str2date(o.get("RCEPT_YMD"))).style(dateYMD)); + valueMap.put("자료키", xlsx.style("CON_KEY", center)); + valueMap.put("발송건수", xlsx.style("RECEV_CNT", numeric)); + valueMap.put("우편처리상태", xlsx.style("POST_PRCS_STTS_NM", center)); + valueMap.put("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)); + valueMap.put("등록사용자", xlsx.style("RGTR_NM", center)); + + CellDef.setValues(cellDefs, valueMap); xlsx.cell(0, 0) .value("우편통합 우편발송", center) @@ -351,28 +350,40 @@ public class Epst02Controller extends ApplicationController { * "epostRcptReg": 전자우편 접수 등록 정보 * } */ - public ModelAndView getEpostSendingStatusInfo(EpostQuery req) { - // 엑셀 저장이 아니라면.. 검색 - if (!"xls".equals(req.getDownload())) { - List epostSndngSttsInfo = epostRcptRegService.getEpostSndngSttsInfo(req); + public ModelAndView getEpostReceiptRegistrationDetailInfo(EpostQuery req) { + // + ModelAndView mav = getEpostReceiptRegistrationDetailList(req); - boolean json = jsonResponse(); + mav.setViewName("fims/epst/epst02040-info"); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/epst/epst02040-info"); + return mav + .addObject("pageName", "epst02040") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("infoPrefix", "epostRcptRegDtl") // prefix + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) + .addObject("mainQuery", toJson(req)) // 검색 조건 + .addObject("epostRcptRegDtlList", toJson(mav.getModel().get("epostRcptRegDtlList"))) // 자료 + ; + } - return mav - .addObject("pageName", "epst02040") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("sggCd", req.getSggCd()) // 시군구 코드(SGG_CD) - .addObject("taskSeCd", req.getTaskSeCd()) // 업무 구분 코드(TASK_SE_CD) - .addObject("epostSndngSttsInfo", json ? epostSndngSttsInfo : toJson(epostSndngSttsInfo)) - ; + /**전자우편 발송 상세 정보(info)를 반환한다. + * @param req 부과제외 대장 조회 조건 + * @return fims/epst/epst02040-info 또는 jsonView + * 
{
+	 *     "epostRcptReg": 전자우편 접수 등록 정보
+	 * }
+ */ + public ModelAndView getEpostReceiptRegistrationDetailList(EpostQuery req) { + // 엑셀 저장이 아니라면.. 검색 + if (!"xls".equals(req.getDownload())) { + List result = epostRcptRegService.getEpostRcptRegDtlList(setFetchSize(req)); + return setCollectionInfo(new ModelAndView("jsonView"), result, "epostRcptRegDtl"); } else { // 현재 날짜 구하기 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); String dateTime = dateFormat.format(System.currentTimeMillis()); - ArrayList cellDefs = fromJson(req.getCellDefs(), new TypeReference>() {}); + List cellDefs = fromJson(req.getCellDefs(), CellDef.listType()); XLSWriter xlsx = new XLSWriter() .setFilename("우편통합발송상세" + "_목록_" + dateTime + ".xlsx") @@ -382,25 +393,25 @@ public class Epst02Controller extends ApplicationController { CellStyle center = xlsx.cellStyle(Styler.CENTER); // 가운데 정렬 CellStyle dateDT = xlsx.yyyy_mm_dd_hh_mm_ss(); // 연월일+시간 - List list = epostRcptRegService.getEpostSndngSttsInfo(req.setFetchSize(0)); - - CellDef.setValues(cellDefs, Map.ofEntries( - Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) - , Map.entry("등기번호", xlsx.style("RGST_NMBR", center)) - , Map.entry("우편번호", xlsx.style("RECEV_CAR_OWNER_ZIPCODE", center)) - , Map.entry("수취인명", "RECEV_CAR_OWNER_NM") - , Map.entry("배달일시", xlsx.format(o -> xlsx.str2datetime(o.get("DELIV_YMD_TM"))).style(dateDT)) - , Map.entry("배달결과", xlsx.style("DELIVRSLTCD_NM", center)) - , Map.entry("수령인명", "SUBRECPRSNNM") - , Map.entry("수령인관계", xlsx.style("RELRECPRSNCDNM", center)) - , Map.entry("미배달사유", "NONDELIVREASNCDNM") - , Map.entry("주소", "RECEV_CAR_OWNER_ADDR") - , Map.entry("상세주소", "RECEV_CAR_OWNER_DETAILADDR") - , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) - , Map.entry("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)) - , Map.entry("수정사용자", xlsx.style("MDFR_NM", center)) - ) - ); + List list = epostRcptRegService.getEpostRcptRegDtlList(req.setFetchSize(0)); + + Map valueMap = new HashMap(); + valueMap.put("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)); + valueMap.put("등기번호", xlsx.style("RGST_NMBR", center)); + valueMap.put("우편번호", xlsx.style("RECEV_CAR_OWNER_ZIPCODE", center)); + valueMap.put("수취인명", "RECEV_CAR_OWNER_NM"); + valueMap.put("배달일시", xlsx.format(o -> xlsx.str2datetime(o.get("DELIV_YMD_TM"))).style(dateDT)); + valueMap.put("배달결과", xlsx.style("DELIVRSLTCD_NM", center)); + valueMap.put("수령인명", "SUBRECPRSNNM"); + valueMap.put("수령인관계", xlsx.style("RELRECPRSNCDNM", center)); + valueMap.put("미배달사유", "NONDELIVREASNCDNM"); + valueMap.put("주소", "RECEV_CAR_OWNER_ADDR"); + valueMap.put("상세주소", "RECEV_CAR_OWNER_DETAILADDR"); + valueMap.put("등록사용자", xlsx.style("RGTR_NM", center)); + valueMap.put("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)); + valueMap.put("수정사용자", xlsx.style("MDFR_NM", center)); + + CellDef.setValues(cellDefs, valueMap); xlsx.cell(0, 0) .value("우편통합 발송상세", center) @@ -513,7 +524,7 @@ public class Epst02Controller extends ApplicationController { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); String dateTime = dateFormat.format(System.currentTimeMillis()); - ArrayList cellDefs = fromJson(req.getCellDefs(), new TypeReference>() {}); + List cellDefs = fromJson(req.getCellDefs(), CellDef.listType()); XLSWriter xlsx = new XLSWriter() .setFilename("우편통합접수결과" + "_목록_" + dateTime + ".xlsx") @@ -527,21 +538,21 @@ public class Epst02Controller extends ApplicationController { List list = epostRcptRsltService.getEpostRcptRsltList(req.setFetchSize(0)); - CellDef.setValues(cellDefs, Map.ofEntries( - Map.entry("발송자료키", xlsx.style("RELETCDATA", center)) - , Map.entry("우편물코드", xlsx.style("JOB_CD", center)) - , Map.entry("우편물종류", xlsx.style("JOB_CD3_NM", center)) - , Map.entry("발송일자", xlsx.format(o -> xlsx.str2date(o.get("EXTRI_REGYMD"))).style(dateYMD)) - , Map.entry("접수일자", xlsx.format(o -> xlsx.str2date(o.get("RCEPT_YMD"))).style(dateYMD)) - , Map.entry("취급구분", xlsx.style("DIV_KB_NM", center)) - , Map.entry("발송건수", xlsx.style("RCEPT_CNT", numeric)) - , Map.entry("결제금액", xlsx.style("RCEPT_AMT", numeric)) - , Map.entry("제작수수료", xlsx.style("USEFEE_AMT", numeric)) - , Map.entry("우편요금", xlsx.style("TOTPOST_PRC", numeric)) - , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) - , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) - ) - ); + Map valueMap = new HashMap(); + valueMap.put("발송자료키", xlsx.style("RELETCDATA", center)); + valueMap.put("우편물코드", xlsx.style("JOB_CD", center)); + valueMap.put("우편물종류", xlsx.style("JOB_CD3_NM", center)); + valueMap.put("발송일자", xlsx.format(o -> xlsx.str2date(o.get("EXTRI_REGYMD"))).style(dateYMD)); + valueMap.put("접수일자", xlsx.format(o -> xlsx.str2date(o.get("RCEPT_YMD"))).style(dateYMD)); + valueMap.put("취급구분", xlsx.style("DIV_KB_NM", center)); + valueMap.put("발송건수", xlsx.style("RCEPT_CNT", numeric)); + valueMap.put("결제금액", xlsx.style("RCEPT_AMT", numeric)); + valueMap.put("제작수수료", xlsx.style("USEFEE_AMT", numeric)); + valueMap.put("우편요금", xlsx.style("TOTPOST_PRC", numeric)); + valueMap.put("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)); + valueMap.put("등록사용자", xlsx.style("RGTR_NM", center)); + + CellDef.setValues(cellDefs, valueMap); xlsx.cell(0, 0) .value("우편통합 접수결과", center) diff --git a/src/main/java/cokr/xit/fims/task/web/BpvController.java b/src/main/java/cokr/xit/fims/task/web/BpvController.java index 151e9bd1..525d7d41 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -495,12 +495,6 @@ public class BpvController { return super.createCrackdownReRegistration(crdnReReg); } - @Override - @RequestMapping(name="단속재등록 대장 삭제", value=METHOD_URL.removeCrackdownReRegistration) - public ModelAndView removeCrackdownReRegistration(CrdnReReg crdnReReg) { - return super.removeCrackdownReRegistration(crdnReReg); - } - } @Controller diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index e35c2f0f..b737a86d 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -680,9 +680,9 @@ public class CmnController { } @Override - @RequestMapping(name="우편발송", value=METHOD_URL.epostSendingStatusMain) - public ModelAndView epostSendingStatusMain() { - return super.epostSendingStatusMain(); + @RequestMapping(name="우편발송", value=METHOD_URL.epostReceiptRegistrationMain) + public ModelAndView epostReceiptRegistrationMain() { + return super.epostReceiptRegistrationMain(); } @Override diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index f02db1a4..02897431 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -958,15 +958,21 @@ public class DpvController { } @Override - @RequestMapping(name="전자우편 발송 목록 조회", value=METHOD_URL.getEpostSendingStatusList) - public ModelAndView getEpostSendingStatusList(EpostQuery req) { - return super.getEpostSendingStatusList(req); + @RequestMapping(name="전자우편 발송 목록 조회", value=METHOD_URL.getEpostReceiptRegistrationList) + public ModelAndView getEpostReceiptRegistrationList(EpostQuery req) { + return super.getEpostReceiptRegistrationList(req); } @Override - @RequestMapping(name="전자우편 발송 상세 정보 조회", value=METHOD_URL.getEpostSendingStatusInfo) - public ModelAndView getEpostSendingStatusInfo(EpostQuery req) { - return super.getEpostSendingStatusInfo(req); + @RequestMapping(name="전자우편 발송 상세 화면", value=METHOD_URL.getEpostReceiptRegistrationDetailInfo) + public ModelAndView getEpostReceiptRegistrationDetailInfo(EpostQuery req) { + return super.getEpostReceiptRegistrationDetailInfo(req); + } + + @Override + @RequestMapping(name="전자우편 발송 상세 목록 조회", value=METHOD_URL.getEpostReceiptRegistrationDetailList) + public ModelAndView getEpostReceiptRegistrationDetailList(EpostQuery req) { + return super.getEpostReceiptRegistrationDetailList(req); } @Override diff --git a/src/main/java/cokr/xit/fims/task/web/EcaController.java b/src/main/java/cokr/xit/fims/task/web/EcaController.java index 6187327c..eaa1681b 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -410,12 +410,6 @@ public class EcaController { return super.createCrackdownReRegistration(crdnReReg); } - @Override - @RequestMapping(name="단속재등록 대장 삭제", value=METHOD_URL.removeCrackdownReRegistration) - public ModelAndView removeCrackdownReRegistration(CrdnReReg crdnReReg) { - return super.removeCrackdownReRegistration(crdnReReg); - } - } @Controller diff --git a/src/main/java/cokr/xit/fims/task/web/PvsController.java b/src/main/java/cokr/xit/fims/task/web/PvsController.java index 378c65aa..cc0dcbcb 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -465,12 +465,6 @@ public class PvsController { return super.createCrackdownReRegistration(crdnReReg); } - @Override - @RequestMapping(name="단속재등록 대장 삭제", value=METHOD_URL.removeCrackdownReRegistration) - public ModelAndView removeCrackdownReRegistration(CrdnReReg crdnReReg) { - return super.removeCrackdownReRegistration(crdnReReg); - } - } @Controller diff --git a/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml b/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml index 0406f7cd..1e8177de 100644 --- a/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml +++ b/src/main/resources/sql/mapper/fims/epst/epostGdcc-mapper.xml @@ -113,9 +113,9 @@ - /* 전자우편 발송 상태 정보들을 가져오기(epostRcptRegMapper.selectEpostRcptRegDtlList) */ + SELECT ERR.CON_KEY , ERR.CON_ORG - , ERR.REG_DT - , ERR.RGTR - , ERR.MDFCN_DT - , ERR.MDFR , ERD.RGST_NMBR , ERD.RECEV_CAR_OWNER_ZIPCODE , ERD.RECEV_CAR_OWNER_ADDR , ERD.RECEV_CAR_OWNER_DETAILADDR , ERD.RECEV_CAR_OWNER_NM + , ERD.REG_DT + , ERD.RGTR + , ERD.MDFCN_DT + , ERD.MDFR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERD.RGTR) AS RGTR_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERD.MDFR) AS MDFR_NM , EDR.DELIVRSLTCD , EDR.NONDELIVREASNCD , EDR.NONDELIVREASNCDNM , EDR.SUBRECPRSNNM , EDR.RELRECPRSNCD , EDR.RELRECPRSNCDNM - , EDR.MDFCN_DT , (CASE WHEN LENGTH(EDR.DELIVHHMI) = 4 THEN CONCAT(EDR.DELIVYMD, EDR.DELIVHHMI, '00') ELSE CONCAT(EDR.DELIVYMD, EDR.DELIVHHMI) END) AS DELIV_YMD_TM , (SELECT GET_CODE_NM('EGP009', EDR.DELIVRSLTCD) FROM DUAL) AS DELIVRSLTCD_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERR.RGTR) AS RGTR_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = ERR.MDFR) AS MDFR_NM FROM TB_EPOST_RCPT_REG ERR INNER JOIN TB_EPOST_RCPT_DTL ERD ON (ERR.CON_KEY = ERD.CON_KEY) LEFT OUTER JOIN TB_EPOST_DLVR_RSLT EDR ON (ERD.DLVR_RSLT_ID = EDR.DLVR_RSLT_ID) WHERE ERR.CON_KEY = #{conKey} AND ERR.DEL_YN = 'N' + - +
+ +
+ +
    +
+