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 | 6 +++++- 1 files changed, 5 insertions(+), 1 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..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,7 +92,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); @@ -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()); // 鑾峰彇閮ㄩ棬棰嗗 @@ -181,6 +182,7 @@ 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()); @@ -222,6 +224,7 @@ 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<>(); @@ -231,6 +234,7 @@ 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)){ -- Gitblit v1.9.1