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 121034c8..105392e4 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 @@ -75,7 +75,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService case "tagInformationUndefinedData" -> { if (isEmpty(query.getOrderBy())) { if (isEmpty(query.getBy())) { - query.setOrderBy("CRDN_ID"); + query.setOrderBy("CRDN_ID DESC"); } else { query.setOrderBy(CmmnUtil.convertCamelCaseToSnakeCase(query.getBy())); } @@ -85,7 +85,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService case "photo" -> { if (isEmpty(query.getOrderBy())) { if (isEmpty(query.getBy())) { - query.setOrderBy("VHRNO, CRDN_PLC, CRDN_ID"); + query.setOrderBy("VHRNO, CRDN_PLC, CRDN_ID DESC"); } else { query.setOrderBy(CmmnUtil.convertCamelCaseToSnakeCase(query.getBy())); } @@ -102,13 +102,13 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService } case "sameVehicleSub" -> crdnListMapper.selectSameVehicleSubList(query.setOrderBy("CRDN_ID")); case "todayInsert" -> { - query.setOrderBy("CRDN_ID"); + query.setOrderBy("CRDN_ID DESC"); yield crdnListMapper.selectTodayCrackdownList(query); } default -> { if (isEmpty(query.getOrderBy())) { if (isEmpty(query.getBy())) { - query.setOrderBy("CRDN_ID"); + query.setOrderBy("CRDN_ID DESC"); } else { query.setOrderBy(CmmnUtil.convertCamelCaseToSnakeCase(query.getBy())); } diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java index b718db88..4aab8aca 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java @@ -168,8 +168,11 @@ public class Levy01Controller extends ApplicationController { @RequestMapping(name="사전 감경부과 정보 조회", value=METHOD_URL.getReductionLevyTargetInfo) public ModelAndView getReductionLevyTargetInfo(HttpServletRequest hReq, LevyQuery req) { // 감경 부과일자 - DataObject info = taskBean.getAdvntceYmdInfo(new CmmnQuery().setSggCd(req.getSggCd()) - .setTaskSeCd(req.getTaskSeCd())); + DataObject info = taskBean.getAdvntceYmdInfo( + new CmmnQuery() + .setSggCd(req.getSggCd()) + .setTaskSeCd(req.getTaskSeCd()) + ); // 이전에 조회되었던 총건수, 금액 info.put("TNOCS", req.getTnocs()); diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-eqpmnt-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-eqpmnt-mapper.xml index 8c4e747d..271e5ea8 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-eqpmnt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-eqpmnt-mapper.xml @@ -181,7 +181,7 @@ UPDATE TB_CRDN_FILE_LAYOUT /* 파일연계 원격지 정보 수정(crdnEqpmntMapper.updateFtpInfo) */ UPDATE TB_EQPMNT_CRDN_FTP SET REMOTE_IP = #{remoteSystemInfo.ip} - , REMOTE_PORT = #{remoteSystemInfo.port} + , REMOTE_PORT = #{remoteSystemInfo.port} , REMOTE_ID = #{remoteSystemInfo.id} , REMOTE_PASSWORD = #{remoteSystemInfo.pw} , REMOTE_OS = #{remoteSystemInfo.osType}