From be5ded9ff80082512529831a8256334a8a4fa1e5 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期二, 22 八月 2023 16:20:34 +0800 Subject: [PATCH] #权限审核添加,优化报价审核,可编辑 --- src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 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 985d3c3..9a291cc 100644 --- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java +++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java @@ -11,12 +11,10 @@ import com.core.common.R; import com.core.domain.KeyValueVo; import com.zy.crm.common.web.BaseController; -import com.zy.crm.manager.entity.Plan; -import com.zy.crm.manager.entity.Reimburse; -import com.zy.crm.manager.entity.ReimburseOnline; -import com.zy.crm.manager.entity.ReimburseOnlineDetl; +import com.zy.crm.manager.entity.*; import com.zy.crm.manager.entity.param.ReimburseOnlineDomainParam; import com.zy.crm.manager.service.*; +import com.zy.crm.manager.utils.RuleUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +40,8 @@ private PlanService planService; @Autowired private ReimburseOnlineDetlService reimburseOnlineDetlService; + @Autowired + private RuleService ruleService; @RequestMapping(value = "/reimburseOnline/{id}/auth") @ManagerAuth @@ -111,14 +111,28 @@ @ManagerAuth(memo = "鎶ラ攢") @Transactional public R formAdd(@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]); + } Date now = new Date(); - String[] split = param.getOrderNo().split("---"); - long planId = Long.parseLong(split[1]); - ReimburseOnline reimburseOnline = new ReimburseOnline(planId,split[1],now,getUser()); + Rule rule = ruleService.selectById(1); + ReimburseOnline reimburseOnline = new ReimburseOnline(planId,RuleUtils.rule(rule),now,getUser()); + reimburseOnline.setMemberId(getUserId()); + reimburseOnline.setCheckData(param.getCheckData()); + reimburseOnline.setTemplateName(param.getTemplateName()); + if (!reimburseOnlineService.insert(reimburseOnline)){ + return R.error("娣诲姞鎶ラ攢涓绘。澶辫触"); + } + for (ReimburseOnlineDetl reimburseOnlineDetl:param.getReimburseOnlineDetls()){ + reimburseOnlineDetl.setOrderId(reimburseOnline.getId()); + reimburseOnlineDetlService.insert(reimburseOnlineDetl); + } - - - System.out.println(param); return R.ok(); } @@ -315,6 +329,9 @@ return R.error(); } reimburseOnlineService.deleteBatchIds(Arrays.asList(ids)); + for (Long id : ids){ + reimburseOnlineDetlService.delete(new EntityWrapper<ReimburseOnlineDetl>().eq("order_id",id)); + } return R.ok(); } -- Gitblit v1.9.1