Browse Source

Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
	src/main/java/com/goafanti/customer/bo/CustomerOrganizationDetailBo.java
anderx 7 years ago
parent
commit
83e8af3895

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

@@ -695,6 +695,7 @@
 			a.aid as aid,
 			d.name as adminName,
 			a.information_maintainer as informationMaintainer,
+			c.name as informationMaintainerName,
 			a.core_technology as coreTechnology,
 			a. accomplish_situation as  accomplishSituation,
 			a.intellectual_property as  intellectualProperty,
@@ -707,6 +708,7 @@
 		from 
 			user a inner join organization_identity b on a.id = b.uid
 			left join admin d on d.id = a.aid
+			left join admin c on c.id = a.information_maintainer
 		where 
 			a.id = #{uid,jdbcType=VARCHAR}
 	</select>
@@ -1681,7 +1683,7 @@
 	
 	<select id="selectCustomerInformationList" resultType="com.goafanti.customer.bo.CustomerListIn">
 		select a.id,a.nickname as name,c.name as province,c1.name as city,c2.name as area,b.contacts,b.contact_mobile as contactMobile,
-			a.create_time as createTime,d.name as industry ,a.credit_rating as creditRating
+			date_format(a.create_time,'%Y-%m-%d %H:%i:%S')  as createTime,d.name as industry,a.credit_rating as creditRating
 			from user a left join organization_identity b 
 			on a.id=b.uid left join district_glossory c 
 			on b.location_province=c.id left join district_glossory c1 
@@ -1777,7 +1779,7 @@
 	
 		<select id="selectDepCustomerInformationList" resultType="com.goafanti.customer.bo.CustomerListIn">
 		select a.id,a.nickname as name,c.name as province,c1.name as city,c2.name as area,b.contacts,b.contact_mobile as contactMobile,
-			a.create_time as createTime,d.name as industry,a.credit_rating as creditRating
+			date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,d.name as industry,a.credit_rating as creditRating
 			from user a left join organization_identity b 
 			on a.id=b.uid left join district_glossory c 
 			on b.location_province=c.id left join district_glossory c1 

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

@@ -12,6 +12,9 @@ public class CustomerOrganizationDetailBo extends OrganizationIdentity{
 	
 	/**  '资料维护人'*/
 	private String informationMaintainer;
+	
+	/**  '资料维护人姓名'*/
+	private String informationMaintainerName;
 	/** '核心技术'*/
 	private String coreTechnology;
 	/** '客户已完成项目情况'*/
@@ -82,6 +85,12 @@ public class CustomerOrganizationDetailBo extends OrganizationIdentity{
 	public void setBusinessAudit(Integer businessAudit) {
 		this.businessAudit = businessAudit;
 	}
+		public String getInformationMaintainerName() {
+		return informationMaintainerName;
+	}
+	public void setInformationMaintainerName(String informationMaintainerName) {
+		this.informationMaintainerName = informationMaintainerName;
+	}
 	public Integer getCreditRating() {
 		return creditRating;
 	}