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

경력현황 직책 추가. 

교육현황 직책 추가.
교육현황 최종수정일 수정.
master
강석 최 2023-01-28 14:59:33 +09:00
parent 1496759310
commit 6ab6a43f55
4 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java
View File

@ -128,7 +128,10 @@ public class UserInfo extends BaseModel implements UserDetails{
private Integer crc006Sum; private Integer crc006Sum;
@Transient @Transient
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private LocalDateTime lastWrtDt; private LocalDateTime lastCareerWrtDt;
@Transient
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private LocalDateTime lastEduWrtDt;
@Transient @Transient
private List<AccessConfig> accessConfigList; private List<AccessConfig> accessConfigList;

24
src/main/resources/mybatisMapper/UserInfoMapper.xml
View File

@ -123,6 +123,7 @@
police_in_date, police_in_date,
title_in_date, title_in_date,
ofc_in_date, ofc_in_date,
duty_cd,
(select item_value from code_mgt where item_cd = outturn_cd) as outturn_cd, (select item_value from code_mgt where item_cd = outturn_cd) as outturn_cd,
(select item_value from code_mgt where item_cd = job_in_cd) as job_in_cd, (select item_value from code_mgt where item_cd = job_in_cd) as job_in_cd,
wrt_dt, wrt_dt,
@ -132,20 +133,27 @@
b.crc004Sum, b.crc004Sum,
b.crc005Sum, b.crc005Sum,
b.crc006Sum, b.crc006Sum,
b.lastWrtDt b.lastCareerWrtDt,
c.lastEduWrtDt
from user_info a from user_info a
left outer join ( left outer join (
select user_seq, select user_seq,
sum(case when career_cd = 'CRC001' then work_month else 0 end) as crc001Sum, sum(case when career_cd = 'CRC001' then work_month else 0 end) as crc001Sum,
sum(case when career_cd = 'CRC002' then work_month else 0 end) as crc002Sum, sum(case when career_cd = 'CRC002' then work_month else 0 end) as crc002Sum,
sum(case when career_cd = 'CRC003' then work_month else 0 end) as crc003Sum, sum(case when career_cd = 'CRC003' then work_month else 0 end) as crc003Sum,
sum(case when career_cd = 'CRC004' then work_month else 0 end) as crc004Sum, sum(case when career_cd = 'CRC004' then work_month else 0 end) as crc004Sum,
sum(case when career_cd = 'CRC005' then work_month else 0 end) as crc005Sum, sum(case when career_cd = 'CRC005' then work_month else 0 end) as crc005Sum,
sum(case when career_cd = 'CRC006' then work_month else 0 end) as crc006Sum, sum(case when career_cd = 'CRC006' then work_month else 0 end) as crc006Sum,
max(wrt_dt) as lastWrtDt max(wrt_dt) as lastCareerWrtDt
from user_career from user_career
group by user_seq group by user_seq
) b on a.user_seq = b.user_seq ) b on a.user_seq = b.user_seq
left outer join (
select user_seq,
max(wrt_dt) as lastEduWrtDt
from user_edu
group by user_seq
) c on a.user_seq = c.user_seq
<include refid="selectPoliceListWhere"></include> <include refid="selectPoliceListWhere"></include>
order by rownum desc order by rownum desc
<if test='excel != "Y"'> <if test='excel != "Y"'>

8
src/main/resources/templates/police/career/careerMgt.html
View File

@ -102,7 +102,11 @@
<td th:text="${police.rownum}"></td> <td th:text="${police.rownum}"></td>
<td th:text="${police.organNm}"></td> <td th:text="${police.organNm}"></td>
<td th:text="${police.ofcCd}"></td> <td th:text="${police.ofcCd}"></td>
<td></td> <td>
<th:block th:each="code:${session.commonCode.get('DT')}">
<th:block th:if="${code.itemCd eq police.dutyCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td th:text="${police.titleCd}"></td> <td th:text="${police.titleCd}"></td>
<td th:text="${police.userNm}"></td> <td th:text="${police.userNm}"></td>
<td th:text="${police.birthDate}"></td> <td th:text="${police.birthDate}"></td>
@ -157,7 +161,7 @@
</th:block> </th:block>
</th:block> </th:block>
</td> </td>
<td th:text="${#temporals.format(police.lastWrtDt, 'yyyy-MM-dd')}"></td> <td th:text="${#temporals.format(police.lastCareerWrtDt, 'yyyy-MM-dd')}"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

27
src/main/resources/templates/police/education/educationMgt.html
View File

@ -87,27 +87,30 @@
<th>직책</th> <th>직책</th>
<th>계급</th> <th>계급</th>
<th>성명</th> <th>성명</th>
<th>생년월일</th> <th>생년월일</th>
<th>성별</th> <th>성별</th>
<th>최종수정일</th> <th>최종수정일</th>
</tr> </tr>
</thead> </thead>
<tbody class="table-group-divider"> <tbody class="table-group-divider">
<tr class="policeTr" th:each="list:${policeList}"> <tr class="policeTr" th:each="police:${policeList}">
<th:block> <th:block>
<input type="hidden" class="userSeq" th:value="${list.userSeq}"> <input type="hidden" class="userSeq" th:value="${police.userSeq}">
</th:block> </th:block>
<td th:text="${list.rownum}"></td> <td th:text="${police.rownum}"></td>
<td th:text="${list.organNm}"></td> <td th:text="${police.organNm}"></td>
<td th:text="${list.ofcCd}"></td> <td th:text="${police.ofcCd}"></td>
<td></td> <td>
<td th:text="${list.titleCd}"></td> <th:block th:each="code:${session.commonCode.get('DT')}">
<td th:text="${list.userNm}"></td> <th:block th:if="${code.itemCd eq police.dutyCd}" th:text="${code.itemValue}"></th:block>
<td th:text="${list.birthDate}"></td> </th:block>
<td th:text="${list.sex}"></td> </td>
<td th:text="${police.titleCd}"></td>
<td th:text="${police.userNm}"></td>
<td th:text="${police.birthDate}"></td>
<td th:text="${police.sex}"></td>
<td th:text="${#temporals.format(list.lastWrtDt, 'yyyy-MM-dd')}"></td> <td th:text="${#temporals.format(police.lastEduWrtDt, 'yyyy-MM-dd')}"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>