Browse Source

私有列表处理

anderx 8 months ago
parent
commit
1f3afd876f

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

@@ -1302,7 +1302,8 @@
 
     <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,
+        a.guidance, dg3.name as area,d.intended_project  intendedProject,d.business_scope businessScope,d.org_code orgCode,d.industry,
+        d.industry_name industryName,
         date_format(um.last_sign_time,'%Y-%m-%d %H:%i:%S') lastSignTime,a.nature,a.nature_other as natureOther,
         a.enterprise_nature as enterpriseNature,a.listed_nature as listedNature,
         date_format(a.transfer_time,'%Y-%m-%d %H:%i:%S') as transferTime,
@@ -1310,7 +1311,6 @@
         date_format(um.last_follow_time,'%Y-%m-%d %H:%i:%S') lastFollowTime,
         if(a.transfer_time &lt; um.last_follow_time,um.last_follow_time,a.transfer_time) as orderTime
         from user a left join admin b on a.aid=b.id left join organization_identity d on a.id = d.uid
-        left join industry_category ic on d.industry=ic.id
         left join district_glossory dg1 on d.location_province = dg1.id
         left join district_glossory dg2 on d.location_city = dg2.id
         left join district_glossory dg3 on d.location_area = dg3.id

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

@@ -32,6 +32,8 @@ public class CustomerListIn {
 
 	/** 行业 **/
 	private String industry;
+	private String industryName;
+
 
 	/** 共享类型 0-私有 1-公共 **/
 	private String shareType;
@@ -84,6 +86,14 @@ public class CustomerListIn {
 	private Integer enterpriseNature;
 	private Integer listedNature;
 
+	public String getIndustryName() {
+		return industryName;
+	}
+
+	public void setIndustryName(String industryName) {
+		this.industryName = industryName;
+	}
+
 	public Integer getEnterpriseNature() {
 		return enterpriseNature;
 	}