diff --git a/src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java b/src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java index f381a56..d17fe67 100644 --- a/src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java +++ b/src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java @@ -100,7 +100,7 @@ public class ExcelExporter extends AbstractExcelExport { try { if (t instanceof Map) { - Object o = ((Map) t).get(key); + Object o = ((Map) t).get(key.toLowerCase()); if (o instanceof String) { value = o.toString(); } else if (o instanceof Integer || o instanceof Double || o instanceof Long) { 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..a6dc9cd 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} diff --git a/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp b/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp index aa222bd..dd8c431 100644 --- a/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp +++ b/src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp @@ -62,11 +62,11 @@ - - _cnt" value=""> - - _check" value=""> - _state" value=""> + + _cnt" value=""> + + _check" value=""> + _state" value=""> diff --git a/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp b/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp index e131cdf..590a1c1 100644 --- a/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp +++ b/src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp @@ -43,11 +43,11 @@ - - - - - + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/equip/useStateList.jsp b/src/main/webapp/WEB-INF/jsp/equip/useStateList.jsp index 820c4ab..09bf902 100644 --- a/src/main/webapp/WEB-INF/jsp/equip/useStateList.jsp +++ b/src/main/webapp/WEB-INF/jsp/equip/useStateList.jsp @@ -41,7 +41,7 @@ @@ -85,60 +85,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +