DBNT
/
FAICS
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.157:3000/DBNT/FAICS

master
Hyung Geun 2022-04-20 09:05:36 +09:00
parent 970df1cd47 f5f757a94c
commit bac8ab8220
6 changed files with 93 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcg/faics/cmmn/excel/ExcelExporter.java
View File

@ -100,7 +100,7 @@ public class ExcelExporter<T> 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) {

4
src/main/java/kcg/faics/equip/web/EquipmentController.java
View File

@ -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<String, Object> map = new HashMap<String, Object>();
map.put("UYEAR", i);
map.put("uyear", i);
year.add(map);
}

78
src/main/resources/sqlmapper/mappers/fa/equip.xml
View File

@ -115,11 +115,9 @@
COALESCE(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2}
</foreach>
<![CDATA[
FROM
H3_EQUIP_USE_STATE
WHERE
EU_YEAR = #{criteria.year} AND
EU_QUATER = #{criteria.quater}
FROM H3_EQUIP_USE_STATE
WHERE EU_YEAR = (#{criteria.year}||'')
AND EU_QUATER = (#{criteria.quater}||'')
UNION
SELECT
2 AS CNT, B.CODENM AS GUBUN, B.CODE2 AS CODE,
@ -131,25 +129,18 @@
<![CDATA[
FROM
(
SELECT
*
FROM
H3_EQUIP_USE_STATE
WHERE
EU_YEAR = #{criteria.year} AND
EU_QUATER = #{criteria.quater}
SELECT *
FROM H3_EQUIP_USE_STATE
WHERE EU_YEAR = (#{criteria.year}||'')
AND EU_QUATER = (#{criteria.quater}||'')
) 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
GROUP BY CODE2, CODENM
@ -190,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
]]>
</select>
<select id="Equip.getEquipUseStateInfoByCode" parameterType="hashmap" resultType="hashmap">
SELECT
*
FROM
H3_EQUIP_USE_STATE
WHERE
EU_YEAR = #{year} AND
EU_QUATER = #{quater} AND
EU_POLICE = #{police} AND
EU_CODE = #{code}
SELECT *
FROM H3_EQUIP_USE_STATE
WHERE EU_YEAR = (#{year}||'')
AND EU_QUATER = (#{quater}||'')
AND EU_POLICE = #{police}
AND EU_CODE = #{code}
</select>
<insert id="Equip.insertEquipUseState" parameterType="hashmap">

10
src/main/webapp/WEB-INF/jsp/equip/useStateAdd.jsp
View File

@ -62,11 +62,11 @@
<tbody>
<c:forEach var="equip" items="${equipList}" varStatus="status">
<tr>
<td class="title text" ><c:out value="${equip.CODENM}" /></td>
<td class="number"><input type="text" name="<c:out value="${equip.CODE2}" />_cnt" value="<c:out value="${equip.EU_CNT}" />"></td>
<td class="text"><textarea rows="" cols="" name="<c:out value="${equip.CODE2}" />_detail"><c:out value="${equip.EU_DETAIL}" /></textarea></td>
<td class="number"><input type="text" name="<c:out value="${equip.CODE2}" />_check" value="<c:out value="${equip.EU_CHECK}" />"></td>
<td class="data"><input type="text" name="<c:out value="${equip.CODE2}" />_state" value="<c:out value="${equip.EU_STATE}" />"></td>
<td class="title text" ><c:out value="${equip.codenm}" /></td>
<td class="number"><input type="text" name="<c:out value="${equip.code2}" />_cnt" value="<c:out value="${equip.eu_cnt}" />"></td>
<td class="text"><textarea rows="" cols="" name="<c:out value="${equip.code2}" />_detail"><c:out value="${equip.eu_detail}" /></textarea></td>
<td class="number"><input type="text" name="<c:out value="${equip.code2}" />_check" value="<c:out value="${equip.eu_check}" />"></td>
<td class="data"><input type="text" name="<c:out value="${equip.code2}" />_state" value="<c:out value="${equip.eu_state}" />"></td>
</tr>
</c:forEach>
</tbody>

10
src/main/webapp/WEB-INF/jsp/equip/useStateApprove.jsp
View File

@ -43,11 +43,11 @@
<c:when test="${fn:length(useStateList) > 0}">
<c:forEach var="result" items="${useStateList}" varStatus="status">
<tr>
<td align="center"><c:out value="${result.CODENM}" /></td>
<td align="center"><c:out value="${result.EU_CNT}" /></td>
<td align="center"><c:out value="${empty fn:trim(result.EU_DETAIL) ? '해당사항 없음.' : result.EU_DETAIL}" /></td>
<td align="center"><c:out value="${result.EU_CHECK}" /></td>
<td align="center"><c:out value="${empty fn:trim(result.EU_STATE) ? '-' : result.EU_STATE}" /></td>
<td align="center"><c:out value="${result.codenm}" /></td>
<td align="center"><c:out value="${result.eu_cnt}" /></td>
<td align="center"><c:out value="${empty fn:trim(result.eu_detail) ? '해당사항 없음.' : result.eu_detail}" /></td>
<td align="center"><c:out value="${result.eu_check}" /></td>
<td align="center"><c:out value="${empty fn:trim(result.eu_state) ? '-' : result.eu_state}" /></td>
</tr>
</c:forEach>
</c:when>

102
src/main/webapp/WEB-INF/jsp/equip/useStateList.jsp
View File

@ -41,7 +41,7 @@
<li class="form_search margin-left">
<form:select path="year" cssClass="use">
<c:forEach var="item" items="${equipStatusYearList}" varStatus="status">
<form:option value="${item.UYEAR}" label="${item.UYEAR}년"/>
<form:option value="${item.uyear}" label="${item.uyear}년"/>
</c:forEach>
</form:select>
</li>
@ -85,60 +85,60 @@
<tr>
<th align="center"><spring:message code="equip.name" /></th>
<th align="center"><spring:message code="equip.total" /></th>
<th align="center"><spring:message code="equip.PS00" /></th>
<th align="center"><spring:message code="equip.PS01" /></th>
<th align="center"><spring:message code="equip.PS02" /></th>
<th align="center"><spring:message code="equip.PS03" /></th>
<th align="center"><spring:message code="equip.PS04" /></th>
<th align="center"><spring:message code="equip.PS05" /></th>
<th align="center"><spring:message code="equip.PS06" /></th>
<th align="center"><spring:message code="equip.PS07" /></th>
<th align="center"><spring:message code="equip.PS08" /></th>
<th align="center"><spring:message code="equip.PS09" /></th>
<th align="center"><spring:message code="equip.PS10" /></th>
<th align="center"><spring:message code="equip.PS11" /></th>
<th align="center"><spring:message code="equip.PS12" /></th>
<th align="center"><spring:message code="equip.PS13" /></th>
<th align="center"><spring:message code="equip.PS14" /></th>
<th align="center"><spring:message code="equip.PS15" /></th>
<th align="center"><spring:message code="equip.PS16" /></th>
<th align="center"><spring:message code="equip.PS17" /></th>
<th align="center"><spring:message code="equip.PS18" /></th>
<th align="center"><spring:message code="equip.PS90" /></th>
<th align="center"><spring:message code="equip.PS91" /></th>
<th align="center"><spring:message code="equip.PS92" /></th>
<th align="center"><spring:message code="equip.PS93" /></th>
<th align="center"><spring:message code="equip.PS94" /></th>
<th align="center"><spring:message code="equip.ps00" /></th>
<th align="center"><spring:message code="equip.ps01" /></th>
<th align="center"><spring:message code="equip.ps02" /></th>
<th align="center"><spring:message code="equip.ps03" /></th>
<th align="center"><spring:message code="equip.ps04" /></th>
<th align="center"><spring:message code="equip.ps05" /></th>
<th align="center"><spring:message code="equip.ps06" /></th>
<th align="center"><spring:message code="equip.ps07" /></th>
<th align="center"><spring:message code="equip.ps08" /></th>
<th align="center"><spring:message code="equip.ps09" /></th>
<th align="center"><spring:message code="equip.ps10" /></th>
<th align="center"><spring:message code="equip.ps11" /></th>
<th align="center"><spring:message code="equip.ps12" /></th>
<th align="center"><spring:message code="equip.ps13" /></th>
<th align="center"><spring:message code="equip.ps14" /></th>
<th align="center"><spring:message code="equip.ps15" /></th>
<th align="center"><spring:message code="equip.ps16" /></th>
<th align="center"><spring:message code="equip.ps17" /></th>
<th align="center"><spring:message code="equip.ps18" /></th>
<th align="center"><spring:message code="equip.ps90" /></th>
<th align="center"><spring:message code="equip.ps91" /></th>
<th align="center"><spring:message code="equip.ps92" /></th>
<th align="center"><spring:message code="equip.ps93" /></th>
<th align="center"><spring:message code="equip.ps94" /></th>
</tr>
</thead>
<c:forEach var="equipStatus" items="${equipStatusList}" varStatus="status">
<tr>
<td align="center"><c:out value="${equipStatus.GUBUN}" /></td>
<td align="center"><c:out value="${equipStatus.TOTAL}" /></td>
<td align="center"><c:out value="${equipStatus.PS00}" /></td>
<td align="center"><c:out value="${equipStatus.PS01}" /></td>
<td align="center"><c:out value="${equipStatus.PS02}" /></td>
<td align="center"><c:out value="${equipStatus.PS03}" /></td>
<td align="center"><c:out value="${equipStatus.PS04}" /></td>
<td align="center"><c:out value="${equipStatus.PS05}" /></td>
<td align="center"><c:out value="${equipStatus.PS06}" /></td>
<td align="center"><c:out value="${equipStatus.PS07}" /></td>
<td align="center"><c:out value="${equipStatus.PS08}" /></td>
<td align="center"><c:out value="${equipStatus.PS09}" /></td>
<td align="center"><c:out value="${equipStatus.PS10}" /></td>
<td align="center"><c:out value="${equipStatus.PS11}" /></td>
<td align="center"><c:out value="${equipStatus.PS12}" /></td>
<td align="center"><c:out value="${equipStatus.PS13}" /></td>
<td align="center"><c:out value="${equipStatus.PS14}" /></td>
<td align="center"><c:out value="${equipStatus.PS15}" /></td>
<td align="center"><c:out value="${equipStatus.PS16}" /></td>
<td align="center"><c:out value="${equipStatus.PS17}" /></td>
<td align="center"><c:out value="${equipStatus.PS18}" /></td>
<td align="center"><c:out value="${equipStatus.PS90}" /></td>
<td align="center"><c:out value="${equipStatus.PS91}" /></td>
<td align="center"><c:out value="${equipStatus.PS92}" /></td>
<td align="center"><c:out value="${equipStatus.PS93}" /></td>
<td align="center"><c:out value="${equipStatus.PS94}" /></td>
<td align="center"><c:out value="${equipStatus.gubun}" /></td>
<td align="center"><c:out value="${equipStatus.total}" /></td>
<td align="center"><c:out value="${equipStatus.ps00}" /></td>
<td align="center"><c:out value="${equipStatus.ps01}" /></td>
<td align="center"><c:out value="${equipStatus.ps02}" /></td>
<td align="center"><c:out value="${equipStatus.ps03}" /></td>
<td align="center"><c:out value="${equipStatus.ps04}" /></td>
<td align="center"><c:out value="${equipStatus.ps05}" /></td>
<td align="center"><c:out value="${equipStatus.ps06}" /></td>
<td align="center"><c:out value="${equipStatus.ps07}" /></td>
<td align="center"><c:out value="${equipStatus.ps08}" /></td>
<td align="center"><c:out value="${equipStatus.ps09}" /></td>
<td align="center"><c:out value="${equipStatus.ps10}" /></td>
<td align="center"><c:out value="${equipStatus.ps11}" /></td>
<td align="center"><c:out value="${equipStatus.ps12}" /></td>
<td align="center"><c:out value="${equipStatus.ps13}" /></td>
<td align="center"><c:out value="${equipStatus.ps14}" /></td>
<td align="center"><c:out value="${equipStatus.ps15}" /></td>
<td align="center"><c:out value="${equipStatus.ps16}" /></td>
<td align="center"><c:out value="${equipStatus.ps17}" /></td>
<td align="center"><c:out value="${equipStatus.ps18}" /></td>
<td align="center"><c:out value="${equipStatus.ps90}" /></td>
<td align="center"><c:out value="${equipStatus.ps91}" /></td>
<td align="center"><c:out value="${equipStatus.ps92}" /></td>
<td align="center"><c:out value="${equipStatus.ps93}" /></td>
<td align="center"><c:out value="${equipStatus.ps94}" /></td>
</tr>
</c:forEach>
</table>