Antiloveg 8 years ago
parent
commit
058ccd6ddf

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

@@ -14,6 +14,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.enums.AchievementMaturity;
 import com.goafanti.common.enums.AchievementTransferMode;
+import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.common.service.FieldGlossoryService;
 import com.goafanti.demand.service.DemandService;
@@ -39,6 +40,8 @@ public class PortalController extends BaseController {
 
 	private static final String		PRICE_NEGOTIABLE	= "价格面议";
 
+	private static final String		UNCERTIFY			= "未认证";
+
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public String index(ModelAndView modelview) {
 		return "/index";
@@ -67,6 +70,13 @@ public class PortalController extends BaseController {
 			} else {
 				demand.setBudgetCostS(PRICE_NEGOTIABLE);
 			}
+			if (StringUtils.isBlank(demand.getEmployerName())) {
+				if (UserLevel.GENERAL.getCode().equals(demand.getLevel())) {
+					demand.setEmployerName(UNCERTIFY);
+				} else {
+					demand.setEmployerName(" ");
+				}
+			}
 			Integer industryCategoryA = demand.getIndustryCategoryA();
 			String industryCategory = "";
 			boolean a = Boolean.FALSE;
@@ -136,6 +146,13 @@ public class PortalController extends BaseController {
 			achievement = achievementService.findOrgPortalAchievementDetail(id);
 		}
 		if (null != achievement) {
+			if (StringUtils.isBlank(achievement.getOwnerName())) {
+				if (UserLevel.GENERAL.getCode().equals(achievement.getLevel())) {
+					achievement.setOwnerName(UNCERTIFY);
+				} else {
+					achievement.setOwnerName(" ");
+				}
+			}
 			Integer fieldA = achievement.getFieldA();
 			String field = "";
 			boolean a = Boolean.FALSE;

+ 8 - 2
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1147,9 +1147,12 @@
 		dgg.name as city,
 		a.technical_picture_url AS technicalPictureUrl,
 		a.transfer_mode as transferMode,
-		interest.id as interestId
+		interest.id as interestId,
+		u.lvl as level,
+		ui.username as ownerName
 	FROM
 		achievement a
+	LEFT JOIN <![CDATA[ user ]]> u on u.id = a.owner_id
 	LEFT JOIN user_identity ui ON a.owner_id = ui.uid
 	LEFT JOIN district_glossory dg on dg.id = ui.province
 	LEFT JOIN district_glossory dgg on dgg.id = ui.city
@@ -1177,9 +1180,12 @@
 		dgg.name as city,
 		a.technical_picture_url AS technicalPictureUrl,
 		a.transfer_mode as transferMode,
-		interest.id as interestId
+		interest.id as interestId,
+		u.lvl as level,
+		oi.unit_name as ownerName
 	FROM
 		achievement a
+	LEFT JOIN <![CDATA[ user ]]> u on u.id = a.owner_id
 	LEFT JOIN organization_identity oi ON a.owner_id = oi.uid
 	LEFT JOIN district_glossory dg on dg.id = oi.licence_province
 	LEFT JOIN district_glossory dgg on dgg.id = oi.licence_city

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

@@ -1041,9 +1041,12 @@
 		d.problem_des AS problemDes,
 		dg.name AS province,
 		dgg.name AS city,
-		interest.id as interestId
+		interest.id as interestId,
+		ui.username as employerName,
+		u.lvl as level
 	FROM
 		demand d
+	LEFT JOIN <![CDATA[ user ]]> u on u.id = d.employer_id
 	LEFT JOIN user_identity ui ON d.employer_id = ui.uid
 	LEFT JOIN district_glossory dg ON dg.id = ui.province
 	LEFT JOIN district_glossory dgg ON dgg.id = ui.city
@@ -1066,9 +1069,12 @@
 		d.problem_des AS problemDes,
 		dg.name AS province,
 		dgg.name AS city,
-		interest.id as interestId
+		interest.id as interestId,
+		oi.unit_name as employerName,
+		u.lvl as level
 	FROM
 		demand d
+	LEFT JOIN <![CDATA[ user ]]> u on u.id = d.employer_id
 	LEFT JOIN organization_identity oi ON d.employer_id = oi.uid
 	LEFT JOIN district_glossory dg ON dg.id = oi.licence_province
 	LEFT JOIN district_glossory dgg ON dgg.id = oi.licence_city

+ 23 - 5
src/main/java/com/goafanti/portal/bo/AchievementPortalDetailBo.java

@@ -25,8 +25,8 @@ public class AchievementPortalDetailBo {
 	private BigDecimal		transferPrice;
 
 	private String			patentCase;
-	
-	private Integer 		fieldA;
+
+	private Integer			fieldA;
 
 	private String			fieldAS;
 
@@ -53,7 +53,27 @@ public class AchievementPortalDetailBo {
 	private String			field;
 
 	private String			transferPriceS;
-	
+
+	private String			ownerName;
+
+	private Integer			level;
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+	public String getOwnerName() {
+		return ownerName;
+	}
+
+	public void setOwnerName(String ownerName) {
+		this.ownerName = ownerName;
+	}
+
 	public String getTransferPriceS() {
 		return transferPriceS;
 	}
@@ -134,7 +154,6 @@ public class AchievementPortalDetailBo {
 		this.patentCase = patentCase;
 	}
 
-
 	public Date getReleaseDate() {
 		return releaseDate;
 	}
@@ -206,7 +225,6 @@ public class AchievementPortalDetailBo {
 	public void setInterestId(String interestId) {
 		this.interestId = interestId;
 	}
-	
 
 	public Integer getFieldA() {
 		return fieldA;

+ 20 - 0
src/main/java/com/goafanti/portal/bo/DemandPortalDetailBo.java

@@ -31,6 +31,26 @@ public class DemandPortalDetailBo {
 
 	private String		industryCategory;
 
+	private String		employerName;
+
+	private Integer		level;
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+	public String getEmployerName() {
+		return employerName;
+	}
+
+	public void setEmployerName(String employerName) {
+		this.employerName = employerName;
+	}
+
 	public String getBudgetCostS() {
 		return budgetCostS;
 	}

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html


+ 7 - 0
src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html

@@ -54,6 +54,13 @@
 		<div class="detail_title" th:text="${demand.name}">铸造用高发热保温冒口套</div>
 		<div class="row">
 			<div class="col-md-6 detial_sub">
+				 <span
+					class="detial_sub_text" th:text="${demand.employerName}">
+					 </span>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-6 detial_sub">
 				<span class="detial_sub_icon"> <img
 					th:src="${portalHost} + '/img/demand_ico_1.png'" alt="行业" />
 				</span> <span class="detial_sub_title"> 行业: </span> <span