페이징 정렬 수정

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"));

src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java

@@ -88,7 +88,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 		List<DataObject> dataObjectList = new ArrayList<DataObject>();
         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"));

src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml

@@ -128,7 +128,7 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%')
 	</if>
 </if>
 
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>
 
@@ -155,7 +155,7 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
    AND C.TASK_SE_CD = #{taskSeCd}
    AND C.RGTR = #{currentUserId}
    AND SUBSTR(C.REG_DT,1,8) = <include refid="utility.today" />
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>
 
@@ -229,7 +229,7 @@ AND C.CRDN_STTS_CD = #{crdnSttsCd}
 		<if test="schDateTo != null">AND SUBSTR(C.MDFCN_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
 	</if>
 </if>
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>
 
@@ -306,7 +306,7 @@ HAVING COUNT(*) <![CDATA[ >= ]]>
 </choose>
 <if test="schCrdnCntTo != null"> AND COUNT(*) <![CDATA[ <= ]]> #{schCrdnCntTo} </if>
 
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>
 
@@ -330,7 +330,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
  WHERE C.DEL_YN = 'N'
    AND C.TASK_SE_CD = #{taskSeCd}
    AND C.CRDN_ID IN (<foreach collection="crdnIDs" item="CRDN_ID" separator=",">#{CRDN_ID}</foreach>)
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 </select>
 
 <select id="selectTagInformationUndefinedDataList" parameterType="map" resultType="dataobject">
@@ -382,7 +382,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 	<if test="schCrdnYmdFrom != null">AND C.CRDN_YMD <![CDATA[ >= ]]> #{schCrdnYmdFrom} </if>
 	<if test="schCrdnYmdTo != null">AND C.CRDN_YMD <![CDATA[ <= ]]> #{schCrdnYmdTo} </if>
 </if>
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>
 
@@ -433,7 +433,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 	<if test="schRductYmdFrom != null">AND SUBSTR(RD.REG_DT,1,8) <![CDATA[ >= ]]> #{schRductYmdFrom} </if>
 	<if test="schRductYmdTo != null">AND SUBSTR(RD.REG_DT,1,8) <![CDATA[ <= ]]> #{schRductYmdTo} </if>
 </if>
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>
 

src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml

@@ -166,7 +166,7 @@ WHERE C.DEL_YN = 'N'
 <if test="by != null and by != '' and term != null">
 
 </if>
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>
 
@@ -223,7 +223,7 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT(
 <if test="cvlcptPrcsPicNm != null">
    AND CC.CVLCPT_PRCS_PIC_NM = #{cvlcptPrcsPicNm}
 </if>
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>
 
@@ -600,7 +600,7 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT(
 	<if test="schCvlcptRcptYmdTo != null">AND CC.CVLCPT_RCPT_YMD <![CDATA[ <= ]]> #{schCvlcptRcptYmdTo} </if>
 </if>
 <if test="cvlcptPrcsCd != null">AND CC.CVLCPT_PRCS_CD = #{cvlcptPrcsCd}</if>
-<include refid="utility.orderBy" />
+<include refid="utility.sortBy" />
 <include refid="utility.paging-suffix"/>
 </select>