Antiloveg 8 years ago
parent
commit
f75130b8a9

+ 10 - 5
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -183,11 +183,16 @@ public class PortalController extends BaseController {
 								bo.setTransferPriceS(PRICE_NEGOTIABLE);
 							}
 						}
-						String location = "";
-						String province = bo.getProvince();
-						String city = bo.getCity();
-						location += (StringUtils.isBlank(province) ? "" : province) + (StringUtils.isBlank(city) ? "" : city);
-						bo.setLocation(location);
+						String ulocation = "";
+						String uprovince = bo.getUprovince();
+						String ucity = bo.getUcity();
+						ulocation += (StringUtils.isBlank(uprovince) ? "" : uprovince) + (StringUtils.isBlank(ucity) ? "" : ucity);
+						
+						String olocation = "";
+						String oprovince = bo.getOprovince();
+						String ocity = bo.getOcity();
+						olocation += (StringUtils.isBlank(oprovince) ? "" : oprovince) + (StringUtils.isBlank(ocity) ? "" : ocity);
+						bo.setLocation(StringUtils.isNotBlank(ulocation) ? ulocation : (StringUtils.isNotBlank(olocation) ? olocation : ""));
 					}
 				}
 				mv.addObject("similarList", similarList);

+ 14 - 4
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1242,15 +1242,20 @@
 		a.id,
 		a.name,
 		a.maturity,
-		dg.name as province,
-		dgg.name as city,
+		dg.name as uprovince,
+		dgg.name as ucity,
+		dggg.name as oprovince,
+		dgggg.name as ocity,
 		a.transfer_price as transferPrice,
 		a.bargaining_mode as bargainingMode
 	FROM
 		achievement a
 	LEFT JOIN user_identity ui ON ui.uid = a.owner_id
+	LEFT JOIN organization_identity oi on oi.uid = a.owner_id
 	LEFT JOIN district_glossory dg on dg.id = ui.province
 	LEFT JOIN district_glossory dgg on dgg.id = ui.city
+	LEFT JOIN district_glossory dggg on dg.id = oi.province
+	LEFT JOIN district_glossory dgggg on dgg.id = oi.city
 	WHERE
 		a.audit_status = 3
 	AND a.deleted_sign = 0
@@ -1266,15 +1271,20 @@
 		a.id,
 		a.name,
 		a.maturity,
-		dg.name as province,
-		dgg.name as city,
+		dg.name as oprovince,
+		dgg.name as ocity,
+		dggg.name as uprovince,
+		dgggg.name as ucity,
 		a.transfer_price as transferPrice,
 		a.bargaining_mode as bargainingMode
 	FROM
 		achievement a
 	LEFT JOIN organization_identity oi ON oi.uid = a.owner_id
+	LEFT JOIN user_identity ui ON ui.uid = a.owner_id
 	LEFT JOIN district_glossory dg on dg.id = oi.licence_province
 	LEFT JOIN district_glossory dgg on dgg.id = oi.licence_city 
+	LEFT JOIN district_glossory dggg on dg.id = ui.province
+	LEFT JOIN district_glossory dgggg on dgg.id = ui.city
 	WHERE
 		a.audit_status = 3
 	AND a.deleted_sign = 0

+ 30 - 12
src/main/java/com/goafanti/portal/bo/AchievementPortalSimilarListBo.java

@@ -7,9 +7,13 @@ public class AchievementPortalSimilarListBo {
 
 	private String		name;
 
-	private String		province;
+	private String		uprovince;
 
-	private String		city;
+	private String		ucity;
+
+	private String		oprovince;
+
+	private String		ocity;
 
 	private Integer		maturity;
 
@@ -22,8 +26,6 @@ public class AchievementPortalSimilarListBo {
 	private String		transferPriceS;
 
 	private Integer		bargainingMode;
-	
-	
 
 	public Integer getBargainingMode() {
 		return bargainingMode;
@@ -81,20 +83,36 @@ public class AchievementPortalSimilarListBo {
 		this.name = name;
 	}
 
-	public String getProvince() {
-		return province;
+	public String getUprovince() {
+		return uprovince;
+	}
+
+	public void setUprovince(String uprovince) {
+		this.uprovince = uprovince;
+	}
+
+	public String getUcity() {
+		return ucity;
+	}
+
+	public void setUcity(String ucity) {
+		this.ucity = ucity;
+	}
+
+	public String getOprovince() {
+		return oprovince;
 	}
 
-	public void setProvince(String province) {
-		this.province = province;
+	public void setOprovince(String oprovince) {
+		this.oprovince = oprovince;
 	}
 
-	public String getCity() {
-		return city;
+	public String getOcity() {
+		return ocity;
 	}
 
-	public void setCity(String city) {
-		this.city = city;
+	public void setOcity(String ocity) {
+		this.ocity = ocity;
 	}
 
 	public Integer getMaturity() {