anderx 10 kuukautta sitten
vanhempi
commit
c9dea0c05e

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1283,7 +1283,7 @@
     <select id="selectPrivateOrganizationCustomerList" resultType="com.goafanti.customer.bo.CustomerListOut">
         select a.id uid,a.aid,a.nickname name,a.society_tag societyTag,a.`level`,b.name aName,dg1.name as province,dg2.name as city,
         a.guidance, dg3.name as area,d.intended_project  intendedProject,d.business_scope businessScope,d.org_code orgCode,ic.name industry,
-        date_format(um.last_sign_time,'%Y-%m-%d %H:%i:%S') lastSignTime,a.nature,
+        date_format(um.last_sign_time,'%Y-%m-%d %H:%i:%S') lastSignTime,a.nature,a.nature_other as natureOther,
         date_format(a.transfer_time,'%Y-%m-%d %H:%i:%S') as transferTime,
         date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
         date_format(um.last_follow_time,'%Y-%m-%d %H:%i:%S') lastFollowTime,

+ 1 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -541,6 +541,7 @@
 			b.business_scope businessScope,
 			b.org_code orgCode,
 			a.nature,
+			a.nature_other as natureOther,
 			d.name as adminName
 		from user a
 		left join user_mid um on a.id=um.uid

+ 9 - 0
src/main/java/com/goafanti/customer/bo/CustomerListIn.java

@@ -78,9 +78,18 @@ public class CustomerListIn {
 	 * 企业信用代码
 	 */
 	private String orgCode;
+	private String natureOther;
 
 	private Integer nature;
 
+	public String getNatureOther() {
+		return natureOther;
+	}
+
+	public void setNatureOther(String natureOther) {
+		this.natureOther = natureOther;
+	}
+
 	public Integer getNature() {
 		return nature;
 	}