From 8f72ae1eb5ad67d16c176ae6d75892303821b9ba Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 23 八月 2023 09:11:56 +0800 Subject: [PATCH] #报销审核完善 --- src/main/webapp/views/reimburseOnline/reimburseOnline.html | 5 ++ src/main/java/com/zy/crm/common/model/SettleDto.java | 10 ++++- src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 50 ++++++++++++++++++++++--- 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zy/crm/common/model/SettleDto.java b/src/main/java/com/zy/crm/common/model/SettleDto.java index 16abfab..240f573 100644 --- a/src/main/java/com/zy/crm/common/model/SettleDto.java +++ b/src/main/java/com/zy/crm/common/model/SettleDto.java @@ -118,11 +118,11 @@ public static List<SettleDto> initPriQuote(ReimburseOnline reimburseOnline, User manager , User president3, User president4,User president5,User president6,User user) { List<SettleDto> list = new ArrayList<>(); - for (int i = 1; i < 7; i++) { + for (int i = 0; i < 7; i++) { SettleDto dto = new SettleDto(); dto.setStep(i); switch (i) { - case 1: + case 0: dto.setTitle("寮�濮�"); dto.setMsg(user.getUsername() + "鍒涘缓浜嗗鎵�"); dto.setUserId(user.getId()); @@ -131,6 +131,12 @@ dto.setCurr(Boolean.TRUE); list.add(dto); break; + case 1: + dto.setTitle("鎻愪氦鎶ラ攢"); + dto.setUserId(user.getId()); + dto.setUsername(user.getNickname()); + list.add(dto); + break; case 2: dto.setTitle("閮ㄩ棬缁忕悊瀹℃牳"); dto.setUserId(manager.getId()); diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java index 789c294..e8f4b5c 100644 --- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java +++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java @@ -158,7 +158,7 @@ reimburseOnline.setCheckData(param.getCheckData()); reimburseOnline.setTemplateName(param.getTemplateName()); - reimburseOnline.setSettle(1); // 1.寮�濮� + reimburseOnline.setSettle(0); // 0.鍒涘缓 User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗 ProcessPermissions processPermissions3 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", param.getCheckData().equals("鍚�")? "3-1" : "3-2"));//3锛氭姤閿�娴佺▼ @@ -182,7 +182,7 @@ map.put("templateName",param.getTemplateName()); map.put("checkData",param.getCheckData()); reimburseOnline.setForm(JSON.toJSONString(map)); - reimburseOnline.setMemberId(manager.getId()); + reimburseOnline.setMemberId(getUser().getId()); if (!reimburseOnlineService.insert(reimburseOnline)){ return R.error("娣诲姞鎶ラ攢涓绘。澶辫触"); @@ -449,7 +449,45 @@ assert reimburseOnline != null; Integer settle = reimburseOnline.getSettle(); String process=""; + Date now = new Date(); switch (reimburseOnline.getSettle()) { + case 0: + User user2 = userService.selectById(reimburseOnline.getUserId()); + User manager1 = userService.getDeptManager(getHostId(), user2.getDeptId()); + + if (Cools.isEmpty(getUser())) { + return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�"); + } + if (!getUserId().equals(getUser().getId())) { + return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�"); + } + // 淇敼 settle 姝ラ鏁版嵁 + List<SettleDto> list1 = JSON.parseArray(reimburseOnline.getSettleMsg(), SettleDto.class); + for (SettleDto dto : list1) { + switch (dto.getStep()) { + case 0: + dto.setCurr(Boolean.FALSE); + break; + case 1: + dto.setCurr(Boolean.TRUE); + dto.setMsg(getUser().getNickname() + "鎻愪氦瀹屾垚"); + dto.setTime(DateUtils.convert(now)); + break; + default: + break; + } + } + reimburseOnline.setSettleMsg(JSON.toJSONString(list1)); + // 淇敼瑙勫垝鍗曠姸鎬� + reimburseOnline.setSettle(1); + reimburseOnline.setUpdateUserId(getUserId()); + reimburseOnline.setUpdateTime(now); + reimburseOnline.setMemberId(manager1.getId()); + + if (!reimburseOnlineService.updateById(reimburseOnline)) { + throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); + } + break; case 1: // 鏈儴闂ㄧ粡鐞嗗鏍� User user = userService.selectById(reimburseOnline.getUserId()); @@ -466,7 +504,7 @@ case 2: dto.setCurr(Boolean.TRUE); dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃"); - dto.setTime(DateUtils.convert(new Date())); + dto.setTime(DateUtils.convert(now)); break; default: break; @@ -477,7 +515,7 @@ // 淇敼瑙勫垝鍗曠姸鎬� reimburseOnline.setSettle(2); // 鎬昏鍔炲緟瀹� reimburseOnline.setUpdateUserId(getUserId()); - reimburseOnline.setUpdateTime(new Date()); + reimburseOnline.setUpdateTime(now); ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", reimburseOnline.getCheckData().equals("鍚�") ? "3-1" : "3-2"));//3锛氭姤閿�娴佺▼ reimburseOnline.setMemberId(processPermissions.getUserId()); @@ -525,7 +563,7 @@ }else if (dto.getStep().equals(settle+1)){ dto.setCurr(Boolean.TRUE); dto.setMsg("鎶ヤ环娴佺▼鑺傜偣"+process+"纭浜�:"+planLeader.getNickname() + "瀹℃壒閫氳繃"); - dto.setTime(DateUtils.convert(new Date())); + dto.setTime(DateUtils.convert(now)); break; }else { break; @@ -535,7 +573,7 @@ // 淇敼瑙勫垝鍗曠姸鎬� reimburseOnline.setSettle(settle+1); reimburseOnline.setUpdateUserId(getUserId()); - reimburseOnline.setUpdateTime(new Date()); + reimburseOnline.setUpdateTime(now); String[] split = process.split("-"); if (settle!=5){ settle=settle+2; diff --git a/src/main/webapp/views/reimburseOnline/reimburseOnline.html b/src/main/webapp/views/reimburseOnline/reimburseOnline.html index 5201bd7..a4be66c 100644 --- a/src/main/webapp/views/reimburseOnline/reimburseOnline.html +++ b/src/main/webapp/views/reimburseOnline/reimburseOnline.html @@ -85,7 +85,10 @@ {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4 || d.settle == 5 || d.settle == 6) { }} <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval2">瀹℃壒</a> {{# } }} - <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a> + {{# if (d.settle == 0) { }} + <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval2">鎻愪氦</a> + {{# } }} +<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a>--> <!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="check">妯℃澘</a>--> <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a> <!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="upload">涓婁紶璇环</a>--> -- Gitblit v1.9.1