From 376674980fd9a7d79df70988dd1de03d3d482493 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 15:10:50 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/cstmr/cstmr.js | 11 +++++
src/main/java/com/zy/crm/manager/entity/Cstmr.java | 44 ++++++++++++++++++++++
src/main/resources/mapper/CstmrMapper.xml | 6 +++
src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java | 12 +++++
4 files changed, 72 insertions(+), 1 deletions(-)
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 07ed399..deb79cb 100644
--- a/src/main/java/com/zy/crm/manager/entity/Cstmr.java
+++ b/src/main/java/com/zy/crm/manager/entity/Cstmr.java
@@ -200,14 +200,58 @@
* 瀹㈡埛琛屼笟
*/
@ApiModelProperty(value= "瀹㈡埛琛屼笟")
+ @TableField("industry")
private String industry;
/**
* 浜у搧绫诲埆
*/
@ApiModelProperty(value= "浜у搧绫诲埆")
+ @TableField("product_category")
private String productCategory;
+ /**
+ * 浼佷笟淇＄敤浠ｇ爜
+ */
+ @ApiModelProperty(value= "浼佷笟淇＄敤浠ｇ爜")
+ @TableField("credit_code")
+ private String creditCode;
+
+ /**
+ * 浼佷笟鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value= "浼佷笟鍒涘缓鏃堕棿")
+ @TableField("issue_time")
+ private String issueTime;
+
+ /**
+ * 浼佷笟绫诲瀷
+ */
+ @ApiModelProperty(value= "浼佷笟绫诲瀷")
+ @TableField("company_type")
+ private String companyType;
+
+ /**
+ * 浼佷笟娉曚汉
+ */
+ @ApiModelProperty(value= "浼佷笟娉曚汉")
+ @TableField("company_person")
+ private String companyPerson;
+
+ /**
+ * 浼佷笟鐘舵��
+ */
+ @ApiModelProperty(value= "浼佷笟鐘舵��")
+ @TableField("company_status")
+ private String companyStatus;
+
+ /**
+ * 娉ㄥ唽璧勯噾
+ */
+ @ApiModelProperty(value= "娉ㄥ唽璧勯噾")
+ @TableField("reg_money")
+ private String regMoney;
+
public Cstmr() {}
public Cstmr(Long hostId,Long deptId,Long userId,Long cstmrType,String uuid,String name,String simple,String rela,String tel,String contacts,String remarks,Long director,String province,String city,String district,String town,String addr,Integer type,String files,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java b/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java
index 99e4559..e0922f4 100644
--- a/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java
+++ b/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java
@@ -55,8 +55,18 @@
JSONObject result = JSON.parseObject(jsonObject.get("result").toString());
List<JSONObject> data = JSON.parseArray(result.get("data").toString(), JSONObject.class);
for (JSONObject object : data) {
+ //灏咥PI鎺ュ彛鏁版嵁杞崲鎴愮郴缁熷畾涔夌殑鏁版嵁
+ HashMap<String, Object> objData = new HashMap<>();
+ objData.put("creditCode", object.get("creditCode"));//浼佷笟淇＄敤浠ｇ爜
+ objData.put("issueTime", object.get("issueTime"));//浼佷笟鍒涘缓鏃堕棿
+ objData.put("companyType", object.get("companyType"));//浼佷笟绫诲瀷
+ objData.put("companyPerson", object.get("faRen"));//娉曚汉
+ objData.put("companyStatus", object.get("businessStatus"));//浼佷笟鐘舵��
+ objData.put("regMoney", object.get("regMoney"));//娉ㄥ唽璧勯噾
+
+
HashMap<String, Object> map = new HashMap<>();
- map.put("value", object.get("creditCode"));
+ map.put("value", objData);
map.put("name", object.get("companyName"));
list.add(map);
}
diff --git a/src/main/resources/mapper/CstmrMapper.xml b/src/main/resources/mapper/CstmrMapper.xml
index 591178e..c0d62fc 100644
--- a/src/main/resources/mapper/CstmrMapper.xml
+++ b/src/main/resources/mapper/CstmrMapper.xml
@@ -32,6 +32,12 @@
<result column="memo" property="memo" />
<result column="industry" property="industry" />
<result column="product_category" property="productCategory" />
+ <result column="credit_code" property="creditCode" />
+ <result column="issue_time" property="issueTime" />
+ <result column="company_type" property="companyType" />
+ <result column="company_person" property="companyPerson" />
+ <result column="company_status" property="companyStatus" />
+ <result column="reg_money" property="regMoney" />
</resultMap>
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index d2c567b..5532b2e 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -286,6 +286,17 @@
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
data.field.name = loadNameXml.getValue()[0] ? loadNameXml.getValue()[0].name : null;
+ //灏嗗叕鍙告暟鎹叏閮ㄨ繑鍥�
+ companyData = loadNameXml.getValue()[0] ? loadNameXml.getValue()[0].value : null;//灏嗗叕鍙告暟鎹叏閮ㄨ繑鍥�
+ if (companyData != null) {
+ data.field.creditCode = companyData.creditCode
+ data.field.issueTime = companyData.issueTime
+ data.field.companyType = companyData.companyType
+ data.field.companyPerson = companyData.companyPerson
+ data.field.companyStatus = companyData.companyStatus
+ data.field.regMoney = companyData.regMoney
+ }
+
if (!data.field.name) {
layer.msg("瀹㈡埛鍚嶇О涓嶈兘涓虹┖", {icon: 2});
return false;
--
Gitblit v1.9.1