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

문서번호 조건 추가. 

결제시 결제자 계급 저장되지 않던 오류 수정.
master
강석 최 2023-02-14 14:53:24 +09:00
parent 27f6c3094e
commit e6b03b4f50
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java
View File

@ -123,8 +123,8 @@ public class AffairService extends BaseService { // 견문보고
}
}
private String makeDocNo(String wrtOrgan){
String docNo = ((Integer)LocalDate.now().getYear()).toString();
private String makeDocNo(String wrtOrgan, Integer year){
String docNo = year.toString();
Map<String, Object> params = new HashMap<>();
params.put("wrtOrgan", wrtOrgan);
params.put("year", docNo);
@ -138,6 +138,7 @@ public class AffairService extends BaseService { // 견문보고
AffairRating savedRating = affairRatingRepository.findById(new AffairRating.AffairRatingId(rating.getAffairKey(), loginUser.getOgCd())).orElse(null);
if(savedRating != null){
if(rating.getHeadApprv() == null){
savedRating.setSectionTitle(loginUser.getTitleCd());
savedRating.setSectionNm(loginUser.getUserNm());
savedRating.setSectionApprvDt(LocalDateTime.now());
savedRating.setSectionApprv(rating.getSectionApprv());
@ -156,6 +157,7 @@ public class AffairService extends BaseService { // 견문보고
break;
}
}else{
savedRating.setHeadTitle(loginUser.getTitleCd());
savedRating.setHeadNm(loginUser.getUserNm());
savedRating.setHeadApprvDt(LocalDateTime.now());
savedRating.setHeadApprv(rating.getHeadApprv());
@ -167,7 +169,7 @@ public class AffairService extends BaseService { // 견문보고
AffairBoard affairBoard = affairBoardRepository.findById(savedRating.getAffairKey()).orElse(null);
if(affairBoard.getDocNo() == null
&& affairBoard.getWrtOrgan().equals(savedRating.getRatingOrgan())){
affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan()));
affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear()));
}
}
if(savedRating.getOrganUp().equals("T")){
@ -261,7 +263,7 @@ public class AffairService extends BaseService { // 견문보고
AffairBoard affairBoard = affairBoardRepository.findById(rating.getAffairKey()).orElse(null);
if(affairBoard.getDocNo() == null
&& affairBoard.getWrtOrgan().equals(rating.getRatingOrgan())){
affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan()));
affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear()));
}
}
}else if(!Utils.isEmpty(rating.getSectionApprv())) {

1
src/main/resources/mybatisMapper/AffairMapper.xml
View File

@ -144,6 +144,7 @@
inner join affair_rating b
on a.affair_key = b.affair_key and a.wrt_organ = b.rating_organ and b.affair_status = 'DST006'
where wrt_organ = #{wrtOrgan}
and a.doc_no is not null
and EXTRACT(YEAR FROM report_dt) = #{year}::numeric
</select>

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

@ -145,7 +145,12 @@
</th:block>
</label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재자: </label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${rate.sectionNm}"></label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="code:${session.commonCode.get('JT')}">
<th:block th:if="${rate.sectionTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:text="${rate.sectionNm}"></th:block>
</label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재일시: </label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
</div>
@ -172,7 +177,12 @@
</label>
</th:block>
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재자: </label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${rate.headNm}"></label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="code:${session.commonCode.get('JT')}">
<th:block th:if="${rate.headTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:text="${rate.headNm}"></th:block>
</label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재일시: </label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
</div>