Browse Source

我的客户资料和部门客户资料列表展示中增加:资料是否完善字段,增加搜索项。
部门客户资料中增加资料所属人字段

anderx 7 years ago
parent
commit
f6e17709a8

+ 14 - 53
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1737,20 +1737,10 @@
 			and a.create_time < #{endDate}
 			</if>
 			<if test="dataGrade ==0">
-			and b.industry is not null 
-			and b.business_scope is not null
-			and b.registered_capital is not null and b.registered_capital !=0 
-			and b.location_province is not null and b.location_province !=0 
+			and a.integrity !=1 
 			</if>
-			<if test="dataGrade !=null and dataGrade !=0">
-			and b.cooperation_situation is not null 
-			and b.qualification is not null
-			and b.assets is not null
-			and b.last_year_research_amount is not null
-			and b.year_sales_amount is not null
-			and a.core_technology is not null
-			and a.accomplish_situation is not null
-			and a.credit_rating is not null
+			<if test="dataGrade ==1">
+			and a.integrity =1
 			</if>
 		 order by a.create_time desc,a.nickname desc
 		 <if test="page_sql != null">
@@ -1793,20 +1783,10 @@
 			and a.create_time &lt; #{endDate}
 			</if>
 			<if test="dataGrade ==0">
-			and b.industry is not null 
-			and b.business_scope is not null
-			and b.registered_capital is not null and b.registered_capital !=0 
-			and b.location_province is not null and b.location_province !=0 
+			and a.integrity !=1 
 			</if>
-			<if test="dataGrade !=null and dataGrade !=0">
-			and b.cooperation_situation is not null 
-			and b.qualification is not null
-			and b.assets is not null
-			and b.last_year_research_amount is not null
-			and b.year_sales_amount is not null
-			and a.core_technology is not null
-			and a.accomplish_situation is not null
-			and a.credit_rating is not null
+			<if test="dataGrade ==1">
+			and a.integrity =1
 			</if>
 	</select>
 	
@@ -1821,6 +1801,7 @@ x.contacts,
 x.contact_mobile as contactMobile,
 date_format( x.create_time, '%Y-%m-%d %H:%i:%S' ) as createTime,
 x.industry as industry,
+y.name as iname,
 x.credit_rating as creditRating
 from(
 select
@@ -1865,25 +1846,15 @@ from
 			and a.create_time &lt; #{endDate}
 			</if>
 			<if test="dataGrade ==0">
-			and b.industry is not null 
-			and b.business_scope is not null
-			and b.registered_capital is not null and b.registered_capital !=0 
-			and b.location_province is not null and b.location_province !=0 
+			and a.integrity !=1 
 			</if>
-			<if test="dataGrade !=null and dataGrade !=0">
-			and b.cooperation_situation is not null 
-			and b.qualification is not null
-			and b.assets is not null
-			and b.last_year_research_amount is not null
-			and b.year_sales_amount is not null
-			and a.core_technology is not null
-			and a.accomplish_situation is not null
-			and a.credit_rating is not null
+			<if test="dataGrade ==1">
+			and a.integrity =1
 			</if>
 		 order by a.create_time,a.nickname desc
 )x
 inner join(
-	select id from admin a
+	select id ,name from admin a
 	inner join (select department_id as depId from admin where id= #{aid,jdbcType=VARCHAR})b on a.department_id=b.depId
 	) y on y.id = x.information_maintainer
 		 <if test="page_sql != null">
@@ -1919,20 +1890,10 @@ inner join(
 			and a.create_time &lt; #{endDate}
 			</if>
 			<if test="dataGrade ==0">
-			and b.industry is not null 
-			and b.business_scope is not null
-			and b.registered_capital is not null and b.registered_capital !=0 
-			and b.location_province is not null and b.location_province !=0 
+			and a.integrity !=1 
 			</if>
-			<if test="dataGrade !=null and dataGrade !=0">
-			and b.cooperation_situation is not null 
-			and b.qualification is not null
-			and b.assets is not null
-			and b.last_year_research_amount is not null
-			and b.year_sales_amount is not null
-			and a.core_technology is not null
-			and a.accomplish_situation is not null
-			and a.credit_rating is not null
+			<if test="dataGrade ==1">
+			and a.integrity =1
 			</if>
 	</select>
 	<select id="checkCustomerInformation" resultType="java.lang.Integer">

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

@@ -61,6 +61,8 @@ public class CustomerListIn {
 	
 	private String follow;
 	
+	private String iname;
+	
 	
 	public String getType() {
 		return type;
@@ -229,4 +231,12 @@ public class CustomerListIn {
 	public void setFollow(String follow) {
 		this.follow = follow;
 	}
+
+	public String getIname() {
+		return iname;
+	}
+
+	public void setIname(String iname) {
+		this.iname = iname;
+	}
 }