출장등록 진행중 -> 화면 등록 완료
리스트 진행
This commit is contained in:
parent
00d1e02538
commit
589a3cf456
@ -75,4 +75,5 @@ public class CommuteVO implements Serializable {
|
|||||||
private String div1;
|
private String div1;
|
||||||
private String div2;
|
private String div2;
|
||||||
private String div3;
|
private String div3;
|
||||||
|
private Boolean pstnIsNumber;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -56,6 +56,12 @@ public class CommuteServiceImpl implements CommuteService {
|
|||||||
// controller에 return
|
// controller에 return
|
||||||
Map<String, Object> map = new HashMap<String, Object>();
|
Map<String, Object> map = new HashMap<String, Object>();
|
||||||
|
|
||||||
|
|
||||||
|
for (CommuteVO row : commuteList) {
|
||||||
|
String pstn = row.getPstn();
|
||||||
|
row.setPstnIsNumber(pstn != null && pstn.trim().matches("\\d+"));
|
||||||
|
}
|
||||||
|
|
||||||
map.put("resultList", commuteList);
|
map.put("resultList", commuteList);
|
||||||
map.put("commuteVO", commuteVO);
|
map.put("commuteVO", commuteVO);
|
||||||
return map;
|
return map;
|
||||||
|
|||||||
@ -114,7 +114,11 @@
|
|||||||
<tr th:each="row, stat : ${list}">
|
<tr th:each="row, stat : ${list}">
|
||||||
<td th:text="${commuteVO.searchYear + '-' + commuteVO.searchMonth + '-' + commuteVO.searchDay}"></td>
|
<td th:text="${commuteVO.searchYear + '-' + commuteVO.searchMonth + '-' + commuteVO.searchDay}"></td>
|
||||||
<td th:text="${row.usrid}"></td>
|
<td th:text="${row.usrid}"></td>
|
||||||
<td th:text="${row.pstn}"></td>
|
|
||||||
|
<td th:if="${row.pstnIsNumber}" th:text="${@TCodeUtils.getCodeName('RANK', row.pstn)}"></td>
|
||||||
|
<td th:unless="${row.pstnIsNumber}" th:text="${row.pstn}"></td>
|
||||||
|
|
||||||
|
|
||||||
<td th:text="${row.firstActivityTime}"></td>
|
<td th:text="${row.firstActivityTime}"></td>
|
||||||
<td th:text="${@TCodeUtils.getCodeName('COMMUTE', row.firstActivityTimeMemo)}"></td>
|
<td th:text="${@TCodeUtils.getCodeName('COMMUTE', row.firstActivityTimeMemo)}"></td>
|
||||||
<!-- <td th:text="${row.firstActivityTimeMemo}"></td>-->
|
<!-- <td th:text="${row.firstActivityTimeMemo}"></td>-->
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user