From 49ab626b5cb89219a4b4b86b5f1774f4705df51c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 15:46:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 109 ++++++++++++++++++++++++++++++------------------------
1 files changed, 60 insertions(+), 49 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 2505934..4d4221e 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -56,6 +56,12 @@
@Autowired
private ProcessPermissionsService processPermissionsService;
+ @Autowired
+ private BusinessTripService businessTripService;
+
+ @Autowired
+ private BusinessTripOtherService businessTripOtherService;
+
@RequestMapping(value = "/reimburseOnline/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -68,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);
}
@@ -134,57 +140,67 @@
}
}
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")
@ManagerAuth(memo = "娣诲姞鎶ラ攢鍗�")
@Transactional
public R formAdd(@RequestBody ReimburseOnlineDomainParam param){
- long planId = 0;
+ long orderId = 0;
if (!param.getTemplateName().equals("闈為」鐩瀷鎶ラ攢")){
- if (Cools.isEmpty(param.getOrderNo())){
- return R.error("娣诲姞澶辫触锛�"+param.getTemplateName()+"闇�瑕佸叧鑱旈」鐩彿");
+ if (Cools.isEmpty(param.getOrderId())){
+ if (Cools.isEmpty(param.getBusinessId())){
+ if (Cools.isEmpty(param.getBusinessOtherId())){
+ return R.error("娣诲姞澶辫触锛�"+param.getTemplateName()+"闇�瑕佸叧鑱旈」鐩彿");
+ }
+ BusinessTripOther businessTripOther = businessTripOtherService.selectById(param.getBusinessOtherId());
+ param.setOrderId(businessTripOther.getOrderId());
+ }else {
+ BusinessTrip businessTrip = businessTripService.selectById(param.getBusinessId());
+ param.setOrderId(businessTrip.getOrderId());
+ }
}
- String[] split = param.getOrderNo().split("---");
- planId = Long.parseLong(split[1]);
+ orderId = param.getOrderId();
}
Date now = new Date();
Rule rule = ruleService.selectById(1);
- ReimburseOnline reimburseOnline = new ReimburseOnline(planId,RuleUtils.rule(rule),now,getUser());
+ ReimburseOnline reimburseOnline = new ReimburseOnline(orderId,RuleUtils.rule(rule),now,getUser());
reimburseOnline.setCheckData(param.getCheckData());
reimburseOnline.setTemplateName(param.getTemplateName());
- reimburseOnline.setName(param.getName());
+ reimburseOnline.setName("");
- reimburseOnline.setSettle(0); // 0.鍒涘缓
- User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ reimburseOnline.setSettle(1); // 1.鍒涘缓
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = getUser();
+ }
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())));
- Map<String, Object> map = new HashMap<>();
- map.put("title","闈為」鐩瀷鎶ラ攢");
- map.put("reimburseId",reimburseOnline.getPlanId$());
- map.put("docType",param.getDocType());
- map.put("orderNo",param.getOrderNo());
- map.put("templateName",param.getTemplateName());
- map.put("checkData",param.getCheckData());
- map.put("name",param.getName());
- reimburseOnline.setForm(JSON.toJSONString(map));
- reimburseOnline.setMemberId(getUser().getId());
+ reimburseOnline.setMemberId(manager.getId());
if (!reimburseOnlineService.insert(reimburseOnline)){
return R.error("娣诲姞鎶ラ攢涓绘。澶辫触");
@@ -202,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("闈炲垱寤轰汉鍛樼姝慨鏀癸紒");
@@ -223,19 +239,9 @@
reimburseOnline.setCheckData(param.getCheckData());
reimburseOnline.setTemplateName(param.getTemplateName());
- reimburseOnline.setItemId(planId);
+// reimburseOnline.setItemId(planId);
reimburseOnline.setName(param.getName());
reimburseOnline.setUpdateTime(new Date());
-
- Map<String, Object> map = new HashMap<>();
- map.put("title",reimburseOnline.getPlanId$());
- map.put("reimburseId",param.getReimburseId());
- map.put("docType",param.getDocType());
- map.put("orderNo",param.getOrderNo());
- map.put("templateName",param.getTemplateName());
- map.put("checkData",param.getCheckData());
- map.put("name",param.getName());
- reimburseOnline.setForm(JSON.toJSONString(map));
if (!reimburseOnlineService.updateById(reimburseOnline)){
return R.error("鏇存柊鎶ラ攢涓绘。澶辫触");
@@ -465,7 +471,7 @@
for (ReimburseOnline priOnline : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", priOnline.getId());
- map.put("value", priOnline.getOrderNum() + "/" + priOnline.getPlanId$() + "/" + priOnline.getMemberId$());
+ map.put("value", priOnline.getOrderNum() + "/" + priOnline.getOrderId$() + "/" + priOnline.getMemberId$());
result.add(map);
}
return R.ok(result);
@@ -540,7 +546,12 @@
case 1:
// 鏈儴闂ㄧ粡鐞嗗鏍�
User user = userService.selectById(reimburseOnline.getUserId());
- User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = user;
+ }
if (manager.getId().equals(getUserId())) {
// 淇敼 settle 姝ラ鏁版嵁
--
Gitblit v1.9.1