From ce1f71f13dcd11d667f3facbc8b644d1d53bd766 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 23 Oct 2023 10:24:43 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90,=EB=8B=A8=EC=86=8D=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EC=8B=9C?= =?UTF-8?q?=EA=B5=B0=EA=B5=AC=EC=BD=94=EB=93=9C=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/crdn/web/Crdn02Controller.java | 15 +++++++++++++++ .../cokr/xit/fims/crdn/web/Crdn03Controller.java | 15 +++++++++++++++ .../cokr/xit/fims/crdn/web/Crdn05Controller.java | 6 ++++++ .../cokr/xit/fims/crdn/web/Crdn06Controller.java | 6 ++++++ .../cokr/xit/fims/cvlc/web/Cvlc01Controller.java | 6 ++++++ .../cokr/xit/fims/cvlc/web/Cvlc02Controller.java | 15 +++++++++++++++ .../cokr/xit/fims/cvlc/web/Cvlc03Controller.java | 15 +++++++++++++++ .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 6 ++++++ .../sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml | 5 ++++- 9 files changed, 88 insertions(+), 1 deletion(-) diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java index 771a7992..0ed104c3 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -8,9 +8,12 @@ import javax.annotation.Resource; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; +import cokr.xit.base.user.ManagedUser; +import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.CrdnInfoMapper; +import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.crdn.service.CrdnStngService; import cokr.xit.foundation.data.DataObject; @@ -41,6 +44,12 @@ public class Crdn02Controller extends ApplicationController { @Resource(name="crdnInfoMapper") private CrdnInfoMapper crdnInfoMapper; + @Resource(name="globalStngMapper") + protected GlobalStngMapper globalStngMapper; + + @Resource(name="userMapper") + protected UserMapper userMapper; + /** 단속 자료 검사 메인화면을 연다. * @return fims/crdn/crdn02010-main */ @@ -72,6 +81,12 @@ public class Crdn02Controller extends ApplicationController { case "sameVehicleSub" -> query.setGridType("sameVehicleSub"); } setFetchSize(query); + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java index 22ed4058..1c7ec78e 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -8,9 +8,12 @@ import javax.annotation.Resource; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; +import cokr.xit.base.user.ManagedUser; +import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; +import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.crdn.service.CrdnStngService; @@ -36,6 +39,12 @@ public class Crdn03Controller extends ApplicationController { @Resource(name="crdnStngService") private CrdnStngService crdnStngService; + @Resource(name="globalStngMapper") + protected GlobalStngMapper globalStngMapper; + + @Resource(name="userMapper") + protected UserMapper userMapper; + /** 표지정보 미확인 자료 메인화면을 연다. * @return fims/crdn/crdn03010-main */ @@ -57,6 +66,12 @@ public class Crdn03Controller extends ApplicationController { public ModelAndView getTagInformationUndefinedDataList(CrdnQuery query) { query.setGridType("tagInformationUndefinedData"); setFetchSize(query); + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index 2307898d..5e3b6726 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -110,6 +110,12 @@ public class Crdn05Controller extends ApplicationController { setFetchSize(query); query.setGridType("todayInsert"); query.setCurrentUserId(currentUser().getId()); + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + return setCollectionInfo(new ModelAndView("jsonView"),crdnService.getCrackdownList(query),""); } 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 8a5541f7..97841612 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -75,6 +75,12 @@ public class Crdn06Controller extends ApplicationController { */ public ModelAndView getCrackdownList(CrdnQuery query) { setFetchSize(query); + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java index c3145e9a..7cac2b47 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -86,6 +86,12 @@ public class Cvlc01Controller extends ApplicationController { public ModelAndView getCivilComplaintReceiptDataList(CrdnQuery query) { query.setGridType("receiptData"); setFetchSize(query); + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query),""); } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index d8c20fbb..cdee86e0 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -9,8 +9,11 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; +import cokr.xit.base.user.ManagedUser; +import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.CrdnQuery; +import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; @@ -41,6 +44,12 @@ public class Cvlc02Controller extends ApplicationController { @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; + @Resource(name="globalStngMapper") + protected GlobalStngMapper globalStngMapper; + + @Resource(name="userMapper") + protected UserMapper userMapper; + /** 민원 답변 대상 자료 메인화면을 연다. * @return fims/cvlc/cvlc02010-main */ @@ -65,6 +74,12 @@ public class Cvlc02Controller extends ApplicationController { public ModelAndView selectCivilComplaintAnswerTargetDataList(CrdnQuery query) { query.setGridType("answerTargetData"); setFetchSize(query); + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getCivilComplaintList(query), ""); } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java index 2d9bb480..159b66a4 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -8,8 +8,11 @@ import javax.annotation.Resource; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; +import cokr.xit.base.user.ManagedUser; +import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.CrdnQuery; +import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; @@ -34,6 +37,12 @@ public class Cvlc03Controller extends ApplicationController { @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; + @Resource(name="globalStngMapper") + protected GlobalStngMapper globalStngMapper; + + @Resource(name="userMapper") + protected UserMapper userMapper; + /** 민원 관리 메인화면을 연다. * @return fims/cvlc/cvlc03010-main */ @@ -55,6 +64,12 @@ public class Cvlc03Controller extends ApplicationController { */ public ModelAndView getCivilComplaintList(CrdnQuery query) { setFetchSize(query); + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + return setCollectionInfo(new ModelAndView("jsonView"),crdnCvlcptService.getCivilComplaintList(query),""); } } 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 19ad620f..510a3d22 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 @@ -91,6 +91,7 @@ LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC. 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) WHERE C.DEL_YN = 'N' + AND C.SGG_CD = #{sggCd} AND C.CRDN_ID = #{crdnId} AND C.TASK_SE_CD = #{taskSeCd} AND C.VHRNO LIKE CONCAT('%', #{vhrno}, '%') @@ -164,6 +165,7 @@ SELECT C.CRDN_ID , C.DEL_DT FROM TB_CRDN C WHERE C.DEL_YN = 'N' + AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = #{taskSeCd} AND C.RGTR = #{currentUserId} AND SUBSTR(C.REG_DT,1,8) = @@ -193,6 +195,7 @@ SELECT C.CRDN_ID FROM TB_CRDN C INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) WHERE C.DEL_YN = 'N' + AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} @@ -266,6 +269,7 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST LEFT OUTER JOIN TB_TEAM_INFO TI ON (CA.TEAM_ID = TI.TEAM_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.TASK_SE_CD = #{taskSeCd} AND C.VHRNO != '' @@ -344,6 +348,7 @@ SELECT C.CRDN_ID LEFT OUTER JOIN TB_TEAM_INFO TI ON (CA.TEAM_ID = TI.TEAM_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.TASK_SE_CD = #{taskSeCd} AND C.CRDN_ID IN (#{CRDN_ID}) @@ -373,6 +378,7 @@ SELECT C.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) WHERE C.DEL_YN = 'N' + AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = 'DPV' AND CA.PARKNG_PSBLTY_RSLT_CD = '0' AND C.CRDN_STTS_CD = '21' diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml index 61814c54..f6bbfbab 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -163,6 +163,7 @@ INNER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCP 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) WHERE C.DEL_YN = 'N' + AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = #{taskSeCd} AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} @@ -238,6 +239,7 @@ SELECT C.CRDN_ID FROM TB_CRDN C INNER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID) WHERE C.DEL_YN = 'N' + AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_STTS_CD = '01' @@ -426,6 +428,7 @@ SELECT C.CRDN_ID INNER 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') WHERE C.DEL_YN = 'N' + AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_STTS_CD IN ('21','81','83') AND C.CRDN_REG_SE_CD = '02' @@ -496,7 +499,7 @@ UPDATE TB_CRDN_CVLCPT SET CVLCPT_PRCS_RSLT_CN = #{cvlcptPrcsRsltCn} , MDFCN_DT = /* 수정일시 */ , MDFR = #{modifiedBy} /* 수정자 */ - WHERE CVLCPT_LINK_ID = #{cvlcptLinkId}; + WHERE CVLCPT_LINK_ID = #{cvlcptLinkId}