From f8d2290b1a8466b7c124e7768c33a3604ff4801a Mon Sep 17 00:00:00 2001 From: minuk926 Date: Fri, 3 Feb 2023 17:04:20 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=8B=A8=EC=86=8D=20=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=20=EC=9E=90=EB=A3=8C=20=ED=8E=B8=EC=A7=91=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kr/xit/fims/biz/FimsConst.java | 15 +- .../cmm/mapper/IFimsCrackdownMgtMapper.java | 2 +- .../fims/biz/cmm/model/FimsCrackdownDTO.java | 6 +- .../cmm/service/FimsCrackdownMgtService.java | 113 +++++++++- .../cmm/service/IFimsCrackdownMgtService.java | 2 + .../cmm/web/FimsCrackDownMgtController.java | 35 ++- .../kr/xit/fims/biz/ec/model/CtznStmtDTO.java | 1 + .../ec/service/EcCctvCrackdownService.java | 2 +- .../biz/ec/service/EcCtznSttemntService.java | 2 +- .../ec/service/EcNatlNewspaperService.java | 2 +- .../biz/rt/mapper/IRtCrackdownMgtMapper.java | 2 + .../java/kr/xit/fims/biz/rt/model/RtDTO.java | 2 + .../message/com/message-common_ko.properties | 2 +- .../cmm/cmm-fims-crackdown-mysql-mapper.xml | 30 ++- .../biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 31 ++- .../fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp | 10 +- .../fims/biz/cmm/cmmEnlightDisallowPopup.jsp | 163 ++++++++++++++ .../biz/cmm/cmmFimsCrackdownEditPopup.jsp | 203 +++++++++++------- .../biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 4 +- .../rt/rtCrackdownExtrInterfaceMgtForm.jsp | 18 +- .../fims/biz/rt/rtCrackdownMgtMainForm.jsp | 8 +- .../resources/biz/common/js/fimsApiURL.js | 3 +- .../framework/css/cmmn/common-style.css | 21 +- 23 files changed, 538 insertions(+), 139 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmEnlightDisallowPopup.jsp diff --git a/src/main/java/kr/xit/fims/biz/FimsConst.java b/src/main/java/kr/xit/fims/biz/FimsConst.java index 1bbf3c0f..1a6d0742 100644 --- a/src/main/java/kr/xit/fims/biz/FimsConst.java +++ b/src/main/java/kr/xit/fims/biz/FimsConst.java @@ -127,8 +127,8 @@ public class FimsConst { public enum RegltProcessSttusCode { CRACKDOWN_INIT("01", "초기상태"), CRACKDOWN("10", "부과대상"), - DESTRUCTION("11", "서손"), - ACCEPT_OPINIONS("12", "계도"), + DISALLOW("11", "서손"), + ENLIGHT("12", "계도"), IMPOSE("20", "부과") ; @@ -149,6 +149,17 @@ public class FimsConst { private final String code; private final String desc; } + + @Getter + @AllArgsConstructor + public enum PopupWorkDiv { + ENLIGHT("ENLIGHT", "계도 처리"), + DISALLOW("DISALLOW", "서손 처리"), + ; + + private final String code; + private final String desc; + } } diff --git a/src/main/java/kr/xit/fims/biz/cmm/mapper/IFimsCrackdownMgtMapper.java b/src/main/java/kr/xit/fims/biz/cmm/mapper/IFimsCrackdownMgtMapper.java index 6b93e683..90124d87 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/mapper/IFimsCrackdownMgtMapper.java +++ b/src/main/java/kr/xit/fims/biz/cmm/mapper/IFimsCrackdownMgtMapper.java @@ -18,6 +18,6 @@ public interface IFimsCrackdownMgtMapper { String selectRegltSts(final String regltId); void updateRtReglt(final FimsCrackdownDTO.Info dto); - + void updateProcessStsAndProcessDtRtReglt(final FimsCrackdownDTO.Info dto); } diff --git a/src/main/java/kr/xit/fims/biz/cmm/model/FimsCrackdownDTO.java b/src/main/java/kr/xit/fims/biz/cmm/model/FimsCrackdownDTO.java index d56e04aa..74bdb3b4 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/model/FimsCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/cmm/model/FimsCrackdownDTO.java @@ -35,8 +35,8 @@ public class FimsCrackdownDTO { private String dutyIdV; private String pcdTelV; private String cvplProcessPd; - private String erppSeCode; - private String erppResnDetail; + //private String erppSeCode; + //private String erppResnDetail; // regltDe + regltBeginTime private String regltDeTime; @@ -111,6 +111,6 @@ public class FimsCrackdownDTO { private FimsCrackdownDTO.Info infoDTO; private FimsCrackdownDTO.Ctzn ctznDTO; private RtDTO.Payer payerDTO; - //private FimsCrackdownDTO.Info infoDTO; + private RtDTO.Erpp erppDTO; } } diff --git a/src/main/java/kr/xit/fims/biz/cmm/service/FimsCrackdownMgtService.java b/src/main/java/kr/xit/fims/biz/cmm/service/FimsCrackdownMgtService.java index e1951265..91258507 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/service/FimsCrackdownMgtService.java +++ b/src/main/java/kr/xit/fims/biz/cmm/service/FimsCrackdownMgtService.java @@ -85,7 +85,7 @@ public class FimsCrackdownMgtService implements IFimsCrackdownMgtService { infoDTO.setLastOpetr(getUserInfo().getUniqId()); // 단속 상태 변경 여부 - 이력테이블 - boolean isStsChange = Objects.equals(infoDTO.getRegltProcessSttusCode(), mapper.selectRegltSts(infoDTO.getRegltId())); + boolean isStsChange = !Objects.equals(infoDTO.getRegltProcessSttusCode(), mapper.selectRegltSts(infoDTO.getRegltId())); mapper.updateRtReglt(infoDTO); // 이력테이블 @@ -125,4 +125,115 @@ public class FimsCrackdownMgtService implements IFimsCrackdownMgtService { ,cvplReqstCn: $('input[name=cvplReqstCn]').val() */ } + + @Override + @Transactional + public void saveEnlight(FimsCrackdownDTO.SaveRequest saveDTO) { + FimsCrackdownDTO.Info infoDTO = saveDTO.getInfoDTO(); + FimsCrackdownDTO.Ctzn ctznDTO = saveDTO.getCtznDTO(); + RtDTO.Payer payerDTO = saveDTO.getPayerDTO(); + + // 1. 납부자 정보 등록 및 변경 + if (Checks.isEmpty(payerDTO.getPayerId())) { + payerDTO.setRegister(getUserInfo().getUniqId()); + rtCrackdownMgtMapper.insertRtPayer(payerDTO); + } else { + payerDTO.setUpdusr(getUserInfo().getUniqId()); + rtCrackdownMgtMapper.updateRtPayer(payerDTO); + } + + // 2. 단속 테이블 정보 반영 - 처리상태, 시구군, 법정동, 특기사항, 특기사항코드, 위반코드, 차량명, 차대번호 + // 진행상태 - 부과대상 + //시군구 추가 + //면제차량 여부 추가 : $('input:checkbox[name=sysCode]:checked').val() + infoDTO.setPayerId(payerDTO.getPayerId()); + infoDTO.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.ENLIGHT.getCode());; + infoDTO.setLastOpetr(getUserInfo().getUniqId()); + + // 단속 상태 변경 여부 - 이력테이블 + boolean isStsChange = !Objects.equals(infoDTO.getRegltProcessSttusCode(), mapper.selectRegltSts(infoDTO.getRegltId())); + mapper.updateRtReglt(infoDTO); + + // 이력테이블 + if(isStsChange){ + rtCrackdownMgtMapper.insertRtProcessSttsChangeHist( + RtDTO.SttusChangeHist.builder() + .regltId(infoDTO.getRegltId()) + .regltProcessSttusCode(infoDTO.getRegltProcessSttusCode()) + .register(getUserInfo().getUniqId()) + .build() + ); + } + + // 2. 외부연계정보 반영 : + // 시민신고 데이타 + if(FimsConst.RegltSeCode.CITIZEN.getCode().equals(saveDTO.getRegltSeCode()) + && (Checks.isNotEmpty(saveDTO.getInterfaceSeqN()) && Checks.isNotEmpty(saveDTO.getCtznSttemntDetailSn()))){ + + + return; + } + + if(!FimsConst.RegltSeCode.CITIZEN.getCode().equals(saveDTO.getRegltSeCode()) + && Checks.isNotEmpty(saveDTO.getExtrlRegltCntcId())){ + + + return; + } + /* + interfaceSeqN: $('input[name=interfaceSeqN]').val() + ,ctznSttemntDetailSn: $('input[name=ctznSttemntDetailSn]').val() + ,cvplApplcntNm: $('input[name=cvplApplcntNm]').val() + ,cvplApplcntMoblphonNo: $('input[name=cvplApplcntMoblphonNo]').val() + ,cvplReqstCn: $('input[name=cvplReqstCn]').val() + ,cvplRceptDt: $('input[name=cvplRceptDt]').val() + ,cvplProcessPd: $('input[name=cvplProcessPd]').val() + ,cvplReqstCn: $('input[name=cvplReqstCn]').val() + */ + } + + @Override + @Transactional + public void saveDisallow(FimsCrackdownDTO.SaveRequest saveDTO) { + FimsCrackdownDTO.Info infoDTO = saveDTO.getInfoDTO(); + RtDTO.Erpp erppDTO = saveDTO.getErppDTO(); + //FimsCrackdownDTO.Ctzn ctznDTO = saveDTO.getCtznDTO(); + //RtDTO.Payer payerDTO = saveDTO.getPayerDTO(); + + // // 1. 납부자 정보 등록 및 변경 + // if (Checks.isEmpty(payerDTO.getPayerId())) { + // payerDTO.setRegister(getUserInfo().getUniqId()); + // rtCrackdownMgtMapper.insertRtPayer(payerDTO); + // } else { + // payerDTO.setUpdusr(getUserInfo().getUniqId()); + // rtCrackdownMgtMapper.updateRtPayer(payerDTO); + // } + + // 2. 단속 테이블 정보 반영 - 처리상태, 시구군, 법정동, 특기사항, 특기사항코드, 위반코드, 차량명, 차대번호 + // 진행상태 - 부과대상 + //시군구 추가 + //면제차량 여부 추가 : $('input:checkbox[name=sysCode]:checked').val() + //infoDTO.setPayerId(payerDTO.getPayerId()); + infoDTO.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.DISALLOW.getCode()); + infoDTO.setLastOpetr(getUserInfo().getUniqId()); + + // 단속 상태 변경 여부 - 이력테이블 + boolean isStsChange = !Objects.equals(infoDTO.getRegltProcessSttusCode(), mapper.selectRegltSts(infoDTO.getRegltId())); + mapper.updateProcessStsAndProcessDtRtReglt(infoDTO); + + // 이력테이블 + if(isStsChange){ + rtCrackdownMgtMapper.insertRtProcessSttsChangeHist( + RtDTO.SttusChangeHist.builder() + .regltId(infoDTO.getRegltId()) + .regltProcessSttusCode(infoDTO.getRegltProcessSttusCode()) + .register(getUserInfo().getUniqId()) + .build() + ); + } + + erppDTO.setRegister(getUserInfo().getUniqId()); + erppDTO.setSysCode(getUserInfo().getOrgnztId()); + rtCrackdownMgtMapper.insertRtErpp(erppDTO); + } } diff --git a/src/main/java/kr/xit/fims/biz/cmm/service/IFimsCrackdownMgtService.java b/src/main/java/kr/xit/fims/biz/cmm/service/IFimsCrackdownMgtService.java index c47a2661..1362449b 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/service/IFimsCrackdownMgtService.java +++ b/src/main/java/kr/xit/fims/biz/cmm/service/IFimsCrackdownMgtService.java @@ -18,6 +18,8 @@ public interface IFimsCrackdownMgtService { Map findCrackdownInfo(final FimsCrackdownDTO.Request dto); void saveImposeTgt(FimsCrackdownDTO.SaveRequest saveDTO); + void saveEnlight(FimsCrackdownDTO.SaveRequest saveDTO); + void saveDisallow(FimsCrackdownDTO.SaveRequest saveDTO); diff --git a/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java b/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java index f3bb2eb9..72a8dd48 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java +++ b/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java @@ -54,8 +54,8 @@ public class FimsCrackDownMgtController { Optional regltSeCodeEnum = Stream.of(FimsConst.RegltSeCode.values()) .filter(e -> e.getCode().equals(dto.getRegltSeCode())) .findAny(); - - mav.addObject("txtTitle", regltSeCodeEnum.get().getDesc()); +//TODO: 처리필요 + mav.addObject("txtTitle", "초기자료 편집"); mav.setViewName(FimsConst.FIMS_JSP_BASE_PATH + "cmm/cmmFimsCrackdownEditPopup.popup"); return mav; } @@ -79,6 +79,20 @@ public class FimsCrackDownMgtController { return mav; } + @RequestMapping(value = "/cmmEnlightDisallowPopup") + public ModelAndView cmmEnlightDisallowPopup(final String bizDiv){ + ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"cmm/cmmEnlightDisallowPopup.popup"); + mav.addObject("pageTitle", "서손 / 계도 처리"); + mav.addObject("bizDiv", bizDiv); + if(bizDiv.equals(FimsConst.PopupWorkDiv.ENLIGHT.getCode())) { + mav.addObject("txtTitle", FimsConst.PopupWorkDiv.ENLIGHT.getDesc()); + }else { + mav.addObject("txtTitle", FimsConst.PopupWorkDiv.DISALLOW.getDesc()); + } + return mav; + } + + @RequestMapping(value = "/findCrackdownInfos") public ModelAndView findCrackdownInfos(@RequestParam final Map paraMap) { return ResultResponse.of(service.findCrackdownInfos(paraMap, MybatisUtils.getPagingInfo(paraMap))); @@ -118,6 +132,23 @@ public class FimsCrackDownMgtController { return mav; } + @PostMapping(value="/saveEnlight") + public ModelAndView saveEnlight(@RequestBody FimsCrackdownDTO.SaveRequest saveDTO){ + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + + service.saveEnlight(saveDTO); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); + + return mav; + } + + @PostMapping(value="/saveDisallow") + public ModelAndView saveDisallow(@RequestBody FimsCrackdownDTO.SaveRequest saveDTO){ + ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); + service.saveDisallow(saveDTO); + AjaxMessageMapRenderer.success(mav, MessageKey.CMM_INSERT_SUCCESS); + return mav; + } } diff --git a/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java b/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java index 2a4a2bcb..b950f9d8 100644 --- a/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/model/CtznStmtDTO.java @@ -356,5 +356,6 @@ public class CtznStmtDTO { //extends ExtlEsbDataType { * 답변생성 여부 */ private boolean ansCreate; + private String registSeCode; } } diff --git a/src/main/java/kr/xit/fims/biz/ec/service/EcCctvCrackdownService.java b/src/main/java/kr/xit/fims/biz/ec/service/EcCctvCrackdownService.java index a51d9a84..0cb2279c 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/EcCctvCrackdownService.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/EcCctvCrackdownService.java @@ -276,7 +276,7 @@ public class EcCctvCrackdownService implements IEcCctvCrackdownService { public void saveRtErpp(final CctvCrackdownDTO.Request dto) { // 단속테이블 dto.setJobSeCode(FimsBizUtils.getFileJobSeCode(dto.getRegltSeCode())); - dto.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.DESTRUCTION.getCode()); + dto.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.DISALLOW.getCode()); dto.setRegister(getUserInfo().getUniqId()); mapper.insertRtRegltFromEcExtrRegltCntc(dto); diff --git a/src/main/java/kr/xit/fims/biz/ec/service/EcCtznSttemntService.java b/src/main/java/kr/xit/fims/biz/ec/service/EcCtznSttemntService.java index 4a0eb0b2..7a2f6f7e 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/EcCtznSttemntService.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/EcCtznSttemntService.java @@ -124,7 +124,7 @@ public class EcCtznSttemntService implements IEcCtznSttemntService { // 단속테이블 dto.setRegltSeCode(FimsConst.RegltSeCode.CITIZEN.getCode()); dto.setRegister(getUserInfo().getUniqId()); - dto.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.DESTRUCTION.getCode()); + dto.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.DISALLOW.getCode()); mapper.insertRtRegltFromCtznStmt(dto); // 서손테이블 diff --git a/src/main/java/kr/xit/fims/biz/ec/service/EcNatlNewspaperService.java b/src/main/java/kr/xit/fims/biz/ec/service/EcNatlNewspaperService.java index 9f18e9b7..083d1eea 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/EcNatlNewspaperService.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/EcNatlNewspaperService.java @@ -143,7 +143,7 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService { .ctznSttemntDetailSn(dtl.getCtznSttemntDetailSn()) .regltId(dtl.getRegltId()) .regltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN_INIT.getCode()) - .regltSeCode(FimsConst.RegistSeCode.AUTO_REGIST.getCode()) + .registSeCode(FimsConst.RegistSeCode.AUTO_REGIST.getCode()) .register(getUserInfo().getUniqId()) .build(); diff --git a/src/main/java/kr/xit/fims/biz/rt/mapper/IRtCrackdownMgtMapper.java b/src/main/java/kr/xit/fims/biz/rt/mapper/IRtCrackdownMgtMapper.java index e8078266..2684f235 100644 --- a/src/main/java/kr/xit/fims/biz/rt/mapper/IRtCrackdownMgtMapper.java +++ b/src/main/java/kr/xit/fims/biz/rt/mapper/IRtCrackdownMgtMapper.java @@ -25,6 +25,8 @@ public interface IRtCrackdownMgtMapper { void deleteRtReglt(final T t); + void insertRtErpp(final RtDTO.Erpp dto); + //----------------------------------------------------- // 납부자 : tb_rt_payer diff --git a/src/main/java/kr/xit/fims/biz/rt/model/RtDTO.java b/src/main/java/kr/xit/fims/biz/rt/model/RtDTO.java index 8ae8ab75..96ebb428 100644 --- a/src/main/java/kr/xit/fims/biz/rt/model/RtDTO.java +++ b/src/main/java/kr/xit/fims/biz/rt/model/RtDTO.java @@ -177,6 +177,8 @@ public class RtDTO { * 최종 처리자 */ private String lastOpetr; + + private String enlightResnCode; } /** diff --git a/src/main/resources/message/com/message-common_ko.properties b/src/main/resources/message/com/message-common_ko.properties index f27dca69..258d7a28 100644 --- a/src/main/resources/message/com/message-common_ko.properties +++ b/src/main/resources/message/com/message-common_ko.properties @@ -382,4 +382,4 @@ custom.isNotExist.msg=\uCC98\uB9AC\uC5D0 \uD544\uC694\uD55C \uC790\uB8CC\uAC00 \ warn.session.end=\uC138\uC158\uC774 \uC885\uB8CC \uB418\uC5C8\uC2B5\uB2C8\uB2E4. - +#message.key.erpp.empty=\uAE30\uBCF8\uAC12 diff --git a/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml index 8470024b..13ff2d6f 100644 --- a/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml @@ -75,34 +75,37 @@ /* cmm-fims-crackdown-mysql-mapper|selectCrackdowns-단속 목록 조회|julim */ + + AND trr.reglt_process_sttus_code = #{regltProcessSttusCode} + - AND trr.reglt_de BETWEEN #{sch_date_from} AND #{sch_date_to} + AND trr.reglt_de BETWEEN #{sch_date_from} AND #{sch_date_to} - AND trr.regist_dt BETWEEN #{sch_date_from} AND #{sch_date_to} + AND trr.regist_dt BETWEEN #{sch_date_from} AND #{sch_date_to} - AND INSTR(trr.vhcle_no, #{vhcleNo}) > 0 + AND INSTR(trr.vhcle_no, #{vhcleNo}) > 0 - AND trr.sys_code = #{sysCode} + AND trr.sys_code = #{sysCode} - AND trr.reglt_se_code = #{regltSeCode} + AND trr.reglt_se_code = #{regltSeCode} - AND trr.regist_se_code = #{registSeCode} + AND trr.regist_se_code = #{registSeCode} - AND LENGTH(IFNULL(trr.vhcty_cl_code, '')) > 0 + AND LENGTH(IFNULL(trr.vhcty_cl_code, '')) > 0 - AND LENGTH(IFNULL(trr.vhcty_cl_code, '')) = 0 + AND LENGTH(IFNULL(trr.vhcty_cl_code, '')) = 0 - ORDER BY trr.sys_code, trr.reglt_se_code, trr.reglt_de, trr.vhcle_no, trr.reglt_begin_time + ORDER BY trr.sys_code, trr.reglt_se_code, trr.reglt_de, trr.vhcle_no, trr.reglt_begin_time @@ -173,9 +176,18 @@ , violt_dtls_code = IF(violt_dtls_code = #{violtDtlsCode}, violt_dtls_code, #{violtDtlsCode}) , reglt_process_sttus_code = IF(reglt_process_sttus_code = #{regltProcessSttusCode}, reglt_process_sttus_code, #{regltProcessSttusCode}) , last_process_dt = DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') + , enlight_resn_code = IF(enlight_resn_code = #{enlightResnCode}, enlight_resn_code, #{enlightResnCode}) , last_opetr = #{lastOpetr} WHERE reglt_id = #{regltId} + + /* cmm-fims-crackdown-mysql-mapper|updateProcessStsAndProcessDtRtReglt-단속 상태와 최종처리일 변경|julim */ + UPDATE tb_rt_reglt + SET reglt_process_sttus_code = IF(reglt_process_sttus_code = #{regltProcessSttusCode}, reglt_process_sttus_code, #{regltProcessSttusCode}) + , last_process_dt = DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') + , last_opetr = #{lastOpetr} + WHERE reglt_id = #{regltId} + diff --git a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml index 968fc582..b9578287 100644 --- a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml @@ -175,6 +175,31 @@ + + /* rt-reglt-and-erpp-mysql-mapper|insertRtErpp-서손 데이타 등록|julim */ + INSERT + INTO tb_rt_erpp ( + erpp_id + , reglt_id + , signgu_code + , sys_code + , erpp_process_de + , erpp_se_code + , erpp_resn_detail + , regist_dt + , register + ) VALUES ( + LPAD(NEXTVAL(seq_rt_erpp), 12, '0') + , #{regltId} + , #{signguCode} + , #{sysCode} + , #{erppId} + , #{erppSeCode} + , #{erppResnDetail} + , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') + , #{register} + ) + +
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmEnlightDisallowPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmEnlightDisallowPopup.jsp new file mode 100644 index 00000000..c3faf1cb --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmEnlightDisallowPopup.jsp @@ -0,0 +1,163 @@ +<%-- +================================================================================ +File : /fims/biz/cmm/cmmEnlightDisallowPopup.jsp +Name : 서손 / 계도 처리 팝업 - 단속관리>단속현황관리 +Auth : lim.jong.uk +Date : 2022-02-03 +Desc : 서손 / 계도 처리 팝업 +================================================================================ +Date Author Description +================================================================================ +================================================================================ +--%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%> + + + + + + + + +
+
+

${txtTitle}

+
+ + + + + + + + + + + + + + + + + + + + +
위반정보 상세
처리일 + + + + +
처리사유 + + +
특기사항 + +
+
+
+
+ 처리 + 닫기 +
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp index cf19988d..8f8636ea 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp @@ -275,7 +275,9 @@ Date Author Description var fnCallbackZipSearch = (obj) => fnPopupBiz.setZipSearch(obj, document.querySelector('#frm')); var imageEditorPopup = (flag, params) => fnPopupBiz.pagePopup(flag, params); var callbackReloadImage = () => fnPopupBiz.downloadImg(); + var callbackEnlightErpp = (data) => fnPopupBiz.callbackEnlightErpp(data) let orgData; + let callPopup; /* ******************************* * Biz function @@ -321,18 +323,24 @@ Date Author Description url = frwkApiUrl.POPUP_PAINTWEB_IMG_EDITOR; popOption = {width: 952, height: 800, resizable:false,scrollbars:'no'}; popTitle = "이미지 에디터"; + window.opener.popup = CmmPopup.open(url, params, popOption, popTitle); break; case "imageView": <%--url = '';--%> url = frwkApiUrl.POPUP_IMG_VIEW; popOption = {width: 950, height: 750, resizable:false,scrollbars:'no'}; popTitle = "이미지 보기"; + window.opener.popup = CmmPopup.open(url, params, popOption, popTitle); + break; + case "callEnlightErppPopup": + url = fimsApiUrl.POPUP_ENLIGHT_DISALLOW; + popOption = {width: 500, height: 400}; + popTitle = "계도 / 서손 처리"; + callPopup = CmmPopup.open(url, params, popOption, popTitle); break; default: break; } - window.opener.popup = CmmPopup.open(url, params, popOption, popTitle); - //var w = window.open("/imageEditor.do", "", "width=800,height=650,top=0px,left=200px,status=,resizable=false,scrollbars=no"); } ,setZipSearch: function(zipObj, tgtObj){ //FIXME : 소유자 정보에 필요한 내용 추가 필요 - 법정동, 빌딩명, 주소구분 등 @@ -367,88 +375,43 @@ Date Author Description $('input[name=vhcleNm]').val('차량명칭'); $('input[name=vhcleColor]').val('차량색상'); } - - - - - - - - ,add: () => { - if (!fnBiz.validate()) return; - - cmmBizAjax('add', { - url: '' - , data: $("#frmSearch").serialize() - }) - } - ,modify: () => { - /*if (!fnBiz.validate()) return;*/ - - cmmBizAjax('modify', { - url: '' - ,data: $("#frmSearch").serialize() - }); - } - ,remove: () => { - $("input[name=useAt]").val('N'); - cmmBizAjax('remove', { - url: '' - ,data: $("#frmSearch").serialize() - }); - } - - - }; - - /************************************************************************** - * event - **************************************************************************/ - $(() => { - $(window).on("unload", function (e) { - window.opener?.unblockUI(); - window.opener?.callbackSearch(); - return null; - }); - - $("#btnClose").on('click', () => { - window.close() - }); - - $('#addrSearch').on('click', () => CmmPopup.zipPopup()); - - $('#vhcleSearch').on('click', () => { - fnPopupBiz.findVhcleNo(); - - }); - - $('#btnImposeTgt, #btnEnlight, #btnDisallow').on('click', (e) => { - const id = e.target.id; - switch(id){ - case 'btnImposeTgt': - break; - - case 'btnEnlight': - break; - - case 'btnDisallow': - break; - default: - return false; + ,callbackEnlightErpp: (data) => { + + + let saveData = fnPopupBiz.getSaveData(data); + if(data.bizDiv ==='ENLIGHT'){ + cmmAjax({ + url: '/fims/biz/cmm/saveEnlight.do' + ,contentType: 'application/json' + ,data: JSON.stringify(saveData) + }) + }else{ + const erppDTO = { + regltId: saveData.regltId + , erppProcessDe:data.processDt + , erppSeCode: data.erppSeCode + , erppResnDetail: data.erppResnDetail } - - - let data = new FormData(document.querySelector('form')); - - for (const pair of data.entries()) { - console.log(`${pair[0]}, ${pair[1]}`); + saveData = {...saveData, erppDTO: erppDTO} + cmmAjax({ + url: '/fims/biz/cmm/saveDisallow.do' + ,contentType: 'application/json' + ,data: JSON.stringify(saveData) + }) } + } + ,getSaveData: (data) => { + <%--let data = new FormData(document.querySelector('form'));--%> - for (const [name, value] of data) { - console.log(name, value); - } - // Getting a Serialize Data from FormData - console.log(serialize(data)); + <%--for (const pair of data.entries()) {--%> + <%-- console.log(`${pair[0]}, ${pair[1]}`);--%> + <%--}--%> + + <%--for (const [name, value] of data) {--%> + <%-- console.log(name, value);--%> + <%--}--%> + <%--// Getting a Serialize Data from FormData--%> + <%--console.log(serialize(data));--%> const infoDTO = { regltId: $('input[name=regltId]').val() @@ -457,7 +420,7 @@ Date Author Description ,ctznSttemntDetailSn: $('input[name=ctznSttemntDetailSn]').val() ,regltSeCode: $('select[name=regltSeCode]').val() ,registSeCode: $('select[name=registSeCode]').val() - ,regltDe: $('input[name=regltDe]').val() + ,regltDe: $('input[name=regltDe]').val().replaceAll('-','') ,regltBeginTime: $('input[name=regltBeginTime]').val() ,sysCode: $('select[name=sysCode]').val() ,imageSeCode: $('select[name=imageSeCode]').val() @@ -477,6 +440,8 @@ Date Author Description ,violtDtlsCode: $('select[name=violtDtlsCode]').val() ,vhcleNm: $('input[name=vhcleNm]').val() ,vin: $('input[name=vin]').val() + ,lastProcessDt: data?.processDt + ,enlightResnCode: data?.enlightResnCode } const ctznDTO = { @@ -500,7 +465,7 @@ Date Author Description ,detailAdres: $('input[name=detailAdres]').val() } - const saveData = { + return { regltId: $('input[name=regltId]').val() ,extrlRegltCntcId: $('input[name=extrlRegltCntcId]').val() ,interfaceSeqN: $('input[name=interfaceSeqN]').val() @@ -511,6 +476,63 @@ Date Author Description ,payerDTO } + } + + + + + + ,add: () => { + if (!fnBiz.validate()) return; + + cmmBizAjax('add', { + url: '' + , data: $("#frmSearch").serialize() + }) + } + ,modify: () => { + /*if (!fnBiz.validate()) return;*/ + + cmmBizAjax('modify', { + url: '' + ,data: $("#frmSearch").serialize() + }); + } + ,remove: () => { + $("input[name=useAt]").val('N'); + cmmBizAjax('remove', { + url: '' + ,data: $("#frmSearch").serialize() + }); + } + + + }; + + /************************************************************************** + * event + **************************************************************************/ + $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + window.opener?.callbackSearch(); + return null; + }); + + $("#btnClose").on('click', () => { + window.close() + }); + + $('#addrSearch').on('click', () => CmmPopup.zipPopup()); + + $('#vhcleSearch').on('click', () => { + fnPopupBiz.findVhcleNo(); + + }); + + $('#btnImposeTgt').on('click', (e) => { + let saveData = fnPopupBiz.getSaveData(); + cmmAjax({ url: '/fims/biz/cmm/saveImposeTgt.do' ,contentType: 'application/json' @@ -518,6 +540,21 @@ Date Author Description }) }); + $('#btnEnlight, #btnDisallow').on('click', (e) => { + const id = e.target.id; + let bizDiv; + switch(id){ + case 'btnEnlight': + fnPopupBiz.pagePopup('callEnlightErppPopup', {bizDiv: 'ENLIGHT'}) + break; + + case 'btnDisallow': + fnPopupBiz.pagePopup('callEnlightErppPopup', {bizDiv: 'DISALLOW'}) + break; + default: + return false; + } + }); /* $('#btnEnlight').on('click', () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp index 12684517..70de2e74 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp @@ -50,7 +50,7 @@ Date Author Description
-
+

위반정보

@@ -281,7 +281,7 @@ Date Author Description <%@include file="/WEB-INF/jsp/framework/biz-popup-tab-btn.jsp" %>
-
+

위반사진

diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp index 4e11264e..81c49d98 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp @@ -13,6 +13,16 @@ Date Author Description <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> +
@@ -22,7 +32,7 @@ Date Author Description - + - + +
@@ -90,7 +101,7 @@ Date Author Description popup = null; let GRID = null; let curClickColName; - //var callbackSearch = () => fnBiz.search(); + var callbackSearch = () => fnTab0Biz.search(); var pageNav = null; /* ******************************* @@ -439,6 +450,7 @@ Date Author Description ,[$('#sch_opt').val()]: $('#sch_word').val() ,sysCode: $('input:radio[name=sysCode]:checked').val() ,regltSeCode: $('input:radio[name=regltSeCode]:checked').val() + ,regltProcessSttusCode: $('#regltProcessSttusCode').val() //,cnfmYn: $('input[name=regltYn]:checked').val() ,cnfmYn: $('#cnfmYn').val() } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp index 581f38e9..c41673b9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp @@ -47,10 +47,10 @@ Date Author Description **************************************************************************/ let CUR_TAB_IDX = 0; let ARR_TOTCNT = 0; - let orgData; - let downloadImgParam; - var callbackSearch = () => fnBiz.search(); - var callbackReloadImage = () => fnBiz.downloadImg(); + //let orgData; + //let downloadImgParam; + //var callbackSearch = () => fnBiz.search(); + //var callbackReloadImage = () => fnBiz.downloadImg(); /******************************* diff --git a/src/main/webapp/resources/biz/common/js/fimsApiURL.js b/src/main/webapp/resources/biz/common/js/fimsApiURL.js index e12a6030..0664c0b6 100644 --- a/src/main/webapp/resources/biz/common/js/fimsApiURL.js +++ b/src/main/webapp/resources/biz/common/js/fimsApiURL.js @@ -5,8 +5,9 @@ const fimsApiUrl = { */ FIND_RCV_PATH_FILES: '/fims/biz/cmm/findRcvPathFiles.do' //연계파일 경로 파일 목록 조회 ,POPUP_CRACKDOWN_TOTAL: '/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.do' //단속현황 개별 총정보 팝업 - ,POPUP_CRACKDOWN_EDIT: '/fims/biz/cmm/cmmFimsCrackdownEditPopup.do' //단속 정보 편집 팝업 + ,POPUP_CRACKDOWN_EDIT: '/fims/biz/cmm/cmmFimsCrackdownEditPopup.do' //단속 정보 편집 팝업 ,POPUP_EXTR_CRACKDOWN_FILE_SEL: '/fims/biz/cmm/cmmCrackdownRcvFilePopup.do' //CCTV 외부연계 데이타 선택 + ,POPUP_ENLIGHT_DISALLOW: '/fims/biz/cmm/cmmEnlightDisallowPopup.do' //서손 / 계도 처리 popup ,FIND_CRACKDOWN_INFO: '/fims/biz/cmm/findCrackdownInfoAndAttchFiles.do' //단속현황-개별총정보 위반정보탭 조회 ,FIND_CRACKDOWNS: '/fims/biz/cmm/findCrackdownInfos.do' //단속현황-외부연계자료목록 /** diff --git a/src/main/webapp/resources/framework/css/cmmn/common-style.css b/src/main/webapp/resources/framework/css/cmmn/common-style.css index ef2b0d64..57ba8aff 100644 --- a/src/main/webapp/resources/framework/css/cmmn/common-style.css +++ b/src/main/webapp/resources/framework/css/cmmn/common-style.css @@ -701,14 +701,12 @@ select:enabled{ }*/ .popup_inner{ - margin: 10px auto; + margin: 30px auto; padding: 40px 45px; text-align: left; display: flex; - flex-flow: column; gap: 1rem; } -.inner_02{flex-direction: row;} /* **************************** * 2020.06.11. 박민규 * ".popup_inner *" 셀렉터 변경 @@ -809,7 +807,7 @@ select:enabled{ .tbl03 { font-size: 12px; margin-bottom: 20px; - border:1px solid #b7b7b7; + border:1px solid red; } .tbl03 th, .tbl03 td { border: 1px solid #b7b7b7; @@ -1271,10 +1269,10 @@ input:read-only { background: url('../../images/common/content_header.png') 0 5px no-repeat; padding-left: 20px;*/ border-bottom: 1px solid #c3c3c3; - font-size: 17px; + font-size: 15px; font-weight: bold; letter-spacing: -1.6px; - padding: 10px 10px 10px 3px; + padding: 10px 10px 10px 15px; margin-top: 12px; } @@ -1285,9 +1283,6 @@ input:read-only { clear: both; position: relative; overflow: hidden; - display: flex; - justify-content: space-between; - align-items: baseline; } .p_flr{ display: flex; @@ -1296,10 +1291,7 @@ input:read-only { padding-left: 120px; } .flr a:last-child{ - margin-right: 15px; -} -.align_center{ - padding-left:0px; + margin-right: 0; } .page_info{ position: absolute; @@ -1390,7 +1382,6 @@ input:read-only { border-bottom: none; padding-right: 8px; margin-right: 5px; - font-size:13px; } @@ -1985,4 +1976,4 @@ div.guide ul li{ padding: 10px; background-color: #b5c1dc57; border-radius: 8px; -} \ No newline at end of file +}