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

외사장비 > 사용실적 결재 > 사용실적 조회 및 결재 저장 오류 수정.

master
강석 최 2022-04-20 13:32:23 +09:00
parent a53ed90757
commit d8ee817fac
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/kcg/faics/equip/service/impl/ApproveServiceImpl.java
View File

@ -59,10 +59,8 @@ public class ApproveServiceImpl implements ApproveService {
} }
@Override @Override
public HashMap<String, Object> insert(final ApproveVO dataVO, public HashMap<String, Object> insert(final ApproveVO dataVO, final Map<String, MultipartFile> fileMap) throws Exception {
final Map<String, MultipartFile> fileMap) throws Exception {
HashMap<String, Object> result = new HashMap<String, Object>(); HashMap<String, Object> result = new HashMap<String, Object>();
// 이미 결재 내역이 있으면 결재하지 않는다. // 이미 결재 내역이 있으면 결재하지 않는다.
ApproveVO vo = select(dataVO); ApproveVO vo = select(dataVO);
if (vo == null) { if (vo == null) {

6
src/main/java/kcg/faics/equip/web/EquipmentController.java
View File

@ -431,10 +431,8 @@ public class EquipmentController {
public String approve(final ApproveVO approveVO, final Model model) throws Exception { public String approve(final ApproveVO approveVO, final Model model) throws Exception {
HashMap<String, Object> result = approveService.insert(approveVO, null); HashMap<String, Object> result = approveService.insert(approveVO, null);
if ("1".equals(result.get("result").toString())) { if ("1".equals(result.get("result").toString())) {
return String return String.format("redirect:/equip/useStateWaiting.do?police=%s&year=%s&quater=%s",
.format("redirect:/equip/useStateWaiting.do?police=%s&year=%s&quater=%s", approveVO.getPolice(), approveVO.getYear(), approveVO.getQuater());
approveVO.getPolice(), approveVO.getYear(),
approveVO.getQuater());
} }
return useStateApprove(approveVO, model); return useStateApprove(approveVO, model);
} }