From aa5f8980f8de52b324aee50176151bdf2ef34bbd Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Tue, 30 Mar 2021 17:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E7=BB=B4?=
=?UTF-8?q?=E6=8A=A4=E7=9C=81=E5=B8=82=E5=8C=BA=E4=B8=89=E7=BA=A7=E8=81=94?=
=?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../project/benyi/domain/ByCustomer.java | 30 +++++++++++++++++++
.../mybatis/benyi/ByCustomerMapper.xml | 12 +++++++-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByCustomer.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByCustomer.java
index 9bf5905c9..1e4cf3056 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByCustomer.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByCustomer.java
@@ -95,6 +95,18 @@ public class ByCustomer extends BaseEntity {
//@Excel(name = "所在市编号")
private String shiid;
+ /**
+ * 所在区县名称
+ */
+ //@Excel(name = "所在区县")
+ private String quxian;
+
+ /**
+ * 所在区县编号
+ */
+ //@Excel(name = "所在区县编号")
+ private String quxianid;
+
/**
* 客户来源
*/
@@ -328,6 +340,8 @@ public class ByCustomer extends BaseEntity {
.append("rs", getRs())
.append("sheng", getSheng())
.append("shengid", getShengid())
+ .append("quxian", getQuxian())
+ .append("quxianid", getQuxianid())
.append("shi", getShi())
.append("shiid", getShiid())
.append("khly", getKhly())
@@ -367,4 +381,20 @@ public class ByCustomer extends BaseEntity {
public void setFpid(Long fpid) {
this.fpid = fpid;
}
+
+ public String getQuxian() {
+ return quxian;
+ }
+
+ public void setQuxian(String quxian) {
+ this.quxian = quxian;
+ }
+
+ public String getQuxianid() {
+ return quxianid;
+ }
+
+ public void setQuxianid(String quxianid) {
+ this.quxianid = quxianid;
+ }
}
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByCustomerMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByCustomerMapper.xml
index c687ecaa6..6437cdfa8 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByCustomerMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByCustomerMapper.xml
@@ -18,6 +18,8 @@
<result property="shengid" column="shengid"/>
<result property="shi" column="shi"/>
<result property="shiid" column="shiid"/>
+ <result property="quxian" column="quxian"/>
+ <result property="quxianid" column="quxianid"/>
<result property="khly" column="khly"/>
<result property="createUserid" column="create_userid"/>
<result property="fpid" column="fpid"/>
@@ -31,7 +33,7 @@
</resultMap>
<sql id="selectByCustomerVo">
- select id, name, sflx, lxdh, wx, dy, qt, fpid, schoolname, rs, sheng, shengid, shi, shiid, khly, create_userid, bz, zhgj, state, xfxm, xfjz, gbtime, create_time from by_customer
+ select id, name, sflx, lxdh, wx, dy, qt, fpid, schoolname, rs, sheng, shengid, shi, shiid,quxian, quxianid, khly, create_userid, bz, zhgj, state, xfxm, xfjz, gbtime, create_time from by_customer
</sql>
<select id="selectByCustomerList" parameterType="ByCustomer" resultMap="ByCustomerResult">
@@ -49,6 +51,8 @@
<if test="shengid != null and shengid != ''">and shengid = #{shengid}</if>
<if test="shi != null and shi != ''">and shi = #{shi}</if>
<if test="shiid != null and shiid != ''">and shiid = #{shiid}</if>
+ <if test="quxian != null and quxian != ''">and quxian = #{quxian}</if>
+ <if test="quxianid != null and quxianid != ''">and quxianid = #{quxianid}</if>
<if test="khly != null and khly != ''">and khly = #{khly}</if>
<if test="createUserid != null ">and create_userid = #{createUserid} or fpid = #{createUserid}</if>
<if test="fpid != null ">and fpid = #{fpid}</if>
@@ -83,6 +87,8 @@
<if test="shengid != null and shengid != ''">shengid,</if>
<if test="shi != null and shi != ''">shi,</if>
<if test="shiid != null and shiid != ''">shiid,</if>
+ <if test="quxian != null and quxian != ''">quxian,</if>
+ <if test="quxianid != null and quxianid != ''">quxianid,</if>
<if test="khly != null and khly != ''">khly,</if>
<if test="createUserid != null ">create_userid,</if>
<if test="fpid != null ">fpid,</if>
@@ -108,6 +114,8 @@
<if test="shengid != null and shengid != ''">#{shengid},</if>
<if test="shi != null and shi != ''">#{shi},</if>
<if test="shiid != null and shiid != ''">#{shiid},</if>
+ <if test="quxian != null and quxian != ''">#{quxian},</if>
+ <if test="quxianid != null and quxianid != ''">#{quxianid},</if>
<if test="khly != null and khly != ''">#{khly},</if>
<if test="createUserid != null ">#{createUserid},</if>
<if test="fpid != null ">#{fpid},</if>
@@ -136,6 +144,8 @@
<if test="shengid != null and shengid != ''">shengid = #{shengid},</if>
<if test="shi != null and shi != ''">shi = #{shi},</if>
<if test="shiid != null and shiid != ''">shiid = #{shiid},</if>
+ <if test="quxian != null and quxian != ''">quxian = #{quxian},</if>
+ <if test="quxianid != null and quxianid != ''">quxianid = #{quxianid},</if>
<if test="khly != null and khly != ''">khly = #{khly},</if>
<if test="createUserid != null ">create_userid = #{createUserid},</if>
<if test="fpid != null ">fpid = #{fpid},</if>