Browse Source

单位客户资料查询BUG修复,单位客户查询新增字段资料所属人

anderx 7 years ago
parent
commit
949812c5a1

+ 5 - 3
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -329,13 +329,15 @@
 			dg1.name as province,
 			dg2.name as city, 
 			dg3.name as area,
-			d.name as adminName
+			d.name as adminName,
+			e.name as informationMaintainer		
 		from user a 
 		left join organization_identity b on a.id = b.uid
 		left join district_glossory dg1 on b.location_province = dg1.id
 		left join district_glossory dg2 on b.location_city = dg2.id
 		left join district_glossory dg3 on b.location_area = dg3.id
-		left join admin d on a.aid = d.id
+		left join admin d on a.aid = d.id 
+		left join admin e on a.information_maintainer=e.id
 		where a.type = 1 and a.status != 1
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
@@ -1805,7 +1807,7 @@ from
 	on b.location_city=c1.id left join district_glossory c2 
 	on b.location_area=c2.id left join industry_category d 
 	on b.industry = d.id 
-	where 1=1
+	where 1=1 and status=0
 		<if test="type !=null and type!=''">
 			and a.`type`=#{type,jdbcType=VARCHAR}
 			</if>

+ 12 - 0
src/main/java/com/goafanti/customer/bo/CustomerListOut.java

@@ -42,6 +42,10 @@ public class CustomerListOut extends CustomerListIn{
 	
 	/** 剩余签单时间 **/
 	private String surplusSignTime;
+	
+	/** 资料所属人 **/
+	private String informationMaintainer;
+	
 	public String getAuditOpinion() {
 		return auditOpinion;
 	}
@@ -152,4 +156,12 @@ public class CustomerListOut extends CustomerListIn{
 	public void setSurplusSignTime(String surplusSignTime) {
 		this.surplusSignTime = surplusSignTime;
 	}
+
+	public String getInformationMaintainer() {
+		return informationMaintainer;
+	}
+
+	public void setInformationMaintainer(String informationMaintainer) {
+		this.informationMaintainer = informationMaintainer;
+	}
 }