From 0e59b60b2aa731160fbf0ff97905c7a4f643429d Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 14 Nov 2023 11:07:53 +0900 Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stat/service/bean/StatServiceBean.java | 21 +++++ .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 19 +++- .../WEB-INF/jsp/fims/stat/stat01010-main.jsp | 94 +++++++++++++++++-- .../WEB-INF/jsp/fims/stat/stat02010-main.jsp | 4 +- .../WEB-INF/jsp/fims/stat/stat02020-info.jsp | 45 +++++++++ .../WEB-INF/jsp/fims/stat/stat03010-main.jsp | 4 +- .../WEB-INF/jsp/fims/stat/stat03020-info.jsp | 31 ++++++ .../WEB-INF/jsp/fims/stat/stat04010-main.jsp | 4 +- .../WEB-INF/jsp/fims/stat/stat04020-info.jsp | 31 ++++++ .../WEB-INF/jsp/fims/stat/stat05010-main.jsp | 4 +- .../WEB-INF/jsp/fims/stat/stat05020-info.jsp | 30 ++++++ .../resources/js/fims/stat/sprtPreset.js | 2 + 12 files changed, 272 insertions(+), 17 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/fims/stat/stat02020-info.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/fims/stat/stat03020-info.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/fims/stat/stat04020-info.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/fims/stat/stat05020-info.jsp create mode 100644 src/main/webapp/resources/js/fims/stat/sprtPreset.js diff --git a/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java b/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java index 32142749..fb1d3092 100644 --- a/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java +++ b/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java @@ -3,6 +3,7 @@ package cokr.xit.fims.stat.service.bean; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -144,8 +145,10 @@ public class StatServiceBean extends AbstractServiceBean implements StatService throw new RuntimeException("통계 유형 확인 오류"); } + String domainKey = ""; // if(domain.equals("crdn")) { + domainKey = "CRDN_ID"; CrdnQuery crdnQuery = new CrdnQuery(); crdnQuery.setSggCd(statQuery.getSggCd()); @@ -159,6 +162,7 @@ public class StatServiceBean extends AbstractServiceBean implements StatService } else if(domain.equals("crdnSttsHstry")) { + domainKey = "CRDN_ID"; CrdnSttsHstryQuery crdnSttsHstryQuery = new CrdnSttsHstryQuery(); crdnSttsHstryQuery.setSggCd(statQuery.getSggCd()); @@ -174,6 +178,7 @@ public class StatServiceBean extends AbstractServiceBean implements StatService } else if(domain.equals("sndb")) { + SndbQuery sndbQuery = new SndbQuery(); sndbQuery.setSggCd(statQuery.getSggCd()); sndbQuery.setTaskSeCd(statQuery.getTaskSeCd()); @@ -185,6 +190,7 @@ public class StatServiceBean extends AbstractServiceBean implements StatService } else if(domain.equals("excl")) { + LevyExclQuery levyExclQuery = new LevyExclQuery(); levyExclQuery.setSggCd(statQuery.getSggCd()); levyExclQuery.setTaskSeCd(statQuery.getTaskSeCd()); @@ -198,9 +204,24 @@ public class StatServiceBean extends AbstractServiceBean implements StatService } else if(domain.equals("levy")) { + domainKey = "LEVY_ID"; + } + + else if(domain.equals("sprt")) { + domainKey = "CRDN_ID"; } + if(!domainKey.equals("")) { + Iterator iterator = queryResult.iterator(); + while(iterator.hasNext()) { + DataObject dataObject = iterator.next(); + String dataId = dataObject.string(domainKey); + dataObject.set("DATA_ID", dataId); + } + } + + //차량구분 지정 if(!ifEmpty(statQuery.getCarGb(), ()->"").equals("")) { queryResult.removeIf(item -> !(crdnStngBean.getCarGb(item.string("VHRNO")).equals(statQuery.getCarGb()))); diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index 510a3d22..2b612000 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -8,6 +8,7 @@ SELECT C.CRDN_ID , C.SGG_CD + , (SELECT SGG_NM FROM TB_SGG_INFO WHERE SGG_CD = C.SGG_CD) AS SGG_NM , C.TASK_SE_CD , C.CRDN_REG_SE_CD , C.CRDN_INPT_SE_CD @@ -18,10 +19,12 @@ SELECT C.CRDN_ID , C.CRDN_TM , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM , C.VHRNO + , L.RPM_SZR_VHRNO , C.CRDN_STDG_NM , C.CRDN_ROAD_NM , C.CRDN_PLC , C.VLTN_ID + , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL , C.GPS_X , C.GPS_Y , C.ATCH_FILE_CNT @@ -36,7 +39,9 @@ SELECT C.CRDN_ID , C.ADVNTCE_AMT , C.OPNN_SBMSN_YN , L.LEVY_ID + , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO , C.CRDN_STTS_CD + , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM , C.CRDN_STTS_CHG_DT , C.ADTN_AMT , C.MINUS_AMT @@ -45,7 +50,9 @@ SELECT C.CRDN_ID , CA.CRDN_SE_CD , CA.DTL_CRDN_PLC , CA.TEAM_ID + , TI.TEAM_NM , 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 @@ -77,6 +84,7 @@ SELECT C.CRDN_ID , LE.LEVY_EXCL_RSN_CD , LE.LEVY_EXCL_YMD , LE.ETC_CN AS LEVY_EXCL_ETC_CN + , P.RTPYR_NM , C.DEL_YN , C.RGTR , C.REG_DT @@ -85,11 +93,12 @@ SELECT C.CRDN_ID , C.DLTR , C.DEL_DT FROM TB_CRDN C -INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) -LEFT OUTER JOIN TB_TEAM_INFO TI ON (CA.TEAM_ID = TI.TEAM_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_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N') -LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID) +INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) +LEFT OUTER JOIN TB_TEAM_INFO TI ON (CA.TEAM_ID = TI.TEAM_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_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N') +LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID) +LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) WHERE C.DEL_YN = 'N' AND C.SGG_CD = #{sggCd} AND C.CRDN_ID = #{crdnId} diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp index 309069cb..82a6be77 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp @@ -5,7 +5,7 @@
-
+
@@ -119,11 +119,11 @@ - +