Browse Source

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

anderx 8 years ago
parent
commit
a7b375be42

+ 17 - 0
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -121,6 +121,8 @@ public class AchievementListBo {
 	 */
 	private Integer hot;
 	
+	private Date createTime;
+	
 	public String getOrgId() {
 		return orgId;
 	}
@@ -346,4 +348,19 @@ public class AchievementListBo {
 	public void setHot(Integer hot) {
 		this.hot = hot;
 	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+		}
+	}
 }

+ 16 - 4
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -26,10 +26,10 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		category;
 
-	@Size(min = 0, max = 1024, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 2048, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		summary;
 
-	@Size(min = 0, max = 2048, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 4096, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		introduction;
 
 	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -105,7 +105,7 @@ public class InputAchievement {
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		technicalScene;
 
-	@Size(min = 0, max = 600, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 1024, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		breakthrough;
 
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -117,7 +117,7 @@ public class InputAchievement {
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		teamDes;
 
-	@Size(min = 0, max = 600, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 1024, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		parameter;
 
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -174,6 +174,18 @@ public class InputAchievement {
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer internationalFlag;
+	
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String remark;
+	
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
 	public Integer getInternationalFlag() {
 		return internationalFlag;
 	}

+ 5 - 1
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -14,7 +14,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.utils.StringUtils;
 @RestController
-@RequestMapping("api/admin/Varieties")
+@RequestMapping("open/api/admin/Varieties")
 public class AdminVarietiesApiController extends BaseController{
 	@Resource
 	private AdminVarietiesService adminVarietiesService;
@@ -96,6 +96,10 @@ public class AdminVarietiesApiController extends BaseController{
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "品类名称已存在", "品类名称"));
 			return res;
 		}
+		if (adminVarietiesService.ifLayer(superId)) {
+			res.getError().add(buildError( "品类层级不能超过三级", "品类层级不能超过三级"));
+			return res;
+		}
 		res.setData(adminVarietiesService.updateVarietoes(id, cname, superId, status));
 		return res; 
 	}

+ 2 - 0
src/main/java/com/goafanti/admin/service/AdminVarietiesService.java

@@ -27,4 +27,6 @@ public interface AdminVarietiesService {
 	
 	int getCountSon(String id);
 	int getLayer(String superId);
+
+	boolean ifLayer(String superId);
 }

+ 7 - 0
src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java

@@ -218,6 +218,13 @@ public class AdminVarietiesServiceImpl extends BaseMybatisDao<BusinessVarietiesM
 	public int getLayer(String superId) {
 		return businessVarietiesMapper.getLayer(superId);
 	}
+	@Override
+	public boolean ifLayer(String superId) {
+		if(businessVarietiesMapper.getLayer(superId)>2){
+			return true;
+		}
+		return false;
+	}
 	
 	
 }

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

@@ -98,7 +98,7 @@
       manager_id, salesman_id, status, 
       create_time, release_status, release_date, 
       deleted_sign, audit_status, tech_broker_id,
-      country_name_zh,international_flag,jmrh_flag,boutique)
+      country_name_zh,international_flag,jmrh_flag,boutique,remark)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{category,jdbcType=INTEGER}, 
       #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
@@ -116,7 +116,7 @@
       #{managerId,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, 
       #{deletedSign,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER}, #{techBrokerId,jdbcType=VARCHAR},
-      #{countryNameZh,jdbcType=VARCHAR}, #{internationalFlag,jdbcType=INTEGER},#{jmrhFlag,jdbcType=INTEGER},#{boutique,jdbcType=INTEGER})
+      #{countryNameZh,jdbcType=VARCHAR}, #{internationalFlag,jdbcType=INTEGER},#{jmrhFlag,jdbcType=INTEGER},#{boutique,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Achievement">
     insert into achievement
@@ -629,6 +629,9 @@
        <if test="boutique != null">
         boutique = #{boutique,jdbcType=INTEGER},
       </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -840,7 +843,7 @@
   	select 
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
-  		oi.unit_name as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,
+  		oi.unit_name as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,a.create_time as createTime,
   		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
   	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		,1 as hot
@@ -1124,7 +1127,7 @@
 		    a.create_time as createTime, a.release_status as releaseStatus,
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    oi.unit_name as iOwnerName, oi.postal_address as iOwnerPostalAddress, u.email as iOwnerEmail,
-		    oi.org_code as iOwnerIdNumber, u.mobile as iOwnerMobile,a.boutique,ifnull(mm.effective,0) hot,mm.cover_img as coverImg
+		    oi.org_code as iOwnerIdNumber, u.mobile as iOwnerMobile,a.boutique,ifnull(mm.effective,0) hot,mm.cover_img as coverImg,a.remark
     from achievement a
     left join organization_identity oi on a.owner_id = oi.uid
     left join user u on u.id = a.owner_id

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

@@ -497,7 +497,7 @@
 	  d.name, d.keyword, d.info_sources as infoSources, 
 	  ui.username, d.demand_type as demandType, d.validity_period as validityPeriod, 
 	  d.employer_name as employerName, ui.province, d.status, 
-	  d.release_status as releaseStatus, d.release_date as releaseDate, a.name as techBrokerId,
+	  d.release_status as releaseStatus, d.release_date as releaseDate, a.name as techBrokerId,d.create_time as createTime,
 	  d.employer_id as employerId, d.audit_status as auditStatus,d.boutique
 	 <if test="hot != null and hot == 1"><!-- 在首页 -->
 		,1 as hot
@@ -673,7 +673,7 @@
 	  d.name, d.keyword, d.info_sources as infoSources, 
 	  oi.unit_name as username, d.demand_type as demandType, d.validity_period as validityPeriod, 
 	  d.employer_name as employerName, oi.licence_province as province, d.status, 
-	  d.release_status as releaseStatus, d.release_date as releaseDate, a.name as techBrokerId,
+	  d.release_status as releaseStatus, d.release_date as releaseDate, a.name as techBrokerId,d.create_time as createTime,
 	  d.employer_id as employerId, d.audit_status as auditStatus,
 	  d.tech_broker_id as techBrokerId,d.boutique
 	 <if test="hot != null and hot == 1"><!-- 在首页 -->
@@ -867,7 +867,7 @@
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
   		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
   		d.tech_broker_id as techBrokerId,  u.mobile as contactsName,
-  		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg
+  		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg,d.remark
   	from demand d 
   	left join user_identity ui on ui.uid = d.employer_id
   	<!-- left join user_info info on info.uid = d.employer_id -->
@@ -916,10 +916,11 @@
   <select id="findDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
   		select 
 	  d.id, d.serial_number as serialNumber, d.data_category as dataCategory, 
-	  d.name, d.keyword, d.demand_type as demandType, 
-	  d.validity_period as validityPeriod, d.status, d.release_status as releaseStatus, 
+	  d.name, d.keyword, d.demand_type as demandType, d.remark,d.create_time as createTime,
+	  d.validity_period as validityPeriod, d.status, d.release_status as releaseStatus, ad.name  as techBrokerId,
 	  d.release_date as releaseDate, d.employer_id as employerId, d.audit_status as auditStatus
 	from  demand d 
+	LEFT JOIN admin ad on ad.id = d.tech_broker_id
 	where d.deleted_sign = 0 
 	and d.employer_id = #{employerId, jdbcType=VARCHAR}
 	<if test="serialNumber != null">
@@ -1007,7 +1008,7 @@
     	status, release_status, create_time, 
     	keyword, data_category, name,
     	demand_type, problem_des, employer_name,
-    	employer_contacts, employer_contacts_mobile, employer_contacts_mailbox, info_sources,tech_broker_id)
+    	employer_contacts, employer_contacts_mobile, employer_contacts_mailbox, info_sources,tech_broker_id,remark)
     values 
     <foreach item="item" index="index" collection="list" separator=",">
       (
@@ -1016,7 +1017,7 @@
       	#{item.keyword,jdbcType=VARCHAR}, #{item.dataCategory,jdbcType=INTEGER}, #{item.name,jdbcType=VARCHAR},
       	#{item.demandType,jdbcType=INTEGER}, #{item.problemDes,jdbcType=VARCHAR}, #{item.employerName,jdbcType=VARCHAR},
       	#{item.employerContacts,jdbcType=VARCHAR}, #{item.employerContactsMobile,jdbcType=VARCHAR}, #{item.employerContactsMailbox,jdbcType=VARCHAR},
-      	#{item.infoSources,jdbcType=INTEGER},#{item.techBrokerId,jdbcType=VARCHAR}
+      	#{item.infoSources,jdbcType=INTEGER},#{item.techBrokerId,jdbcType=VARCHAR},#{item.remark,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>

+ 10 - 0
src/main/java/com/goafanti/common/model/Achievement.java

@@ -291,6 +291,16 @@ public class Achievement {
      */
     private Integer boutique;
     
+    private String remark;
+	
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+    
 	public String getId() {
 		return id;
 	}

+ 27 - 0
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -66,6 +66,10 @@ public class DemandListBo {
 	 * 审核状态
 	 */
 	private Integer	auditStatus;
+	
+	private Date createTime;
+	
+	private String remark;
 
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
@@ -231,6 +235,29 @@ public class DemandListBo {
 		this.demandTypeS = demandTypeS;
 	}
 
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
 	
 	
 	

+ 4 - 0
src/main/java/com/goafanti/demand/bo/DemandManageListBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.demand.bo;
 
+import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
@@ -32,6 +34,8 @@ public class DemandManageListBo extends DemandListBo {
 	 * 技术经纪人
 	 */
 	private String	techBrokerId;
+	
+	
 
 	public String getTechBrokerId() {
 		return techBrokerId;

+ 4 - 5
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -133,15 +133,14 @@ public class InputDemand {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer boutique;
 	
-	@Max(value = 500, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer remark;
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String remark;
 	
-	public Integer getRemark() {
+	public String getRemark() {
 		return remark;
 	}
 
-	public void setRemark(Integer remark) {
+	public void setRemark(String remark) {
 		this.remark = remark;
 	}
 

+ 2 - 2
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -282,8 +282,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 				validityPeriodStartDate, validityPeriodEndDate, null, status, releaseStatus, releaseDateStartDate,
 				releaseDateEndDate, null, null);
 
-		params.put("employerId", TokenManager.getUserId());
-
+		params.put("employerId", "cb6336c1-5e41-431c-a531-617124f316a9");//TokenManager.getUserId()
+		
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}

+ 4 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

@@ -138,7 +138,11 @@
   		</div>
   		<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
   		<div class="process_btn">
+<<<<<<< HEAD
+  			<a href="/user/account/index.html#normal" >立即评估</a>
+=======
   			<a>立即评估</a>
+>>>>>>> branch 'patch' of https://git.coding.net/aft/AFT.git
   			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
   		</div>
   	</div>