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

단속현황 검색조건 수정 

방역조사실, 영상녹화장비 관서선택 오류 수정.
권한설정 페이지 계급 표현 오류 수정.
master
강석 최 2023-03-10 12:43:25 +09:00
parent c003fef7a6
commit f74ded8425
6 changed files with 655 additions and 653 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/mybatisMapper/EquipMapper.xml
View File

@ -487,8 +487,7 @@
<select id="selectOrganList" resultType="com.dbnt.faisp.util.ParamMap" parameterType="UseList"> <select id="selectOrganList" resultType="com.dbnt.faisp.util.ParamMap" parameterType="UseList">
select item_cd, select item_cd,
item_value item_value
from code_mgt cm, from code_mgt cm, organ_config oc
organ_config oc
where cm.item_cd = oc.organ_cd where cm.item_cd = oc.organ_cd
and oc.organ_type = 'OGC003' and oc.organ_type = 'OGC003'
and cm.use_chk = 'T' and cm.use_chk = 'T'

14
src/main/resources/templates/adminPage/authMgt/authMgt.html
View File

@ -83,16 +83,20 @@
<input type="hidden" class="userSeq" th:value="${userInfo.userSeq}"> <input type="hidden" class="userSeq" th:value="${userInfo.userSeq}">
<input type="hidden" class="userNm" th:value="${userInfo.userNm}"> <input type="hidden" class="userNm" th:value="${userInfo.userNm}">
<td> <td>
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${commonCode.itemCd eq userInfo.ogCd}" th:text="${commonCode.itemValue}"></th:block> <th:block th:if="${code.itemCd eq userInfo.ogCd}" th:text="${code.itemValue}"></th:block>
</th:block> </th:block>
</td> </td>
<td> <td>
<th:block th:each="commonCode:${session.commonCode.get(userInfo.ogCd)}"> <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
<th:block th:if="${commonCode.itemCd eq userInfo.ofcCd}" th:text="${commonCode.itemValue}"></th:block> <th:block th:if="${code.itemCd eq userInfo.ofcCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td>
<th:block th:each="code:${session.commonCode.get('JT')}">
<th:block th:if="${code.itemCd eq userInfo.titleCd}" th:text="${code.itemValue}"></th:block>
</th:block> </th:block>
</td> </td>
<td></td>
<td th:text="${userInfo.userNm}"></td> <td th:text="${userInfo.userNm}"></td>
<td th:text="${userInfo.userId}"></td> <td th:text="${userInfo.userId}"></td>
<td th:text="${#temporals.format(userInfo.wrtDt, 'yyyy-MM-dd HH:mm:ss')}"></td> <td th:text="${#temporals.format(userInfo.wrtDt, 'yyyy-MM-dd HH:mm:ss')}"></td>

3
src/main/resources/templates/equip/useEditModal.html
View File

@ -13,8 +13,7 @@
<div class="row mb-1"> <div class="row mb-1">
<label for="mgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">관서</label> <label for="mgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">관서</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}"> <select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan">
<option value="">선택</option>
<th:block th:each="organList:${organList}"> <th:block th:each="organList:${organList}">
<option th:value="${organList.item_cd}" th:text="${organList.item_value}" th:selected="${organList.item_cd eq userOrgan}"></option> <option th:value="${organList.item_cd}" th:text="${organList.item_value}" th:selected="${organList.item_cd eq userOrgan}"></option>
</th:block> </th:block>

12
src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
View File

@ -88,9 +88,9 @@
<div class="col-2"> <div class="col-2">
<select class="form-select form-select-sm" name="caseAgency"> <select class="form-select form-select-sm" name="caseAgency">
<option value="">사건담당경찰서</option> <option value="">사건담당경찰서</option>
<th:block th:each="commonCode:${session.commonCode.get('ATA')}"> <th:block th:each="code:${session.commonCode.get('OG')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"
th:selected="${commonCode.itemCd eq searchParams.caseAgency}"></option> th:selected="${code.itemCd eq searchParams.caseAgency}"></option>
</th:block> </th:block>
</select> </select>
</div> </div>
@ -99,9 +99,9 @@
<div class="col-2"> <div class="col-2">
<select class="form-select form-select-sm" name="crackdownPolice" id="searchFormPolice"> <select class="form-select form-select-sm" name="crackdownPolice" id="searchFormPolice">
<option value="">단속경찰서</option> <option value="">단속경찰서</option>
<th:block th:each="commonCode:${session.commonCode.get('CPO')}"> <th:block th:each="code:${session.commonCode.get('CPO')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" <option th:value="${code.itemCd}" th:text="${code.itemValue}"
th:selected="${commonCode.itemCd eq searchParams.crackdownPolice}"></option> th:selected="${code.itemCd eq searchParams.crackdownPolice}"></option>
</th:block> </th:block>
</select> </select>
</div> </div>

3
src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html
View File

@ -56,7 +56,8 @@
<select class="form-select form-select-sm" name="caseAgency"> <select class="form-select form-select-sm" name="caseAgency">
<option value="">사건담당경찰서</option> <option value="">사건담당경찰서</option>
<th:block th:each="code:${session.commonCode.get('OG')}"> <th:block th:each="code:${session.commonCode.get('OG')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.caseAgency}"></option> <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"
th:selected="${code.itemCd eq searchParams.caseAgency}"></option>
</th:block> </th:block>
</select> </select>
</div> </div>

7
src/main/resources/templates/faStatistics/processResult/processResult.html
View File

@ -45,11 +45,10 @@
<div class="col-2"> <div class="col-2">
<select class="form-select form-select-sm" name="crackdownPolice" id="crackdownPolice"> <select class="form-select form-select-sm" name="crackdownPolice" id="crackdownPolice">
<option value="">사건담당경찰서</option> <option value="">사건담당경찰서</option>
<th:block th:each="commonCode:${session.commonCode.get('CPO')}"> <th:block th:each="code:${session.commonCode.get('OG')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"
th:selected="${searchParams.crackdownPolice eq commonCode.itemCd}"></option> th:selected="${searchParams.crackdownPolice eq code.itemCd}"></option>
</th:block> </th:block>
<option value="etc" th:selected="${searchParams.crackdownPolice ne '' && searchParams.crackdownPolice ne null && !#strings.contains(searchParams.crackdownPolice, 'CPO')}">직접입력</option>
</select> </select>
</div> </div>
<div class="col-2"> <div class="col-2">