From 026245895bdd18ab647a8a35649dc162c7927c8e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 23 十一月 2022 13:05:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 18 ++++++++++++++----
src/main/webapp/static/js/plan/plan.js | 18 +++++++++++++++++-
2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index df316ea..85dfa9a 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -116,19 +116,29 @@
plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
plan.setSettle(1); // 1.寮�濮�
- planService.insert(plan);
+ if (!planService.insert(plan)) {
+ throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
+ }
return R.ok();
}
@RequestMapping(value = "/plan/update/auth")
@ManagerAuth
- public R update(Plan plan){
- if (Cools.isEmpty(plan) || null==plan.getId()){
+ public R update(@RequestParam Map<String, Object> param){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.get("id"))){
return R.error();
}
+ // pre
+ Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class);
+ param.entrySet().removeIf(next -> this.fields.contains(next.getKey()));
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
- planService.updateById(plan);
+
+ plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹�
+
+ if (!planService.updateById(plan)) {
+ throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
+ }
return R.ok();
}
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 8acc29b..7e684c5 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -418,7 +418,23 @@
plan['planTypeName'] = plan.planType$;
form.val('detail', plan);
form.on('submit(editSubmit)', function (data) {
- console.log(data)
+ data.field.orderId = orderSel.getValue()[0] ? orderSel.getValue()[0].value : null;
+ data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null;
+ data.field.userId = userSel.getValue()[0] ? userSel.getValue()[0].value : null;
+ data.field.planNeed = planNeedSel.getValue()[0] ? planNeedSel.getValue()[0].value : null;
+
+ delete data.field.select;delete data.field.planTypeName;
+
+ if (!data.field.orderId) {
+ layer.msg("璺熻釜椤圭洰涓嶈兘涓虹┖", {icon: 2});
+ top.requireTip($('#orderXmlSel'));
+ return false;
+ }
+ if (!data.field.cstmrId) {
+ layer.msg("瀹㈡埛鍚嶇О涓嶈兘涓虹┖", {icon: 2});
+ top.requireTip($('#cstmrXmlSel'));
+ return false;
+ }
let loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/plan/update/auth",
--
Gitblit v1.9.1