From fae5b7ce29b94017025535a2a4e94eb2541637a0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 06 九月 2023 18:52:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 66 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 10 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 e8f4b5c..62e9c28 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -92,14 +92,14 @@
@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);
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());
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(reimburseOnlineService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -141,7 +141,7 @@
}
}
@RequestMapping(value = "/reimburseOnline/from/add/auth")
- @ManagerAuth(memo = "鎶ラ攢")
+ @ManagerAuth(memo = "娣诲姞鎶ラ攢鍗�")
@Transactional
public R formAdd(@RequestBody ReimburseOnlineDomainParam param){
long planId = 0;
@@ -157,6 +157,7 @@
ReimburseOnline reimburseOnline = new ReimburseOnline(planId,RuleUtils.rule(rule),now,getUser());
reimburseOnline.setCheckData(param.getCheckData());
reimburseOnline.setTemplateName(param.getTemplateName());
+ reimburseOnline.setName(param.getName());
reimburseOnline.setSettle(0); // 0.鍒涘缓
User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
@@ -176,11 +177,12 @@
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",param.getReimburseId());
+ 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());
@@ -196,16 +198,63 @@
}
@RequestMapping(value = "/reimburseOnline/from/modify/auth")
+ @ManagerAuth(memo = "淇敼鎶ラ攢鍗�")
@Transactional
public R formModify(@RequestBody ReimburseOnlineDomainParam param){
- System.out.println(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]);
+ }
+ Date now = new Date();
+ ReimburseOnline reimburseOnline = reimburseOnlineService.selectById(param.getReimburseId());
+
+ if (!reimburseOnline.getSettle().equals(0)){
+ return R.error("淇敼澶辫触锛佹彁浜や箣鍚庣姝慨鏀癸紒");
+ }
+ if (!reimburseOnline.getUserId().equals(getUserId())){
+ return R.error("闈炲垱寤轰汉鍛樼姝慨鏀癸紒");
+ }
+
+
+ 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());
+ map.put("name",param.getName());
+ reimburseOnline.setForm(JSON.toJSONString(map));
+
+ if (!reimburseOnlineService.updateById(reimburseOnline)){
+ return R.error("鏇存柊鎶ラ攢涓绘。澶辫触");
+ }
+
+ reimburseOnlineDetlService.delete(new EntityWrapper<ReimburseOnlineDetl>().eq("order_id",reimburseOnline.getId()));
+
+ for (ReimburseOnlineDetl reimburseOnlineDetl:param.getReimburseOnlineDetls()){
+ reimburseOnlineDetl.setOrderId(reimburseOnline.getId());
+ reimburseOnlineDetlService.insert(reimburseOnlineDetl);
+ }
+
return R.ok();
}
@RequestMapping(value = "/reimburseOnline/detl/all/auth")
@Transactional
public R head(@RequestParam Integer reimburseId){
- List<ReimburseOnlineDetl> reimburseOnlineDetls = reimburseOnlineDetlService.selectList(new EntityWrapper<ReimburseOnlineDetl>().eq("reimburse_id", reimburseId));
+ List<ReimburseOnlineDetl> reimburseOnlineDetls = reimburseOnlineDetlService.selectList(new EntityWrapper<ReimburseOnlineDetl>().eq("order_id", reimburseId));
return R.ok().add(reimburseOnlineDetls);
}
@@ -559,14 +608,10 @@
for (SettleDto dto : list) {
if (dto.getStep().equals(settle)){
dto.setCurr(Boolean.FALSE);
- break;
}else if (dto.getStep().equals(settle+1)){
dto.setCurr(Boolean.TRUE);
dto.setMsg("鎶ヤ环娴佺▼鑺傜偣"+process+"纭浜�:"+planLeader.getNickname() + "瀹℃壒閫氳繃");
dto.setTime(DateUtils.convert(now));
- break;
- }else {
- break;
}
}
reimburseOnline.setSettleMsg(JSON.toJSONString(list));
@@ -579,6 +624,7 @@
settle=settle+2;
}else {
settle++;
+ reimburseOnline.setStatus(1);
}
ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", settle+"-"+split[1]));//3锛氭姤閿�娴佺▼
reimburseOnline.setMemberId(processPermissions2.getUserId());
--
Gitblit v1.9.1