From 95c8d8cc92be4287787f9cef4bbaccc66fed4979 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 20:03:51 +0800
Subject: [PATCH] #报销审核完善
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
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 f5d1969..789c294 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -92,12 +92,14 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<ReimburseOnline> wrapper = new EntityWrapper<>();
- wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
- wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
+ wrapper.setSqlSelect("id,settle,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
+// wrapper.in("member_id", getUserRoleBelongsToUserId());
+ wrapper.andNew();
excludeTrash(param);
convert(param, wrapper);
allLike(ReimburseOnline.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.or().eq("member_id",getUserId());
return R.ok(reimburseOnlineService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -105,9 +107,13 @@
Long deptId = getDeptId();
boolean signUserId = false;
boolean signDeptId = false;
+ boolean signHostId = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().equals("dept_id")){
signDeptId = true;
+ if (String.valueOf(entry.getValue()).equals("19")){
+ signHostId = true;
+ }
}
}
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -129,6 +135,9 @@
}
if (!signUserId && !signDeptId){
wrapper.eq("user_id", getUserId());
+ }
+ if (signHostId){
+ wrapper.or().eq("host_id",1);
}
}
@RequestMapping(value = "/reimburseOnline/from/add/auth")
@@ -172,9 +181,8 @@
map.put("orderNo",param.getOrderNo());
map.put("templateName",param.getTemplateName());
map.put("checkData",param.getCheckData());
- map.put("reimburseOnlineDetls",param.getReimburseOnlineDetls());
reimburseOnline.setForm(JSON.toJSONString(map));
- reimburseOnline.setMemberId(president3.getId());
+ reimburseOnline.setMemberId(manager.getId());
if (!reimburseOnlineService.insert(reimburseOnline)){
return R.error("娣诲姞鎶ラ攢涓绘。澶辫触");
@@ -433,7 +441,7 @@
return R.ok().add(vos);
}
- @PostMapping(value = "/reimburseOnline/approval/auth")
+ @PostMapping(value = "/reimburseOnline/approval2/auth")
@ManagerAuth
public R approvalReimburseOnline(@RequestParam Long planId,
@RequestParam(required = false) Long plannerId){
@@ -470,6 +478,8 @@
reimburseOnline.setSettle(2); // 鎬昏鍔炲緟瀹�
reimburseOnline.setUpdateUserId(getUserId());
reimburseOnline.setUpdateTime(new Date());
+ 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());
if (!reimburseOnlineService.updateById(reimburseOnline)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -526,7 +536,14 @@
reimburseOnline.setSettle(settle+1);
reimburseOnline.setUpdateUserId(getUserId());
reimburseOnline.setUpdateTime(new Date());
- reimburseOnline.setMemberId(planLeader.getId());
+ String[] split = process.split("-");
+ if (settle!=5){
+ settle=settle+2;
+ }else {
+ settle++;
+ }
+ ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", settle+"-"+split[1]));//3锛氭姤閿�娴佺▼
+ reimburseOnline.setMemberId(processPermissions2.getUserId());
if (!reimburseOnlineService.updateById(reimburseOnline)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
--
Gitblit v1.9.1