diff --git a/src/main/java/kcg/faics/equip/web/EquipmentController.java b/src/main/java/kcg/faics/equip/web/EquipmentController.java index 948c3bc..6efd1ad 100644 --- a/src/main/java/kcg/faics/equip/web/EquipmentController.java +++ b/src/main/java/kcg/faics/equip/web/EquipmentController.java @@ -186,10 +186,10 @@ public class EquipmentController { Calendar c = Calendar.getInstance(); int currYear = c.get(Calendar.YEAR); - int lastYear = Integer.parseInt((String) year.get(year.size() - 1).get("UYEAR")); + int lastYear = Integer.parseInt((String) year.get(year.size() - 1).get("uyear")); for (int i = lastYear + 1; i <= currYear; i++) { HashMap map = new HashMap(); - map.put("UYEAR", i); + map.put("uyear", i); year.add(map); } diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml index c9d0067..fdda63d 100644 --- a/src/main/resources/sqlmapper/mappers/fa/equip.xml +++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml @@ -115,11 +115,9 @@ COALESCE(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2} - + @@ -85,60 +85,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +