Antiloveg 8 yıl önce
ebeveyn
işleme
867706c43b

+ 13 - 6
src/main/java/com/goafanti/achievement/bo/OrgAchievementOrderListBo.java

@@ -1,9 +1,11 @@
 package com.goafanti.achievement.bo;
 
 public class OrgAchievementOrderListBo extends AchievementOrderListBo {
-	private String uid;
-	
-	private String unitName;
+	private String	uid;
+
+	private String	unitName;
+
+	private String	username;
 
 	public String getUid() {
 		return uid;
@@ -20,8 +22,13 @@ public class OrgAchievementOrderListBo extends AchievementOrderListBo {
 	public void setUnitName(String unitName) {
 		this.unitName = unitName;
 	}
-	
-	
-	
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
 
 }

+ 14 - 5
src/main/java/com/goafanti/achievement/bo/UserAchievementOrderListBo.java

@@ -1,9 +1,11 @@
 package com.goafanti.achievement.bo;
 
 public class UserAchievementOrderListBo extends AchievementOrderListBo {
-	private String uid;
-	
-	private String username;
+	private String	uid;
+
+	private String	username;
+
+	private String	unitName;
 
 	public String getUid() {
 		return uid;
@@ -20,6 +22,13 @@ public class UserAchievementOrderListBo extends AchievementOrderListBo {
 	public void setUsername(String username) {
 		this.username = username;
 	}
-	
-	
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
 }

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

@@ -183,6 +183,11 @@ 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);
 					}
 				}
 				mv.addObject("similarList", similarList);

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

@@ -232,10 +232,11 @@
   		ao.intention_money as intentionMoney, ao.contract_money as contractMoney, ao.commission,
   		ao.service_money as serviceMoney, a.name, a.serial_number as achievementSerialNumber,
   		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ui.username,
-  		ao.uid
+  		ao.uid, oi.unit_name as unitName
   	from achievement_order ao
   	left join achievement a on a.id = ao.achievement_id
   	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
   	where ao.deleted_sign = 0 
   	and   a.deleted_sign = 0 
   	and   a.owner_type= 0
@@ -288,9 +289,10 @@
   		ao.intention_money as intentionMoney, ao.contract_money as contractMoney, ao.commission,
   		ao.service_money as serviceMoney, a.name, a.serial_number as achievementSerialNumber,
   		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ao.uid,
-  		oi.unit_name as unitName
+  		oi.unit_name as unitName, ui.username
   	from achievement_order ao
   	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
   	left join organization_identity oi on oi.uid = ao.uid
   	where ao.deleted_sign = 0 
   	and   a.deleted_sign = 0 

+ 8 - 3
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -607,9 +607,14 @@
   
   <select id="selectContractCognizanceByContractId" resultType="com.goafanti.cognizance.bo.CognizanceContractBo" parameterType="java.lang.String" >
   	select 
-  		oc.id, oc.uid, oc.contract_id as contractId,
-  		oc.year, oc.serial_number as serialNumber, oc.state, 
-  		oc.certificate_Number as certificate_number, a.name as techPrincipal
+  		oc.id, 
+  		oc.uid, 
+  		oc.contract_id as contractId,
+  		oc.year, 
+  		oc.serial_number as serialNumber, 
+  		oc.state, 
+  		oc.certificate_Number as certificateNumber, 
+  		a.name as techPrincipal
   	from org_cognizance oc 
   	left join admin a on a.id = oc.tech_principal 
   	where oc.contract_id = #{contractId,jdbcType=VARCHAR}

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -519,7 +519,7 @@
   <select id="listContractTechProjectByContractId" parameterType="java.lang.String" resultType="com.goafanti.techproject.bo.TechProjectContractListBo">
 		select 
 			tp.id, tp.uid, tp.contract_id as contractId, 
-			tp.project_name, tp.project_catagory, tp.state, 
+			tp.project_name as projectName, tp.project_catagory as projectCatagory, tp.state, 
 			tp.tech_field as techField, a.name as principle
 		from tech_project tp 
 		left join admin a on a.id = tp.principal

+ 10 - 0
src/main/java/com/goafanti/portal/bo/DemandPortalSimilarListBo.java

@@ -21,6 +21,8 @@ public class DemandPortalSimilarListBo {
 
 	private String		budgetCostS;
 
+	private String		location;
+
 	public String getBudgetCostS() {
 		return budgetCostS;
 	}
@@ -93,4 +95,12 @@ public class DemandPortalSimilarListBo {
 		this.level = level;
 	}
 
+	public String getLocation() {
+		return location;
+	}
+
+	public void setLocation(String location) {
+		this.location = location;
+	}
+
 }