diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java index cfec457f..f4791658 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java @@ -81,10 +81,15 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService dataObjectList = crdnListMapper.selectFineReductionDataList(query.setOrderBy("CRDN_ID")); break; case "photo": - dataObjectList = crdnListMapper.selectPhotoInspectionDataList(query.setOrderBy("VHRNO, CRDN_PLC")); + dataObjectList = crdnListMapper.selectPhotoInspectionDataList(query.setOrderBy("VHRNO, CRDN_PLC, CRDN_ID")); break; case "sameVehicleMain": - dataObjectList = crdnListMapper.selectSameVehicleMainList(query.setOrderBy("VHRNO")); + if(ifEmpty(query.getSchOnlySamePlace(),() -> "").equals("on")) { + query.setOrderBy("VHRNO, CRDN_STDG_NM"); + } else { + query.setOrderBy("VHRNO"); + } + dataObjectList = crdnListMapper.selectSameVehicleMainList(query); break; case "sameVehicleSub": dataObjectList = crdnListMapper.selectSameVehicleSubList(query.setOrderBy("CRDN_ID")); diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index d8070fdc..c7d03ca4 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -88,7 +88,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv List dataObjectList = new ArrayList(); switch (ifEmpty(query.getGridType(), () -> "")) { case "receiptData": - dataObjectList = crdnCvlcptMapper.selectCivilComplaintReceiptDataList(query.setOrderBy("CVLCPT_RCPT_YMD")); + dataObjectList = crdnCvlcptMapper.selectCivilComplaintReceiptDataList(query.setOrderBy("CVLCPT_RCPT_YMD, CRDN_ID")); break; case "answerTargetData": dataObjectList = crdnCvlcptMapper.selectCivilComplaintAnswerTargetDataList(query.setOrderBy("CRDN_ID")); 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 0a56f337..7157025e 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 @@ -128,7 +128,7 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%') - + @@ -155,7 +155,7 @@ SELECT C.CRDN_ID AND C.TASK_SE_CD = #{taskSeCd} AND C.RGTR = #{currentUserId} AND SUBSTR(C.REG_DT,1,8) = - + @@ -229,7 +229,7 @@ AND C.CRDN_STTS_CD = #{crdnSttsCd} AND SUBSTR(C.MDFCN_DT,1,8) #{schDateTo} - + @@ -306,7 +306,7 @@ HAVING COUNT(*) = ]]> AND COUNT(*) #{schCrdnCntTo} - + @@ -330,7 +330,7 @@ SELECT C.CRDN_ID WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_ID IN (#{CRDN_ID}) - + @@ -433,7 +433,7 @@ SELECT C.CRDN_ID AND SUBSTR(RD.REG_DT,1,8) = ]]> #{schRductYmdFrom} AND SUBSTR(RD.REG_DT,1,8) #{schRductYmdTo} - + 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 c145d930..ebece930 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -166,7 +166,7 @@ WHERE C.DEL_YN = 'N' - + @@ -223,7 +223,7 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT( AND CC.CVLCPT_PRCS_PIC_NM = #{cvlcptPrcsPicNm} - + @@ -600,7 +600,7 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT( AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} AND CC.CVLCPT_PRCS_CD = #{cvlcptPrcsCd} - +