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

fix :외사수사관리 조건수정 94,95,96

master
TaehunPark 2023-01-27 09:53:37 +09:00
parent 6fc5e1f053
commit 661c2dd5da
5 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java
View File

@ -33,7 +33,8 @@ public class IvsgtController {
mav.addObject("accessAuth", accessAuth); mav.addObject("accessAuth", accessAuth);
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
boardInvestigation.setDownOrganCdList(loginUser.getDownOrganCdList());
boardInvestigation.setQueryInfo(); boardInvestigation.setQueryInfo();
mav.addObject("boardInvestigationList", boardInvestigationService.selectBoardInvestigationList(boardInvestigation)); mav.addObject("boardInvestigationList", boardInvestigationService.selectBoardInvestigationList(boardInvestigation));
boardInvestigation.setContentCnt(boardInvestigationService.selectBoardInvestigationListCnt(boardInvestigation)); boardInvestigation.setContentCnt(boardInvestigationService.selectBoardInvestigationListCnt(boardInvestigation));

2
src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java
View File

@ -40,9 +40,7 @@ public class MajorStatusController {
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
mav.addObject("searchParams", majorStatus); mav.addObject("searchParams", majorStatus);
majorStatus.setDownOrganCdList(loginUser.getDownOrganCdList());
majorStatus.setQueryInfo(); majorStatus.setQueryInfo();
mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus)); mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus));
majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus)); majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus));
majorStatus.setPaginationInfo(); majorStatus.setPaginationInfo();

4
src/main/resources/mybatisMapper/BoardInvestigationMapper.xml
View File

@ -6,6 +6,10 @@
<mapper namespace="com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.mapper.BoardInvestigationMapper"> <mapper namespace="com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.mapper.BoardInvestigationMapper">
<sql id="selectBoardInvestigationListWhere"> <sql id="selectBoardInvestigationListWhere">
<where> <where>
and a.wrt_organ in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
<if test='ivsgtType != null and ivsgtType != ""'> <if test='ivsgtType != null and ivsgtType != ""'>
AND ivsgt_type = #{ivsgtType} AND ivsgt_type = #{ivsgtType}
</if> </if>

6
src/main/resources/mybatisMapper/MajorStatusMapper.xml
View File

@ -26,12 +26,6 @@
<if test='endDate != null and endDate != ""'> <if test='endDate != null and endDate != ""'>
and a.wrt_dt &lt;= #{endDate}::date+1 and a.wrt_dt &lt;= #{endDate}::date+1
</if> </if>
and a.wrt_organ in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
</where> </where>
</sql> </sql>

30
src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
View File

@ -67,36 +67,24 @@
<table class="table table-sm table-hover table-bordered"> <table class="table table-sm table-hover table-bordered">
<thead> <thead>
<tr class="table-secondary"> <tr class="table-secondary">
<!-- <th></th>--> <th width="5%">순번</th>
<th>종류</th> <th width="10%">작성일시</th>
<th width="10%">종류</th>
<th>제목</th> <th>제목</th>
<th>관서</th> <th>내용</th>
<th>부서</th> <th width="10%">첨부파일</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="tr" th:each="major:${majorList}"> <tr class="tr" th:each="major, cnt:${majorList}">
<input type="hidden" class="majorKey" th:value="${major.majorKey}"> <input type="hidden" class="majorKey" th:value="${major.majorKey}">
<!-- <td><input type="checkbox" class="trChkBox"></td>--> <td th:text="${cnt.count}"></td>
<td th:text="${#temporals.format(major.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
<th:block th:each="commonCode:${session.commonCode.get('MST')}"> <th:block th:each="commonCode:${session.commonCode.get('MST')}">
<td th:if="${major.majorType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td> <td th:if="${major.majorType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block> </th:block>
<td th:text="|${major.contentStatus eq 'DST001'?'[임시]':''}${major.contentTitle}|"></td> <td th:text="|${major.contentStatus eq 'DST001'?'[임시]':''}${major.contentTitle}|"></td>
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <td th:utext="${major.contentInfo}"></td>
<td th:if="${major.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
<td th:if="${major.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<td th:if="${major.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block>
<td th:text="${major.wrtUserNm}"></td>
<td th:text="${#temporals.format(major.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
<td th:text="${major.fileCnt eq null?'파일 없음':#strings.concat(major.fileCnt,' 건')}"></td> <td th:text="${major.fileCnt eq null?'파일 없음':#strings.concat(major.fileCnt,' 건')}"></td>
</tr> </tr>
</tbody> </tbody>