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

견문평가 수정 기능 작업중.

master
강석 최 2023-02-06 19:02:32 +09:00
parent 48a5820e01
commit f17161ac78
5 changed files with 68 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java
View File

@ -194,6 +194,12 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
affairBoard.setReportDt(LocalDate.now());
}
mav.addObject("affair", affairBoard);
//메뉴권한 확인
mav.addObject("userOrgan", loginUser.getOgCd());
mav.addObject("accessAuth", authMgtService.selectAccessConfigList
(loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getAccessAuth());
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList
(loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth());
return mav;
}
@ -215,9 +221,6 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
String apprvAuth = authMgtService.selectApprovalConfigList
(loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth();
mav.addObject("apprvAuth", apprvAuth);
if(apprvAuth!=null && (apprvAuth.equals("APC002") || apprvAuth.equals("APC001"))){
mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR"));
}
return mav;
}

4
src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairRating.java
View File

@ -23,6 +23,8 @@ public class AffairRating{
@Id
@Column(name = "rating_organ")
private String ratingOrgan;
@Column(name = "section_title")
private String sectionTitle;
@Column(name = "section_nm")
private String sectionNm;
@Column(name = "section_apprv_dt")
@ -31,6 +33,8 @@ public class AffairRating{
private String sectionApprv;
@Column(name = "section_etc")
private String sectionEtc;
@Column(name = "head_title")
private String headTitle;
@Column(name = "head_nm")
private String headNm;
@Column(name = "head_apprv_dt")

3
src/main/resources/static/css/common.css
View File

@ -111,6 +111,9 @@
.w-40{
width: 40%!important;
}
.w-60{
width:60%!important;
}
.w-70{
width:70%!important;
}

51
src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
View File

@ -117,6 +117,57 @@
<input type="file" class="d-none" id="fileInputer" multiple>
</div>
</form>
<th:block th:if="${affair.affairStatus eq 'DST004' or affair.affairStatus eq 'DST006'}">
<th:block th:if="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'}">
<!--본청 관리자의 평가 수정 양식-->
<hr class="mb-1">
<div class="row mb-3">
<label class="col-sm-1 col-form-label col-form-label-sm text-center">견문평가</label>
<div class="col-11">
<div class="row" th:each="rate:${affair.rateList}">
<label class="col-sm-1 col-form-label col-form-label-sm text-center">
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${code.itemCd eq rate.ratingOrgan}" th:text="${code.itemValue}"></th:block>
</th:block>
</label>
<div class="col-11">
<div class="row">
<th:block th:if="${rate.headApprv eq null}">
<div class="col-auto">평가 정보가 없습니다.</div>
</th:block>
<th:block th:unless="${rate.headApprv eq null}">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">
<th:block th:each="code:${session.commonCode.get('JT')}">
<th:block th:if="${rate.headTitle eq code.itemCd}" th:text="${#strings.concat('평가자: ', code.itemValue, ' ', rate.headNm)}"></th:block>
</th:block>
</label>
<div class="col-3">
<div class="input-group">
<select class="form-select form-select-sm affairRate w-30">
<th:block th:each="code:${session.commonCode.get('AAR')}">
<option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq rate.affairRate}"></option>
</th:block>
</select>
<div class="w-70">
<th:block th:unless="${rate.ratingOrgan eq 'OG001'}">
<label for="organUp" class="form-check-label px-1 pt-1">상보여부</label>
<input type="checkbox" id="organUp" class="organUp" value="T" th:checked="${rate.organUp eq 'T'}">
</th:block>
</div>
</div>
</div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
<div class="col-6">
<input type="text" class="form-control form-control-sm headEtc" th:text="${rate.headEtc}">
</div>
</th:block>
</div>
</div>
</div>
</div>
</div>
</th:block>
</th:block>
</div>
<div class="modal-footer bg-light">
<!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->

10
src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
View File

@ -142,7 +142,7 @@
<div class="px-2">
<hr>
<th:block th:each="rate:${affair.rateList}">
<div class="row border-secondary text-center">
<div class="row border-secondary text-center">
<label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center ">
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${code.itemCd eq rate.ratingOrgan}" th:text="${code.itemValue}"></th:block>
@ -150,9 +150,7 @@
</label>
<div class="col-11">
<div class="row" th:if="${rate.sectionApprv eq null}">
<label
class="col-sm-8 border-end border-secondary col-form-label col-form-label-sm text-center bg-white">결재정보가
없습니다.</label>
<label class="col-sm-8 border-end border-secondary col-form-label col-form-label-sm text-center bg-white">결재정보가 없습니다.</label>
</div>
<div class="row border-top-0 border-secondary" th:if="${rate.sectionApprv ne null}">
<label
@ -254,8 +252,8 @@
<div class="col-auto">
<select class="form-select form-select-sm" name="affairRate" id="affairRate">
<option value="">견문평가</option>
<th:block th:each="ratingCode:${ratingCodeList}">
<option th:value="${ratingCode.itemCd}" th:text="${ratingCode.itemValue}"></option>
<th:block th:each="code:${session.commonCode.get('AAR')}">
<option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
</th:block>
</select>
</div>