From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 87 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 36 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 c2cc912..60b6511 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);
}
@@ -92,7 +98,7 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<ReimburseOnline> wrapper = new EntityWrapper<>();
- 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.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,name");
// wrapper.in("member_id", getUserRoleBelongsToUserId());
wrapper.andNew();
excludeTrash(param);
@@ -134,7 +140,13 @@
}
}
if (!signUserId && !signDeptId){
- wrapper.eq("user_id", getUserId());
+ if (getRole().getId()==1){
+ wrapper.or().eq("host_id",1);
+ }else if (getRole().getId()==2){
+ wrapper.eq("dept_id",getDeptId());
+ }else {
+ wrapper.eq("user_id", getUserId());
+ }
}
if (signHostId){
wrapper.or().eq("host_id",1);
@@ -144,45 +156,51 @@
@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("");
- 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());
- reimburseOnline.setForm(JSON.toJSONString(map));
- reimburseOnline.setMemberId(getUser().getId());
+ reimburseOnline.setMemberId(manager.getId());
if (!reimburseOnlineService.insert(reimburseOnline)){
return R.error("娣诲姞鎶ラ攢涓绘。澶辫触");
@@ -222,16 +240,8 @@
reimburseOnline.setCheckData(param.getCheckData());
reimburseOnline.setTemplateName(param.getTemplateName());
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());
- reimburseOnline.setForm(JSON.toJSONString(map));
if (!reimburseOnlineService.updateById(reimburseOnline)){
return R.error("鏇存柊鎶ラ攢涓绘。澶辫触");
@@ -461,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);
@@ -530,13 +540,18 @@
reimburseOnline.setMemberId(manager1.getId());
if (!reimburseOnlineService.updateById(reimburseOnline)) {
- throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ throw new CoolException("鎻愪氦澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
break;
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