외사장비 사용실적 페이지 조회 오류 수정.
parent
a51e393efb
commit
3cab7c123a
|
|
@ -186,10 +186,10 @@ public class EquipmentController {
|
||||||
|
|
||||||
Calendar c = Calendar.getInstance();
|
Calendar c = Calendar.getInstance();
|
||||||
int currYear = c.get(Calendar.YEAR);
|
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++) {
|
for (int i = lastYear + 1; i <= currYear; i++) {
|
||||||
HashMap<String, Object> map = new HashMap<String, Object>();
|
HashMap<String, Object> map = new HashMap<String, Object>();
|
||||||
map.put("UYEAR", i);
|
map.put("uyear", i);
|
||||||
year.add(map);
|
year.add(map);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -115,11 +115,9 @@
|
||||||
COALESCE(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2}
|
COALESCE(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2}
|
||||||
</foreach>
|
</foreach>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
FROM
|
FROM H3_EQUIP_USE_STATE
|
||||||
H3_EQUIP_USE_STATE
|
WHERE EU_YEAR = (#{criteria.year}||'')
|
||||||
WHERE
|
AND EU_QUATER = (#{criteria.quater}||'')
|
||||||
EU_YEAR = #{criteria.year} AND
|
|
||||||
EU_QUATER = #{criteria.quater}
|
|
||||||
UNION
|
UNION
|
||||||
SELECT
|
SELECT
|
||||||
2 AS CNT, B.CODENM AS GUBUN, B.CODE2 AS CODE,
|
2 AS CNT, B.CODENM AS GUBUN, B.CODE2 AS CODE,
|
||||||
|
|
@ -131,25 +129,18 @@
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
FROM
|
FROM
|
||||||
(
|
(
|
||||||
SELECT
|
SELECT *
|
||||||
*
|
FROM H3_EQUIP_USE_STATE
|
||||||
FROM
|
WHERE EU_YEAR = (#{criteria.year}||'')
|
||||||
H3_EQUIP_USE_STATE
|
AND EU_QUATER = (#{criteria.quater}||'')
|
||||||
WHERE
|
|
||||||
EU_YEAR = #{criteria.year} AND
|
|
||||||
EU_QUATER = #{criteria.quater}
|
|
||||||
) A
|
) A
|
||||||
RIGHT JOIN
|
RIGHT JOIN
|
||||||
(
|
(
|
||||||
SELECT
|
SELECT CODE2, CODENM
|
||||||
CODE2, CODENM
|
FROM TCODE
|
||||||
FROM
|
WHERE CODE1 = 'EQUI'
|
||||||
TCODE
|
AND CODE_USE_YN = 'Y'
|
||||||
WHERE
|
ORDER BY CODE2
|
||||||
CODE1 = 'EQUI' AND
|
|
||||||
CODE_USE_YN = 'Y'
|
|
||||||
ORDER BY
|
|
||||||
CODE2
|
|
||||||
) B
|
) B
|
||||||
ON A.EU_CODE = B.CODE2
|
ON A.EU_CODE = B.CODE2
|
||||||
GROUP BY CODE2, CODENM
|
GROUP BY CODE2, CODENM
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
<li class="form_search margin-left">
|
<li class="form_search margin-left">
|
||||||
<form:select path="year" cssClass="use">
|
<form:select path="year" cssClass="use">
|
||||||
<c:forEach var="item" items="${equipStatusYearList}" varStatus="status">
|
<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>
|
</c:forEach>
|
||||||
</form:select>
|
</form:select>
|
||||||
</li>
|
</li>
|
||||||
|
|
@ -85,60 +85,60 @@
|
||||||
<tr>
|
<tr>
|
||||||
<th align="center"><spring:message code="equip.name" /></th>
|
<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.total" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS00" /></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.ps01" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS02" /></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.ps03" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS04" /></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.ps05" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS06" /></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.ps07" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS08" /></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.ps09" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS10" /></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.ps11" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS12" /></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.ps13" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS14" /></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.ps15" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS16" /></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.ps17" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS18" /></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.ps90" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS91" /></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.ps92" /></th>
|
||||||
<th align="center"><spring:message code="equip.PS93" /></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.ps94" /></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<c:forEach var="equipStatus" items="${equipStatusList}" varStatus="status">
|
<c:forEach var="equipStatus" items="${equipStatusList}" varStatus="status">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center"><c:out value="${equipStatus.GUBUN}" /></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.total}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS00}" /></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.ps01}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS02}" /></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.ps03}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS04}" /></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.ps05}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS06}" /></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.ps07}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS08}" /></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.ps09}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS10}" /></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.ps11}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS12}" /></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.ps13}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS14}" /></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.ps15}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS16}" /></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.ps17}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS18}" /></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.ps90}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS91}" /></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.ps92}" /></td>
|
||||||
<td align="center"><c:out value="${equipStatus.PS93}" /></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.ps94}" /></td>
|
||||||
</tr>
|
</tr>
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
</table>
|
</table>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue