From a51e393efbd48f957fbfe65819eaeb0d54ec3d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 18 Apr 2022 17:20:52 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From 3cab7c123a8696be8216f1a8d7d959505869e54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 18 Apr 2022 17:34:15 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=8B=A4=EC=A0=81=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faics/equip/web/EquipmentController.java | 4 +- .../resources/sqlmapper/mappers/fa/equip.xml | 33 +++--- .../webapp/WEB-INF/jsp/equip/useStateList.jsp | 102 +++++++++--------- 3 files changed, 65 insertions(+), 74 deletions(-) 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + From f5f757a94cb97e0005730e4c3ee3b5b0b8316163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 18 Apr 2022 18:01:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20>=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=8B=A4=EC=A0=81=20>=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=8B=A4=EC=A0=81=20=EC=B6=94=EA=B0=80=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sqlmapper/mappers/fa/equip.xml | 45 +++++++------------ .../webapp/WEB-INF/jsp/equip/useStateAdd.jsp | 10 ++--- .../WEB-INF/jsp/equip/useStateApprove.jsp | 10 ++--- 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/src/main/resources/sqlmapper/mappers/fa/equip.xml b/src/main/resources/sqlmapper/mappers/fa/equip.xml index fdda63d..a6dc9cd 100644 --- a/src/main/resources/sqlmapper/mappers/fa/equip.xml +++ b/src/main/resources/sqlmapper/mappers/fa/equip.xml @@ -181,43 +181,32 @@ B.CODENM, B.CODE2, A.* FROM ( - SELECT - * - FROM - H3_EQUIP_USE_STATE - WHERE - EU_YEAR = #{year} AND - EU_QUATER = #{quater} AND - EU_POLICE = #{police} + SELECT * + FROM H3_EQUIP_USE_STATE + WHERE EU_YEAR = (#{year}||'') + AND EU_QUATER = (#{quater}||'') + AND EU_POLICE = #{police} ) A RIGHT JOIN ( - SELECT - CODE2, CODENM - FROM - TCODE - WHERE - CODE1 = 'EQUI' AND - CODE_USE_YN = 'Y' - ORDER BY - CODE2 + SELECT CODE2, CODENM + FROM TCODE + WHERE CODE1 = 'EQUI' + AND CODE_USE_YN = 'Y' + ORDER BY CODE2 ) B ON A.EU_CODE = B.CODE2 - ORDER BY - B.CODE2 + ORDER BY B.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 @@ - - - - - + + + + +