Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb 8 years ago
parent
commit
eeadead62e

+ 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;
+	}
+
 }

+ 1 - 1
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -308,7 +308,7 @@ public class CognizanceApiController extends CertifyApiController {
 			fileName = pi.getPatentWritingDownloadFileName();
 			downloadUrl = pi.getPatentWritingUrl();
 		} else if (IntellectualPropertyType.COPYRIGHT.getCode() == type) {
-			CopyrightInfoDetail ci = copyrightInfoService.findByPrimaryKey(id);
+			CopyrightInfoDetail ci = copyrightInfoService.findByPrimaryKey(olp.getPid());
 			if (null == ci) {
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权ID及TYPE"));
 				return res;

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

@@ -183,6 +183,16 @@ public class PortalController extends BaseController {
 								bo.setTransferPriceS(PRICE_NEGOTIABLE);
 							}
 						}
+						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);

+ 51 - 16
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1102,18 +1102,43 @@
   
   <select id="selectAchievementSearchDetail"  resultType="com.goafanti.portal.bo.AchievementDetailBo">
   	select 
-  		a.id, a.serial_number as serialNumber, a.keyword, 
-  		a.name, a.data_category as dataCategory, a.category,
-  		ui.username, oi.unit_name as unitName, a.release_date as releaseDate,
-  		a.owner_type as ownerType, a.field_a as fieldA, a.field_b as fieldB,
-  		a.transfer_price as transferPrice, a.maturity, a.transfer_mode as transferMode,
-  		a.bargaining_mode as bargainingMode, a.summary, a.introduction,
-  		a.technical_picture_url as technicalPictureUrl, a.maturity_picture_url as maturityPictureUrl, a.maturity_text_file_url as maturityTextFileUrl,
-  		a.maturity_video_url as maturityVideoUrl, a.innovation, a.cooperation_mode as cooperationMode,
-  		a.bargaining_mode as bargainingMode, a.technical_scene as technicalScene, a.breakthrough,
-  		a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
-  		a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl,
-  		ai.id as achievementInterestId, ao.id as achievementOrderId, ao.status as orderStatus
+  		a.id, 
+  		a.owner_name as ownerName,
+  		a.serial_number as serialNumber, 
+  		a.keyword, 
+  		a.name, 
+  		a.data_category as dataCategory, 
+  		a.category,
+  		ui.username, 
+  		oi.unit_name as unitName, 
+  		a.release_date as releaseDate,
+  		a.owner_type as ownerType, 
+  		a.field_a as fieldA, 
+  		a.field_b as fieldB,
+  		a.transfer_price as transferPrice, 
+  		a.maturity, 
+  		a.transfer_mode as transferMode,
+  		a.bargaining_mode as bargainingMode, 
+  		a.summary, 
+  		a.introduction,
+  		a.technical_picture_url as technicalPictureUrl, 
+  		a.maturity_picture_url as maturityPictureUrl, 
+  		a.maturity_text_file_url as maturityTextFileUrl,
+  		a.maturity_video_url as maturityVideoUrl, 
+  		a.innovation, 
+  		a.cooperation_mode as cooperationMode,
+  		a.bargaining_mode as bargainingMode, 
+  		a.technical_scene as technicalScene, 
+  		a.breakthrough,
+  		a.patent_case as patentCase, 
+  		a.awards, 
+  		a.team_des as teamDes, 
+  		a.parameter, 
+  		a.tech_plan_url as techPlanUrl, 
+  		a.business_plan_url as businessPlanUrl,
+  		ai.id as achievementInterestId, 
+  		ao.id as achievementOrderId, 
+  		ao.status as orderStatus
   	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
@@ -1242,15 +1267,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.licence_province
+	LEFT JOIN district_glossory dgggg on dgg.id = oi.licence_city
 	WHERE
 		a.audit_status = 3
 	AND a.deleted_sign = 0
@@ -1266,15 +1296,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

+ 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 

+ 25 - 8
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -990,14 +990,31 @@
   
   <select id="selectDemandSearchDetail" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.DemandSearchDetailBo"> 
   	select 
-  		d.id, d.serial_number as serialNumber, d.keyword, 
-  		d.data_category as dataCategory, d.name, d.industry_category_a as industryCategoryA,
-  		d.industry_category_b as industryCategoryB, d.demand_type as demandType, d.budget_cost as budgetCost,
-  		d.problem_des as problemDes, d.release_date as releaseDate, d.technical_requirements as technicalRequirements,
-  		d.picture_url as pictureUrl, d.text_file_url as textFileUrl, d.video_url as videoUrl,
-  		d.fixed_cycle as fixedCycle, d.people_number as peopleNumber, d.fixed_scheme as fixedScheme,
-  		d.cost_escrow as costEscrow, d.validity_period as validityPeriod, ui.username,
-  		oi.unit_name as unitName, di.id as demandInterestId, do.id as demandOrderId, 
+  		d.id, 
+  		d.employer_name as employerName,
+  		d.serial_number as serialNumber, 
+  		d.keyword, 
+  		d.data_category as dataCategory, 
+  		d.name, 
+  		d.industry_category_a as industryCategoryA,
+  		d.industry_category_b as industryCategoryB, 
+  		d.demand_type as demandType, 
+  		d.budget_cost as budgetCost,
+  		d.problem_des as problemDes, 
+  		d.release_date as releaseDate, 
+  		d.technical_requirements as technicalRequirements,
+  		d.picture_url as pictureUrl, 
+  		d.text_file_url as textFileUrl, 
+  		d.video_url as videoUrl,
+  		d.fixed_cycle as fixedCycle, 
+  		d.people_number as peopleNumber, 
+  		d.fixed_scheme as fixedScheme,
+  		d.cost_escrow as costEscrow, 
+  		d.validity_period as validityPeriod, 
+  		ui.username,
+  		oi.unit_name as unitName, 
+  		di.id as demandInterestId, 
+  		do.id as demandOrderId, 
   		do.status as orderStatus
   	from demand d
   	left join user_identity ui on ui.uid = d.employer_id

+ 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

+ 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() {

+ 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;
+	}
+
 }