anderx лет назад: 8
Родитель
Сommit
203ca86ef8

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

@@ -117,7 +117,7 @@ public class AchievementListBo {
 	
 	
 	private String		maturityS;
 	private String		maturityS;
 	
 	
-	private String			transferModeS;
+	private String		transferModeS;
 	
 	
 	private String	ownerTypeS;
 	private String	ownerTypeS;
 	/**
 	/**
@@ -275,7 +275,7 @@ public class AchievementListBo {
 		if (this.releaseDate == null) {
 		if (this.releaseDate == null) {
 			return null;
 			return null;
 		} else {
 		} else {
-			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 		}
 	}
 	}
 
 

+ 15 - 1
src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java

@@ -86,10 +86,16 @@ public class AchievementPartnerListBo {
 	/**
 	/**
 	 * 成熟度中文描述
 	 * 成熟度中文描述
 	 */
 	 */
+	/**
+	 *  是否属于精品 0 - 否	, 1 - 是
+	 */
+	private Integer boutique;
+	
 	private String maturityS;
 	private String maturityS;
 	
 	
 	private String countInterest;
 	private String countInterest;
 	
 	
+	
 	public Integer getFieldA() {
 	public Integer getFieldA() {
 		return fieldA;
 		return fieldA;
 	}
 	}
@@ -201,7 +207,7 @@ public class AchievementPartnerListBo {
 		if (this.releaseDate == null) {
 		if (this.releaseDate == null) {
 			return null;
 			return null;
 		} else {
 		} else {
-			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 		}
 	}
 	}
 
 
@@ -244,6 +250,14 @@ public class AchievementPartnerListBo {
 	public void setCountInterest(String countInterest) {
 	public void setCountInterest(String countInterest) {
 		this.countInterest = countInterest;
 		this.countInterest = countInterest;
 	}
 	}
+
+	public Integer getBoutique() {
+		return boutique;
+	}
+
+	public void setBoutique(Integer boutique) {
+		this.boutique = boutique;
+	}
 	
 	
 	
 	
 	
 	

+ 21 - 0
src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java

@@ -1,6 +1,9 @@
 package com.goafanti.achievement.bo;
 package com.goafanti.achievement.bo;
 
 
 
 
+
+
+
 public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	
 	
 	private Integer province;
 	private Integer province;
@@ -17,6 +20,9 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	
 	
 	private String cityName;
 	private String cityName;
 	
 	
+	@SuppressWarnings("unused")
+	private String[] technicalPictureUrls;
+	
 	public String getField1() {
 	public String getField1() {
 		return field1;
 		return field1;
 	}
 	}
@@ -83,6 +89,21 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 		this.cityName = cityName;
 		this.cityName = cityName;
 	}
 	}
 
 
+	public String[] getTechnicalPictureUrls() {
+		String[] s=new String[]{};
+		if (this.technicalPictureUrl == null) {
+			return s;
+		} else {
+			String str=this.technicalPictureUrl;
+			s=str.split(",");
+			return s;
+		}
+	}
+
+	public void setTechnicalPictureUrls(String[] technicalPictureUrls) {
+		this.technicalPictureUrls = technicalPictureUrls;
+	}
+
 	
 	
 
 
 	
 	

+ 1 - 24
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -404,18 +404,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	@Override
 	public AchievementUserOwnerDetailBo selectUserOwnerDetail(String id) {
 	public AchievementUserOwnerDetailBo selectUserOwnerDetail(String id) {
 		AchievementUserOwnerDetailBo a=achievementMapper.selectUserOwnerDetail(id);
 		AchievementUserOwnerDetailBo a=achievementMapper.selectUserOwnerDetail(id);
-		if (null!=a.getFieldA()) {
-			a.setField1(fieldGlossoryMapper.selectByPrimaryKey(a.getFieldA()).getName());
-		}
-		if(null!=a.getFieldB()){
-			a.setField2(fieldGlossoryMapper.selectByPrimaryKey(Integer.valueOf(a.getFieldB())).getName());
-		}
-		if(null!=a.getFieldC()){
-			a.setField3(fieldGlossoryMapper.selectByPrimaryKey(Integer.valueOf(a.getFieldC())).getName());
-		}
-		if(null!=a.getCity()){
-			a.setCityName(districtGlossoryMapper.selectByPrimaryKey(a.getCity()).getName());
-		}
 		int i=achievementMapper.countInterest(a.getId());
 		int i=achievementMapper.countInterest(a.getId());
 		a.setCountInterest(i);
 		a.setCountInterest(i);
 		return a;
 		return a;
@@ -734,24 +722,13 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			params.put("fieldA", fieldA);
 			params.put("fieldA", fieldA);
 		}
 		}
 		if (null != dataCategory) {
 		if (null != dataCategory) {
-			System.out.println("dataCategory:"+dataCategory);
 			params.put("dataCategory", dataCategory);
 			params.put("dataCategory", dataCategory);
 		}
 		}
-		System.out.println(params);
-
 		Pagination<AchievementPartnerListBo> p=(Pagination<AchievementPartnerListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 		Pagination<AchievementPartnerListBo> p=(Pagination<AchievementPartnerListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 				params,pNo, pSize);
 				params,pNo, pSize);
+		
 		List<AchievementListBo> list=(List<AchievementListBo>) p.getList();
 		List<AchievementListBo> list=(List<AchievementListBo>) p.getList();
 		for (AchievementListBo ap : list) {
 		for (AchievementListBo ap : list) {
-			if (null!=ap.getFieldA()) {
-				ap.setField(fieldGlossoryMapper.selectByPrimaryKey(ap.getFieldA()).getName());
-			}
-			if(StringUtils.isNotBlank(ap.getFieldB())){
-				ap.setFieldB(fieldGlossoryMapper.selectByPrimaryKey(Integer.valueOf(ap.getFieldB())).getName());
-			}
-			if(StringUtils.isNotBlank(ap.getFieldC())){
-				ap.setFieldC(districtGlossoryMapper.selectByPrimaryKey(Integer.valueOf(ap.getFieldC())).getName());
-			}
 			int i=achievementMapper.countInterest(ap.getId());
 			int i=achievementMapper.countInterest(ap.getId());
 			ap.setCountInterest(String.valueOf(i));
 			ap.setCountInterest(String.valueOf(i));
 		}
 		}

+ 2 - 2
src/main/java/com/goafanti/app/controller/AppAchievementDemandController.java

@@ -82,7 +82,7 @@ public class AppAchievementDemandController extends BaseApiController {
 	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
 	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
 	public Result demandList(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer demandType,Integer industryCategoryA,
 	public Result demandList(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer demandType,Integer industryCategoryA,
 			String validityPeriodStartDate, String validityPeriodEndDate, Integer status, Integer releaseStatus,
 			String validityPeriodStartDate, String validityPeriodEndDate, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate, String pageNo, String pageSize) {
+			String releaseDateStartDate, String releaseDateEndDate, String employerId,String pageNo, String pageSize) {
 		Result res = new Result();
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pNo = 1;
 		Integer pSize = 10;
 		Integer pSize = 10;
@@ -95,7 +95,7 @@ public class AppAchievementDemandController extends BaseApiController {
 		}
 		}
 		res.setData(demandService.listAppDemand(auditStatus, serialNumber, name, keyword, demandType, industryCategoryA,
 		res.setData(demandService.listAppDemand(auditStatus, serialNumber, name, keyword, demandType, industryCategoryA,
 				validityPeriodStartDate, validityPeriodEndDate, status, releaseStatus, releaseDateStartDate,
 				validityPeriodStartDate, validityPeriodEndDate, status, releaseStatus, releaseDateStartDate,
-				releaseDateEndDate, pNo, pSize));
+				releaseDateEndDate, employerId, pNo, pSize));
 		return res;
 		return res;
 	}
 	}
 	/**
 	/**

+ 42 - 36
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1026,50 +1026,52 @@
   
   
    <select id="findAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
    <select id="findAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
   	select 
   	select 
-  		id, serial_number as serialNumber, data_category as dataCategory, 
-  		name, keyword, category, introduction,owner_postal_address as ownerPostalAddress,
-  		owner_name as ownerName, owner_type as ownerType, owner_mobile as ownerMobile,field_a as fieldA,field_b as fieldB,field_c as fieldC,
-  		status, release_date as releaseDate, audit_status as auditStatus
-  	from achievement
+  		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, a.boutique,
+  		a.name, a.keyword, a.category, a.introduction,owner_postal_address as ownerPostalAddress,
+  		a.owner_name as ownerName, a.owner_type as ownerType, a.owner_mobile as ownerMobile,a.field_a as fieldA,a.field_b ,a.field_c as fieldC,
+  		a.status, a.release_date as releaseDate, a.audit_status as auditStatus,f.name as field,f2.name as fieldB
+  	from achievement a
+  	left join field_glossory f on a.field_a=f.id
+  	left join field_glossory f2 on a.field_b=f2.id
   	where deleted_sign = 0 
   	where deleted_sign = 0 
   	<if test="ownerId != null">
   	<if test="ownerId != null">
-  	and owner_id = #{ownerId,jdbcType=VARCHAR}
+  	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
   	</if>
   	</if>
   	<if test="serialNumber != null">
   	<if test="serialNumber != null">
-		and  serial_number = #{serialNumber,jdbcType=INTEGER}
+		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	</if>
 	<if test="auditStatus != null">
 	<if test="auditStatus != null">
-		and  audit_status = #{auditStatus,jdbcType=INTEGER}
+		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	</if>
 	<if test="name != null">
 	<if test="name != null">
-		and  name = #{name,jdbcType=VARCHAR}
+		and  a.name = #{name,jdbcType=VARCHAR}
 	</if>
 	</if>
 	<if test="keyword != null">
 	<if test="keyword != null">
-		and  keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
+		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
 	</if>
 	<if test="dataCategory != null and dataCategory != ''">
 	<if test="dataCategory != null and dataCategory != ''">
-  		and data_category = #{dataCategory,jdbcType=INTEGER}
+  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   	</if>
   	</if>
   	<if test="category != null">
   	<if test="category != null">
-  		and category = #{category,jdbcType=INTEGER}
+  		and a.category = #{category,jdbcType=INTEGER}
   	</if>
   	</if>
 	<if test="ownerType != null">
 	<if test="ownerType != null">
-		and  owner_type = #{ownerType,jdbcType=INTEGER}
+		and  a.owner_type = #{ownerType,jdbcType=INTEGER}
 	</if>
 	</if>
 	<if test="fieldA != null">
 	<if test="fieldA != null">
-		and field_a  = #{fieldA,jdbcType=VARCHAR}
+		and a.field_a  = #{fieldA,jdbcType=VARCHAR}
 	</if>
 	</if>
 	<if test="status != null">
 	<if test="status != null">
-		and  status = #{status,jdbcType=INTEGER}
+		and  a.status = #{status,jdbcType=INTEGER}
 	</if>
 	</if>
 	<if test="rStart != null">
 	<if test="rStart != null">
-       and	release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
+       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
 	</if>
 	</if>
 	<if test="rEnd != null">
 	<if test="rEnd != null">
-	   and  release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
+	   and  a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
-	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
+	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>
 	
 	
 	order by serial_number desc
 	order by serial_number desc
@@ -1081,46 +1083,48 @@
   <select id="findAchievementCount" parameterType="String" resultType="java.lang.Integer">
   <select id="findAchievementCount" parameterType="String" resultType="java.lang.Integer">
   	select 
   	select 
   		count(1)
   		count(1)
-  	from achievement
+  	from achievement a
+  	left join field_glossory f on a.field_a=f.id
+  	left join field_glossory f2 on a.field_b=f2.id
   	where deleted_sign = 0 
   	where deleted_sign = 0 
-  	  	<if test="ownerId != null">
-  	and owner_id = #{ownerId,jdbcType=VARCHAR}
+	<if test="ownerId != null">
+  	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
   	</if>
   	</if>
-  	<if test="fieldA != null">
-		and field_a  = #{fieldA,jdbcType=VARCHAR}
-	</if>
   	<if test="serialNumber != null">
   	<if test="serialNumber != null">
-		and  serial_number = #{serialNumber,jdbcType=INTEGER}
+		and  a.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	</if>
 	<if test="auditStatus != null">
 	<if test="auditStatus != null">
-		and  audit_status = #{auditStatus,jdbcType=INTEGER}
+		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	</if>
 	<if test="name != null">
 	<if test="name != null">
-		and  name = #{name,jdbcType=VARCHAR}
+		and  a.name = #{name,jdbcType=VARCHAR}
 	</if>
 	</if>
 	<if test="keyword != null">
 	<if test="keyword != null">
-		and  keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
+		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
 	</if>
 	<if test="dataCategory != null and dataCategory != ''">
 	<if test="dataCategory != null and dataCategory != ''">
-  		and data_category = #{dataCategory,jdbcType=INTEGER}
+  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   	</if>
   	</if>
   	<if test="category != null">
   	<if test="category != null">
-  		and category = #{category,jdbcType=INTEGER}
+  		and a.category = #{category,jdbcType=INTEGER}
   	</if>
   	</if>
 	<if test="ownerType != null">
 	<if test="ownerType != null">
-		and  owner_type = #{ownerType,jdbcType=INTEGER}
+		and  a.owner_type = #{ownerType,jdbcType=INTEGER}
+	</if>
+	<if test="fieldA != null">
+		and a.field_a  = #{fieldA,jdbcType=VARCHAR}
 	</if>
 	</if>
 	<if test="status != null">
 	<if test="status != null">
-		and  status = #{status,jdbcType=INTEGER}
+		and  a.status = #{status,jdbcType=INTEGER}
 	</if>
 	</if>
 	<if test="rStart != null">
 	<if test="rStart != null">
-       and	release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
+       and	a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
 	</if>
 	</if>
 	<if test="rEnd != null">
 	<if test="rEnd != null">
-	   and release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
+	   and  a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
-	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
+	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>
 	</select>
 	</select>
   
   
@@ -1138,12 +1142,14 @@
 		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
 		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
 		    a.patent_case as patentCase, a.awards, a.team_des as teamDes,  a.international_flag as internationalFlag,
 		    a.patent_case as patentCase, a.awards, a.team_des as teamDes,  a.international_flag as internationalFlag,
 		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
 		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
-		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId, 
+		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId, f.name as field1,f2.name as field2,
 		    a.create_time as createTime, a.release_status as releaseStatus, 
 		    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,
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
 		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
 		    ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,a.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg
 		    ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,a.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg
     from achievement a
     from achievement a
+    left join field_glossory f on a.field_a=f.id
+    left join field_glossory f2 on a.field_b=f2.id
     left join user_identity ui on a.owner_id = ui.uid
     left join user_identity ui on a.owner_id = ui.uid
     left join user u on u.id = a.owner_id
     left join user u on u.id = a.owner_id
     left join marketing_management mm on a.id = mm.product_id
     left join marketing_management mm on a.id = mm.product_id

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

@@ -1430,7 +1430,7 @@
 	</select> 
 	</select> 
 	<select id="findAppDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
 	<select id="findAppDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
   		select 
   		select 
-	  d.id, d.serial_number as serialNumber, d.data_category as dataCategory, 
+	  d.id, d.serial_number as serialNumber, d.data_category as dataCategory, d.boutique,
 	  d.name, d.keyword, d.demand_type as demandType, d.industry_category_a as industryCategoryA, d.industry_category_b as industryCategoryB, d.industry_category_c as industryCategoryC,
 	  d.name, d.keyword, d.demand_type as demandType, d.industry_category_a as industryCategoryA, d.industry_category_b as industryCategoryB, d.industry_category_c as industryCategoryC,
 	  d.validity_period as validityPeriod, d.status, d.release_status as releaseStatus, 
 	  d.validity_period as validityPeriod, d.status, d.release_status as releaseStatus, 
 	  d.release_date as releaseDate, d.employer_id as employerId, d.audit_status as auditStatus,t.city as cityname,
 	  d.release_date as releaseDate, d.employer_id as employerId, d.audit_status as auditStatus,t.city as cityname,

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

@@ -53,7 +53,7 @@ public class Achievement {
 	/**
 	/**
 	 * 技术图片
 	 * 技术图片
 	 */
 	 */
-	private String		technicalPictureUrl;
+	protected String		technicalPictureUrl;
 
 
 	/**
 	/**
 	 * 应用领域1
 	 * 应用领域1

+ 48 - 36
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -1,5 +1,6 @@
 package com.goafanti.demand.bo;
 package com.goafanti.demand.bo;
 
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -42,6 +43,8 @@ public class DemandListBo {
 	 */
 	 */
 	private Integer	demandType;
 	private Integer	demandType;
 	private String	demandTypeS;
 	private String	demandTypeS;
+	
+	private BigDecimal budgetCost;
 
 
 	private Date	validityPeriod;
 	private Date	validityPeriod;
 
 
@@ -62,31 +65,8 @@ public class DemandListBo {
 	
 	
 	private String		IndustryCategory2;
 	private String		IndustryCategory2;
 	
 	
-	private String 		cityname;
+	private Integer 	boutique;
 	
 	
-	public String getIndustryCategory1() {
-		return IndustryCategory1;
-	}
-
-	public void setIndustryCategory1(String industryCategory1) {
-		IndustryCategory1 = industryCategory1;
-	}
-
-	public String getIndustryCategory2() {
-		return IndustryCategory2;
-	}
-
-	public void setIndustryCategory2(String industryCategory2) {
-		IndustryCategory2 = industryCategory2;
-	}
-
-	public String getIndustryCategory3() {
-		return IndustryCategory3;
-	}
-
-	public void setIndustryCategory3(String industryCategory3) {
-		IndustryCategory3 = industryCategory3;
-	}
 
 
 	private String		IndustryCategory3;
 	private String		IndustryCategory3;
 	
 	
@@ -103,8 +83,8 @@ public class DemandListBo {
 	 * 审核状态
 	 * 审核状态
 	 */
 	 */
 	private Integer	auditStatus;
 	private Integer	auditStatus;
-
-	/**
+
+	/**
 	 * 关注数量
 	 * 关注数量
 	 */
 	 */
 	private String countInterest;
 	private String countInterest;
@@ -113,14 +93,36 @@ public class DemandListBo {
 	 */
 	 */
 	private Integer  urgentDays;
 	private Integer  urgentDays;
 	private Integer urgentMoney;
 	private Integer urgentMoney;
-
-	
+
+	
 	private Date createTime;
 	private Date createTime;
 	
 	
 	private String remark;
 	private String remark;
 
 
-
-	@JsonFormat(shape = Shape.STRING)
+	@JsonFormat(shape = Shape.STRING)
+	public String getIndustryCategory1() {
+		return IndustryCategory1;
+	}
+	
+	public void setIndustryCategory1(String industryCategory1) {
+		IndustryCategory1 = industryCategory1;
+	}
+	
+	public String getIndustryCategory2() {
+		return IndustryCategory2;
+	}
+	
+	public void setIndustryCategory2(String industryCategory2) {
+		IndustryCategory2 = industryCategory2;
+	}
+	
+	public String getIndustryCategory3() {
+		return IndustryCategory3;
+	}
+	
+	public void setIndustryCategory3(String industryCategory3) {
+		IndustryCategory3 = industryCategory3;
+	}
 	public Integer getAuditStatus() {
 	public Integer getAuditStatus() {
 		return auditStatus;
 		return auditStatus;
 	}
 	}
@@ -224,7 +226,7 @@ public class DemandListBo {
 		if (this.validityPeriod == null) {
 		if (this.validityPeriod == null) {
 			return null;
 			return null;
 		} else {
 		} else {
-			return DateFormatUtils.format(this.getValidityPeriod(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getValidityPeriod(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 		}
 	}
 	}
 
 
@@ -236,7 +238,7 @@ public class DemandListBo {
 		if (this.releaseDate == null) {
 		if (this.releaseDate == null) {
 			return null;
 			return null;
 		} else {
 		} else {
-			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 		}
 	}
 	}
 
 
@@ -356,14 +358,24 @@ public class DemandListBo {
 
 
 	}
 	}
 
 
-	public String getCityname() {
-		return cityname;
+	public Integer getBoutique() {
+		return boutique;
+	}
+
+	public void setBoutique(Integer boutique) {
+		this.boutique = boutique;
 	}
 	}
 
 
-	public void setCityname(String cityname) {
-		this.cityname = cityname;
+	public BigDecimal getBudgetCost() {
+		return budgetCost;
 	}
 	}
 
 
+	public void setBudgetCost(BigDecimal budgetCost) {
+		this.budgetCost = budgetCost;
+	}
+
+	
+
 	
 	
 	
 	
 	
 	

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -87,7 +87,7 @@ public interface DemandService {
 
 
 	Pagination<DemandSearchListBo> listAppDemand(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer demandType,Integer industryCategoryA,
 	Pagination<DemandSearchListBo> listAppDemand(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer demandType,Integer industryCategoryA,
 			String validityPeriodStartDate, String validityPeriodEndDate, Integer status, Integer releaseStatus,
 			String validityPeriodStartDate, String validityPeriodEndDate, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);
+			String releaseDateStartDate, String releaseDateEndDate,String employerId, Integer pNo, Integer pSize);
 
 
 	List<?> selectinterest(String uid,Integer type);
 	List<?> selectinterest(String uid,Integer type);
 }
 }

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

@@ -788,12 +788,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			d.setIndustryCategory2(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
 			d.setIndustryCategory2(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
 		}
 		}
 		if (null!=d.getIndustryCategoryC()) {
 		if (null!=d.getIndustryCategoryC()) {
-			d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
-		}
-		if (null!=d.getEmployerId()) {
-			System.out.println();
-			d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
+			d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryC()).getName()));
 		}
 		}
+		int i=demandMapper.countInterest(d.getId());
+		d.setCountInterest(String.valueOf(i));
 		return d;
 		return d;
 	}
 	}
 
 
@@ -820,7 +818,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Override
 	@Override
 	public Pagination<DemandSearchListBo> listAppDemand(Integer auditStatus, Integer serialNumber, String name,
 	public Pagination<DemandSearchListBo> listAppDemand(Integer auditStatus, Integer serialNumber, String name,
 			String keyword, Integer demandType,Integer industryCategoryA, String validityPeriodStartDate, String validityPeriodEndDate,
 			String keyword, Integer demandType,Integer industryCategoryA, String validityPeriodStartDate, String validityPeriodEndDate,
-			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
+			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String employerId, Integer pNo,
 			Integer pSize) {
 			Integer pSize) {
 		Map<String, Object> params = disposeParams(auditStatus, null, serialNumber, name, keyword, null, demandType,
 		Map<String, Object> params = disposeParams(auditStatus, null, serialNumber, name, keyword, null, demandType,
 				validityPeriodStartDate, validityPeriodEndDate, null, status, releaseStatus, releaseDateStartDate,
 				validityPeriodStartDate, validityPeriodEndDate, null, status, releaseStatus, releaseDateStartDate,
@@ -828,8 +826,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (null!=industryCategoryA) {
 		if (null!=industryCategoryA) {
 			params.put("industryCategoryA",  industryCategoryA);
 			params.put("industryCategoryA",  industryCategoryA);
 		}
 		}
-		params.put("employerId", TokenManager.getUserId());
-
+		if (null!=employerId) {
+		params.put("employerId", employerId);
+		}
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
 		}
 		}
@@ -850,10 +849,6 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 				if (null!=d.getIndustryCategoryC()) {
 				if (null!=d.getIndustryCategoryC()) {
 					d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
 					d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
 				}
 				}
-				if (null!=d.getCityname()) {
-					d.setCityname(districtGlossoryMapper.selectNameById(Integer.valueOf(d.getCityname())));
-				}
-				
 				int i=demandMapper.countInterest(d.getId());
 				int i=demandMapper.countInterest(d.getId());
 				d.setCountInterest(String.valueOf(i));
 				d.setCountInterest(String.valueOf(i));
 			}
 			}

+ 1 - 1
src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java

@@ -199,7 +199,7 @@ public class DemandSearchListBo {
 		if (this.releaseDate == null) {
 		if (this.releaseDate == null) {
 			return null;
 			return null;
 		} else {
 		} else {
-			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getReleaseDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 		}
 	}
 	}