From 8b109f923dc7c2d5c5bd351a03a5277670962aac Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 04 十二月 2023 13:05:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 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 37ed5f7..4d4221e 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -74,7 +74,7 @@
}
// 姝ラ鏉＄浉鍏�
- resultObj.put("step", reimburseOnline.getSettle() == 6 ? 0 : reimburseOnline.getSettle() + 1);
+ resultObj.put("step", reimburseOnline.getSettle() == 7 ? 0 : reimburseOnline.getSettle() + 1);
return R.ok().add(resultObj);
}
@@ -140,10 +140,16 @@
}
}
if (!signUserId && !signDeptId){
- wrapper.eq("user_id", getUserId());
+ if (getRole().getId()==1){
+ wrapper.or().eq("host_id",getHostId());
+ }else if (getRole().getId()==2){
+ wrapper.eq("dept_id",getDeptId());
+ }else {
+ wrapper.eq("user_id", getUserId());
+ }
}
if (signHostId){
- wrapper.or().eq("host_id",1);
+ wrapper.or().eq("host_id",getHostId());
}
}
@RequestMapping(value = "/reimburseOnline/from/add/auth")
@@ -182,19 +188,19 @@
}
ProcessPermissions processPermissions3 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", param.getCheckData().equals("鍚�")? "3-1" : "3-2"));//3锛氭姤閿�娴佺▼
- User president3 = userService.selectById(processPermissions3.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
+ User president3 = userService.selectById(processPermissions3.getUserId()); // 鑾峰彇娴佺▼鑺傜偣3纭浜�
ProcessPermissions processPermissions4 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "4-1"));//3锛氭姤閿�娴佺▼
- User president4 = userService.selectById(processPermissions4.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣4纭浜�
+ User president4 = userService.selectById(processPermissions4.getUserId()); // 鑾峰彇娴佺▼鑺傜偣4纭浜�
ProcessPermissions processPermissions5 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "5-1"));//3锛氭姤閿�娴佺▼
- User president5 = userService.selectById(processPermissions5.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣5纭浜�
+ User president5 = userService.selectById(processPermissions5.getUserId()); // 鑾峰彇娴佺▼鑺傜偣5纭浜�
ProcessPermissions processPermissions6 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "6-1"));//3锛氭姤閿�娴佺▼
- User president6 = userService.selectById(processPermissions6.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣6纭浜�
+ User president6 = userService.selectById(processPermissions6.getUserId()); // 鑾峰彇娴佺▼鑺傜偣6纭浜�
reimburseOnline.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(reimburseOnline, manager,president3,president4,president5,president6,getUser())));
- reimburseOnline.setMemberId(getUser().getId());
+ reimburseOnline.setMemberId(manager.getId());
if (!reimburseOnlineService.insert(reimburseOnline)){
return R.error("娣诲姞鎶ラ攢涓绘。澶辫触");
@@ -212,19 +218,19 @@
@Transactional
public R formModify(@RequestBody ReimburseOnlineDomainParam param){
- long planId = 0;
- if (!param.getTemplateName().equals("闈為」鐩瀷鎶ラ攢")){
- if (Cools.isEmpty(param.getOrderNo())){
- return R.error("淇敼澶辫触锛�"+param.getTemplateName()+"闇�瑕佸叧鑱旈」鐩彿");
- }
- String[] split = param.getOrderNo().split("---");
- planId = Long.parseLong(split[1]);
- }
+// long planId = 0;
+// if (!param.getTemplateName().equals("闈為」鐩瀷鎶ラ攢")){
+// if (Cools.isEmpty(param.getOrderNo())){
+// return R.error("淇敼澶辫触锛�"+param.getTemplateName()+"闇�瑕佸叧鑱旈」鐩彿");
+// }
+// String[] split = param.getOrderNo().split("---");
+// planId = Long.parseLong(split[1]);
+// }
Date now = new Date();
ReimburseOnline reimburseOnline = reimburseOnlineService.selectById(param.getReimburseId());
- if (!reimburseOnline.getSettle().equals(0)){
- return R.error("淇敼澶辫触锛佹彁浜や箣鍚庣姝慨鏀癸紒");
+ if (!reimburseOnline.getSettle().equals(1)){
+ return R.error("淇敼澶辫触锛侀儴闂ㄧ粡鐞嗗鏍镐箣鍚庣姝慨鏀癸紒");
}
if (!reimburseOnline.getUserId().equals(getUserId())){
return R.error("闈炲垱寤轰汉鍛樼姝慨鏀癸紒");
@@ -233,7 +239,7 @@
reimburseOnline.setCheckData(param.getCheckData());
reimburseOnline.setTemplateName(param.getTemplateName());
- reimburseOnline.setItemId(planId);
+// reimburseOnline.setItemId(planId);
reimburseOnline.setName(param.getName());
reimburseOnline.setUpdateTime(new Date());
--
Gitblit v1.9.1