From 6702e8cd7fca6725c0cd35613ceefef7f812c90e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 15:08:24 +0800
Subject: [PATCH] #
---
src/main/webapp/views/cstmr/cstmr_more.html | 2 +-
src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java | 16 ++++++++++++++++
src/main/webapp/static/js/cstmr/cstmr2.js | 2 +-
src/main/webapp/static/js/cstmr/cstmr.js | 2 +-
src/main/webapp/views/cstmr/cstmr.html | 6 +++---
src/main/java/com/zy/crm/manager/entity/Cstmr.java | 18 ------------------
src/main/resources/mapper/CstmrMapper.xml | 1 -
src/main/webapp/views/cstmr/cstmr2.html | 6 +++---
8 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java b/src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java
index 7a6dc20..97d7858 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java
@@ -119,6 +119,22 @@
return R.ok(result);
}
+ @RequestMapping(value = "/orderProductTypeSQuery/auth")
+ @ManagerAuth
+ public R queryS(String condition) {
+ EntityWrapper<OrderProductType> wrapper = new EntityWrapper<>();
+ wrapper.like("name", condition);
+ Page<OrderProductType> page = orderProductTypeService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (OrderProductType orderProductType : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", orderProductType.getName());
+ map.put("value", orderProductType.getName());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
@RequestMapping(value = "/orderProductType/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
diff --git a/src/main/java/com/zy/crm/manager/entity/Cstmr.java b/src/main/java/com/zy/crm/manager/entity/Cstmr.java
index 30c1b44..618fa6a 100644
--- a/src/main/java/com/zy/crm/manager/entity/Cstmr.java
+++ b/src/main/java/com/zy/crm/manager/entity/Cstmr.java
@@ -212,13 +212,6 @@
private String productCategory;
/**
- * 浜у搧绫诲瀷
- */
- @ApiModelProperty(value= "浜у搧绫诲瀷")
- @TableField("order_product_type_id")
- private Long orderProductTypeId;
-
- /**
* 浼佷笟淇＄敤浠ｇ爜
*/
@ApiModelProperty(value= "浼佷笟淇＄敤浠ｇ爜")
@@ -382,17 +375,6 @@
}
return null;
}
-
- public String getOrderProductTypeId$(){
- if (this.orderProductTypeId==null) return null;
- OrderProductTypeService orderProductTypeService = SpringUtils.getBean(OrderProductTypeService.class);
- OrderProductType orderProductType = orderProductTypeService.selectById(this.orderProductTypeId);
- if (!Cools.isEmpty(orderProductType)){
- return String.valueOf(orderProductType.getName());
- }
- return null;
- }
-
public void setType0(String type0){
if (Cools.isEmpty(type0)) {
diff --git a/src/main/resources/mapper/CstmrMapper.xml b/src/main/resources/mapper/CstmrMapper.xml
index 1b9a100..f3b9e68 100644
--- a/src/main/resources/mapper/CstmrMapper.xml
+++ b/src/main/resources/mapper/CstmrMapper.xml
@@ -32,7 +32,6 @@
<result column="memo" property="memo" />
<result column="industry" property="industry" />
<result column="product_category" property="productCategory" />
- <result column="order_product_type_id" property="orderProductTypeId" />
<result column="credit_code" property="creditCode" />
<result column="issue_time" property="issueTime" />
<result column="company_type" property="companyType" />
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 122ead3..6c5764e 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -149,7 +149,7 @@
,{field: 'remarks', align: 'left',title: '澶囨敞', hide: false, templet:function(d){return emptyShow(d.remarks)}}
,{field: 'cstmrType$', align: 'left',title: '瀹㈡埛绫诲埆', hide: false}
,{field: 'industry', align: 'left',title: '瀹㈡埛琛屼笟', hide: false}
- ,{field: 'orderProductTypeId$', align: 'left',title: '浜у搧绫诲瀷', hide: false}
+ ,{field: 'productCategory', align: 'left',title: '浜у搧绫诲瀷', hide: false}
,{field: 'userId$', align: 'left',title: '娣诲姞浜哄憳', hide: true}
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�', hide: true}
,{field: 'rela', align: 'left',title: '瀹㈡埛鍏崇郴', hide: true}
diff --git a/src/main/webapp/static/js/cstmr/cstmr2.js b/src/main/webapp/static/js/cstmr/cstmr2.js
index 0ffc3e5..a84bab2 100644
--- a/src/main/webapp/static/js/cstmr/cstmr2.js
+++ b/src/main/webapp/static/js/cstmr/cstmr2.js
@@ -149,7 +149,7 @@
,{field: 'remarks', align: 'left',title: '澶囨敞', hide: false, templet:function(d){return emptyShow(d.remarks)}}
,{field: 'cstmrType$', align: 'left',title: '瀹㈡埛绫诲埆', hide: false}
,{field: 'industry', align: 'left',title: '瀹㈡埛琛屼笟', hide: false}
- ,{field: 'orderProductTypeId$', align: 'left',title: '浜у搧绫诲瀷', hide: false}
+ ,{field: 'productCategory', align: 'left',title: '浜у搧绫诲瀷', hide: false}
,{field: 'userId$', align: 'left',title: '娣诲姞浜哄憳', hide: true}
,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿', hide: false}
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�', hide: true}
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index 1e94575..4c4ce6f 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -181,11 +181,11 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">浜у搧绫诲瀷: </label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="orderProductTypeId" placeholder="璇疯緭鍏ヤ骇鍝佺被鍨�" style="display: none">
+ <input class="layui-input" name="productCategory" placeholder="璇疯緭鍏ヤ骇鍝佺被鍨�" style="display: none">
<input id="orderProductTypeId$" name="orderProductTypeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ骇鍝佺被鍨�" onfocus=this.blur()>
<div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="orderProductTypeQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="orderProductTypeQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <input class="cool-auto-complete-window-input" data-key="orderProductTypeSQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="orderProductTypeSQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
diff --git a/src/main/webapp/views/cstmr/cstmr2.html b/src/main/webapp/views/cstmr/cstmr2.html
index 49167a9..2e1cd2f 100644
--- a/src/main/webapp/views/cstmr/cstmr2.html
+++ b/src/main/webapp/views/cstmr/cstmr2.html
@@ -194,11 +194,11 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">浜у搧绫诲瀷: </label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="orderProductTypeId" placeholder="璇疯緭鍏ヤ骇鍝佺被鍨�" style="display: none">
+ <input class="layui-input" name="productCategory" placeholder="璇疯緭鍏ヤ骇鍝佺被鍨�" style="display: none">
<input id="orderProductTypeId$" name="orderProductTypeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ骇鍝佺被鍨�" onfocus=this.blur()>
<div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="orderProductTypeQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="orderProductTypeQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <input class="cool-auto-complete-window-input" data-key="orderProductTypeSQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="orderProductTypeSQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
diff --git a/src/main/webapp/views/cstmr/cstmr_more.html b/src/main/webapp/views/cstmr/cstmr_more.html
index 5369b07..dd30a17 100644
--- a/src/main/webapp/views/cstmr/cstmr_more.html
+++ b/src/main/webapp/views/cstmr/cstmr_more.html
@@ -140,7 +140,7 @@
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">浜у搧绫诲埆:</label>
<div class="layui-input-block">
- <input name="orderProductTypeId$" class="layui-input" disabled />
+ <input name="productCategory" class="layui-input" disabled />
</div>
</div>
<div class="layui-inline layui-col-md12">
--
Gitblit v1.9.1