From 46898bbf94063b368d52ac2bd3ba624e4a9f77e6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 17:36:58 +0800
Subject: [PATCH] #bug修复，双红*问题
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..2505934 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)){
@@ -530,7 +534,7 @@
reimburseOnline.setMemberId(manager1.getId());
if (!reimburseOnlineService.updateById(reimburseOnline)) {
- throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ throw new CoolException("鎻愪氦澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
break;
case 1:
--
Gitblit v1.9.1