diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 957aaff4..a209c16f 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.apache.poi.ss.usermodel.CellStyle; import org.springframework.stereotype.Controller; @@ -254,7 +255,7 @@ public class Crdn06Controller extends ApplicationController { */ @Task @RequestMapping(name="단속자료 상세 조회", value=METHOD_URL.getCrackdownInfo) - public ModelAndView getCrackdownInfo(CrdnQuery query) { + public ModelAndView getCrackdownInfo(HttpServletRequest hReq, CrdnQuery query) { DataObject crdnInfo = crdnService.getCrackdownInfo(query); boolean json = jsonResponse(); @@ -278,7 +279,8 @@ public class Crdn06Controller extends ApplicationController { case "PES" -> { vltnByTask = "FIM064"; } } - Map> commonCodes = getCodesOf("FIM011","FIM053","LVS005",vltnByTask); + Map> commonCodes = getCodesOf("CMN006", "FIM011","FIM053","LVS005",vltnByTask); + mav.addObject("CMN006List", commonCodes.get("CMN006")); mav.addObject("FIM011List", commonCodes.get("FIM011")); mav.addObject("FIM053List", commonCodes.get("FIM053")); mav.addObject("LVS005List", commonCodes.get("LVS005")); @@ -311,7 +313,9 @@ public class Crdn06Controller extends ApplicationController { } return mav - .addObject("pageName", "crdn06020") // + .addObject("openerPageName", hReq.getParameter("openerPageName")) // 호출한 Jsp PageName + .addObject("pageName", "crdn06020") // jsp pageName + .addObject("infoPrefixUrl", "/crdn/crdn06") // prefixUrl .addObject("crdnInfo", json ? crdnInfo : toJson(crdnInfo)) ; } diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java index 1f8cdeb6..c4e826f2 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -157,6 +157,7 @@ public class Sprt02Controller extends ApplicationController { // 재조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 + mav.addObject("totalInfo", json ? totalInfo : toJson(totalInfo)); // 단속 정보 } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml index 671b8544..87fef6c5 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml @@ -114,6 +114,8 @@ , C.NXRP_CRDN_LINK_DT , C.LINK_TBL_NM , C.LINK_ID + , C.GPS_X + , C.GPS_Y , V.VLTN_CD , V.VLTN_LAW_NM , V.VLTN_LAW1 @@ -122,13 +124,11 @@ , CA.TEAM_ID , CA.DTL_CRDN_PLC , CA.CRDN_SPAREA_CD - , CA.CRDN_BGNG_TM - , CA.CRDN_END_TM + , CA.CRDN_BGNG_TM + , CA.CRDN_END_TM , CA.CRDN_SN - , C.GPS_X - , C.GPS_Y - , CA.MOSC_X - , CA.MOSC_Y + , CA.MOSC_X + , CA.MOSC_Y , CA.TOWNG_YN , CA.USE_FUEL_CD , CA.FFNLG_CARMDL_CD @@ -145,12 +145,12 @@ , LE.LEVY_EXCL_SE_CD , LE.LEVY_EXCL_RSN_CD FROM TB_CRDN C - INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) + INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) INNER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID) LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN) - LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N') + LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N') WHERE C.DEL_YN = 'N' AND C.CRDN_ID = #{crdnId} diff --git a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml index d1dd202d..59281266 100644 --- a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml @@ -31,13 +31,17 @@ SELECT C.CRDN_ID , C.SGG_CD , C.TASK_SE_CD + , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM , C.CRDN_REG_SE_CD - , C.CRDN_INPT_SE_CD + , (SELECT GET_CODE_NM('FIM026', C.CRDN_REG_SE_CD) FROM DUAL) AS CRDN_REG_SE_NM + , C.CRDN_INPT_SE_CD + , (SELECT GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM , C.CVLCPT_LINK_YN , C.LINK_TBL_NM , C.LINK_ID , C.CRDN_YMD , C.CRDN_TM + , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM , C.VHRNO , C.CRDN_STDG_NM , C.CRDN_ROAD_NM @@ -52,54 +56,50 @@ , C.FFNLG_CRDN_AMT , C.FFNLG_RDUCT_RT , C.FFNLG_AMT - , C.ADVNTCE_BGNG_YMD - , C.ADVNTCE_DUDT_YMD + , C.ADVNTCE_BGNG_YMD + , C.ADVNTCE_DUDT_YMD , C.ADVNTCE_AMT , C.OPNN_SBMSN_YN , C.ETC_CN , C.CRDN_STTS_CD - , C.CRDN_STTS_CHG_DT + , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + , C.CRDN_STTS_CHG_DT , C.BFR_CRDN_ID , C.DEL_YN , C.REG_DT , C.RGTR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.RGTR) AS RGTR_NM , C.MDFCN_DT , C.MDFR + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.MDFR) AS MDFR_NM , C.DEL_DT , C.DLTR , C.DEL_RSN - , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM - , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM - , (SELECT GET_CODE_NM('FIM026', C.CRDN_REG_SE_CD) FROM DUAL) AS CRDN_REG_SE_NM - , (SELECT GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.RGTR) AS RGTR_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.MDFR) AS MDFR_NM , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.DLTR) AS DLTR_NM , CA.CRDN_SE_CD + , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM , CA.TEAM_ID , CA.DTL_CRDN_PLC , CA.CRDN_SPAREA_CD + , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM , CA.CRDN_BGNG_TM , CA.CRDN_END_TM , CA.CRDN_SN , CA.MOSC_X , CA.MOSC_Y , CA.TOWNG_YN + , (SELECT GET_CODE_NM('FIM053', CA.TOWNG_YN) FROM DUAL) AS TOWNG_NM , CA.USE_FUEL_CD + , (SELECT GET_CODE_NM('LVS005', CA.USE_FUEL_CD) FROM DUAL) AS USE_FUEL_NM , CA.FFNLG_CARMDL_CD + , (SELECT GET_CODE_NM('FIM009', CA.FFNLG_CARMDL_CD) FROM DUAL) AS FFNLG_CARMDL_NM , CA.PARKNG_PSBLTY_RSLT_CD - , CA.VLTN_NMTM - , CA.OVTIME_YN - , CA.OVTIME_PRTTN_YN - , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM - , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM - , (SELECT GET_CODE_NM('FIM006', CA.TOWNG_YN) FROM DUAL) AS TOWNG_YN_NM - , (SELECT GET_CODE_NM('LVS005', CA.USE_FUEL_CD) FROM DUAL) AS USE_FUEL_NM - , (SELECT GET_CODE_NM('FIM009', CA.FFNLG_CARMDL_CD) FROM DUAL) AS FFNLG_CARMDL_NM , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM - , (SELECT GET_CODE_NM('FIM006', CA.OVTIME_YN) FROM DUAL) AS OVTIME_YN_NM - , (SELECT GET_CODE_NM('FIM006', CA.OVTIME_PRTTN_YN) FROM DUAL) AS OVTIME_PRTTN_YN_NM + , CA.VLTN_NMTM + , CA.OVTIME_YN + , (SELECT GET_CODE_NM('CMN006', CA.OVTIME_YN) FROM DUAL) AS OVTIME_NM + , CA.OVTIME_PRTTN_YN + , (SELECT GET_CODE_NM('CMN006', CA.OVTIME_PRTTN_YN) FROM DUAL) AS OVTIME_PRTTN_NM , V.TXITM_NM , V.OPER_ITEM_NM , P.RTPYR_ID @@ -143,26 +143,10 @@ , CC.CVLCPT_PRCS_CMPTN_DT , CC.CVLCPT_PRCS_PIC , L.LEVY_ID - , L.INST_CD - , L.DEPT_CD - , L.SPCL_BIZ_CD - , L.FYR - , L.ACNTG_SE_CD - , L.TXITM_CD - , L.LEVY_NO - , L.INSPY_SN - , L.LEVY_PCPTAX - , L.LEVY_ADAMT - , L.INSPY_INT - , L.RCVMT_PCPTAX - , L.RCVMT_ADAMT - , L.RDCAMT_PCPTAX - , L.RDCAMT_ADAMT - , L.SUM_AMT - , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO - , (L.LEVY_PCPTAX + L.LEVY_ADAMT + L.INSPY_INT) AS LEVY_AMT - , (L.RCVMT_PCPTAX + L.RCVMT_ADAMT) AS RCVMT_AMT - , (L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT) AS RDCAMT_AMT + , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO + , (L.LEVY_PCPTAX + L.LEVY_ADAMT) AS LEVY_AMT + , (L.RCVMT_PCPTAX + L.RCVMT_ADAMT) AS RCVMT_AMT + , (L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT) AS RDCAMT_AMT FROM TB_CRDN C INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) INNER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) @@ -174,16 +158,16 @@ /* 단속 첨부 파일갯수 수정 (sprt02Mapper.updateCrdnAtchFileCnt) */ UPDATE TB_CRDN - SET ATCH_FILE_CNT = #{crdn.atchFileCnt} - , MDFCN_DT = #{crdn.lastModified} - , MDFR = #{crdn.modifiedBy} - WHERE CRDN_ID = #{crdn.crdnId} - AND DEL_YN = 'N' + SET ATCH_FILE_CNT= #{crdn.atchFileCnt} + , MDFCN_DT = #{crdn.lastModified} + , MDFR = #{crdn.modifiedBy} + WHERE CRDN_ID = #{crdn.crdnId} + AND DEL_YN = 'N' \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/photo-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/photo-main.jsp index 3a037f83..6f1b7020 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/photo-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/photo-main.jsp @@ -8,7 +8,6 @@ multiple accept="image/*" hidden /> -
등록된 사진
- - + +
- - + +
@@ -219,7 +219,7 @@
- +