Browse Source

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

albertshaw 8 years ago
parent
commit
0e70d54abf

+ 54 - 0
src/main/java/com/goafanti/common/enums/DemandPortalSearchSignType.java

@@ -0,0 +1,54 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum DemandPortalSearchSignType {
+	ALL(0, "查询全部"),
+	NEGOATION(1,"交付意向金"),
+	OTHER(2, "其他");
+
+	private DemandPortalSearchSignType(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, DemandPortalSearchSignType> status = new HashMap<Integer, DemandPortalSearchSignType>();
+
+	static {
+		for (DemandPortalSearchSignType value : DemandPortalSearchSignType.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static DemandPortalSearchSignType getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static DemandPortalSearchSignType getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return OTHER;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+}

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

@@ -1048,10 +1048,10 @@
   		and a.maturity = #{maturity,jdbcType=INTEGER}
   	</if>
   	<if test="transferPriceLower != null">
-  		and a.transfer_price <![CDATA[ > ]]> #{transferPriceLower,jdbcType=DECIMAL}
+  		and a.transfer_price <![CDATA[ >= ]]> #{transferPriceLower,jdbcType=DECIMAL}
   	</if>
   	<if test="transferPriceUpper != null">
-  		and a.transfer_price <![CDATA[ < ]]> #{transferPriceUpper,jdbcType=DECIMAL}
+  		and a.transfer_price <![CDATA[ <= ]]> #{transferPriceUpper,jdbcType=DECIMAL}
   	</if>
   	<if test="transferMode != null">
   		and a.transfer_mode = #{transferMode,jdbcType=INTEGER}

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

@@ -525,13 +525,13 @@
 		and  d.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	<if test="vStart != null">
-	   and d.validity_veriod <![CDATA[ > ]]> #{vStart,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ >= ]]> #{vStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="vEnd != null">
-	   and d.validity_veriod <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rStart != null">
-       and	d.release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
+       and	d.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
@@ -592,10 +592,10 @@
 		and  d.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	<if test="vStart != null">
-	   and d.validity_veriod <![CDATA[ > ]]> #{vStart,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ > ]]> #{vStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="vEnd != null">
-	   and d.validity_veriod <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rStart != null">
        and	d.release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
@@ -661,13 +661,13 @@
 		and  d.release_status = #{releaseStatus,jdbcType=VARCHAR}
 	</if>
 	<if test="vStart != null">
-	   and d.validity_veriod <![CDATA[ > ]]> #{vStart,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ >= ]]> #{vStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="vEnd != null">
-	   and d.validity_veriod <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rStart != null">
-       and	d.release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
+       and	d.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
@@ -728,13 +728,13 @@
 		and  d.release_status = #{releaseStatus,jdbcType=VARCHAR}
 	</if>
 	<if test="vStart != null">
-	   and d.validity_veriod <![CDATA[ > ]]> #{vStart,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ >= ]]> #{vStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="vEnd != null">
-	   and d.validity_veriod <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rStart != null">
-       and	d.release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
+       and	d.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
@@ -931,6 +931,9 @@
   		<if test="demandType != null">
   			and d.demand_type = #{demandType,jdbcType=INTEGER}
   		</if>
+  		<if test="sign == 1">
+  			and d.budget_cost is null
+  		</if>
   		and d.deleted_sign = 0 
   		and d.release_status = 1
   		and d.audit_status = 3
@@ -963,6 +966,9 @@
   		<if test="demandType != null">
   			and d.demand_type = #{demandType,jdbcType=INTEGER}
   		</if>
+  		<if test="sign == 1">
+  			and d.budget_cost is null
+  		</if>
   		and d.deleted_sign = 0 
   		and d.release_status = 1
   		and d.audit_status = 3

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

@@ -1036,8 +1036,8 @@
 	<select id="selectBasicInfo" resultType="com.goafanti.user.bo.OrgBasicInfoBo">
 		select oi.id,
 		oi.uid as
-		uid, oi.unit_name as unitName, oi.licence_province as province,
-		oi.licence_city as city, oi.licence_area as area, oi.postal_address as
+		uid, oi.unit_name as unitName, oi.licence_province as licenceProvince,
+		oi.licence_city as licenceCity, oi.licence_area as licenceArea, oi.postal_address as
 		postalAddress,
 		oi.postcode, oi.first_contacts as firstContacts,
 		oi.first_mobile as firstMobile,

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

@@ -54,7 +54,7 @@ public interface DemandService {
 
 	void insertImport(List<DemandImportBo> data);
 
-	Pagination<DemandSearchListBo> listDemandSearchList(String keyword, Integer industryCategoryA,
+	Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer pNo, Integer pSize);
 

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

@@ -28,6 +28,7 @@ import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.DemandAuditStatus;
 import com.goafanti.common.enums.DemandInfoSourceStatus;
+import com.goafanti.common.enums.DemandPortalSearchSignType;
 import com.goafanti.common.enums.DemandReleaseStatus;
 import com.goafanti.common.enums.DemandStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
@@ -375,7 +376,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandSearchListBo> listDemandSearchList(String keyword, Integer industryCategoryA,
+	public Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
@@ -383,11 +384,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			params.put("keyword", keyword);
 		}
 
-		if (null != industryCategoryA) {
+		if (null != industryCategoryA ) {
 			params.put("industryCategoryA", industryCategoryA);
 		}
 
-		if (null != industryCategoryB) {
+		if (null != industryCategoryB ) {
 			params.put("industryCategoryB", industryCategoryB);
 		}
 
@@ -395,14 +396,18 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			params.put("demandType", demandType);
 		}
 
-		if (null != budgetCostLower) {
+		if (null != budgetCostLower && DemandPortalSearchSignType.ALL.getCode().equals(sign)) {
 			params.put("budgetCostLower", budgetCostLower);
 		}
 
-		if (null != budgetCostUpper) {
+		if (null != budgetCostUpper && DemandPortalSearchSignType.ALL.getCode().equals(sign)) {
 			params.put("budgetCostUpper", budgetCostUpper);
 		}
 
+		if (null != sign) {
+			params.put("sign", sign);
+		}
+
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}

+ 13 - 2
src/main/java/com/goafanti/portal/controller/PortalSearchApiController.java

@@ -13,6 +13,7 @@ import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.enums.DemandPortalSearchSignType;
 import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.demand.service.DemandService;
@@ -56,19 +57,29 @@ public class PortalSearchApiController extends BaseApiController {
 	 * 科技需求搜索
 	 */
 	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
-	public Result demandSearchList(String keyword, Integer industryCategoryA, Integer industryCategoryB,
+	public Result demandSearchList(Integer sign, String keyword, Integer industryCategoryA, Integer industryCategoryB,
 			Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper, String pageNo,
 			String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
+		if (null == sign) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "查询标记"));
+			return res;
+		}
+
+		if (!DemandPortalSearchSignType.ALL.getCode().equals(sign)
+				&& !DemandPortalSearchSignType.NEGOATION.getCode().equals(sign)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "查询标记"));
+			return res;
+		}
 		if (StringUtils.isNumeric(pageSize)) {
 			pSize = Integer.parseInt(pageSize);
 		}
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(demandService.listDemandSearchList(keyword, industryCategoryA, industryCategoryB, demandType,
+		res.setData(demandService.listDemandSearchList(sign, keyword, industryCategoryA, industryCategoryB, demandType,
 				budgetCostLower, budgetCostUpper, pNo, pSize));
 		return res;
 	}

+ 15 - 15
src/main/java/com/goafanti/user/bo/InputOrgBasicInfo.java

@@ -30,21 +30,21 @@ public class InputOrgBasicInfo {
 	 */
 	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer		province;
+	private Integer		licenceProvince;
 
 	/**
 	 * 行政区域--市
 	 */
 	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer		city;
+	private Integer		licenceCity;
 
 	/**
 	 * 行政区域--区
 	 */
 	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer		area;
+	private Integer		licenceArea;
 
 	/**
 	 * 通讯地址
@@ -279,28 +279,28 @@ public class InputOrgBasicInfo {
 		this.unitName = unitName;
 	}
 
-	public Integer getProvince() {
-		return province;
+	public Integer getLicenceProvince() {
+		return licenceProvince;
 	}
 
-	public void setProvince(Integer province) {
-		this.province = province;
+	public void setLicenceProvince(Integer licenceProvince) {
+		this.licenceProvince = licenceProvince;
 	}
 
-	public Integer getCity() {
-		return city;
+	public Integer getLicenceCity() {
+		return licenceCity;
 	}
 
-	public void setCity(Integer city) {
-		this.city = city;
+	public void setLicenceCity(Integer licenceCity) {
+		this.licenceCity = licenceCity;
 	}
 
-	public Integer getArea() {
-		return area;
+	public Integer getLicenceArea() {
+		return licenceArea;
 	}
 
-	public void setArea(Integer area) {
-		this.area = area;
+	public void setLicenceArea(Integer licenceArea) {
+		this.licenceArea = licenceArea;
 	}
 
 	public String getPostalAddress() {

+ 102 - 109
src/main/java/com/goafanti/user/bo/OrgBasicInfoBo.java

@@ -10,192 +10,191 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class OrgBasicInfoBo {
-	private String id;
-	
-	private String uid;
-	
-	private String hid;
-	
+	private String		id;
+
+	private String		uid;
+
+	private String		hid;
+
 	/**
 	 * 企业名称
 	 */
-	private String unitName; 
-	
-	
+	private String		unitName;
+
 	/**
 	 * 行政区域--省
 	 */
-	private Integer province;
-	
+	private Integer		licenceProvince;
+
 	/**
 	 * 行政区域--市
 	 */
-	private Integer city;
-	
+	private Integer		licenceCity;
+
 	/**
 	 * 行政区域--区
 	 */
-	private Integer area;
-	
+	private Integer		licenceArea;
+
 	/**
 	 * 通讯地址
 	 */
-	private String postalAddress;
-	
+	private String		postalAddress;
+
 	/**
 	 * 邮编
 	 */
-	private String postcode;
-	
+	private String		postcode;
+
 	/**
 	 * 联系人姓名(第一联系人)
 	 */
-	private String firstContacts;
-	
+	private String		firstContacts;
+
 	/**
 	 * 联系人手机(第一联系人)
 	 */
-	private String firstMobile;
-	
+	private String		firstMobile;
+
 	/**
 	 * 联系人电话
 	 */
-	private String contactsFixedTel;
-	
+	private String		contactsFixedTel;
+
 	/**
 	 * 联系人传真
 	 */
-	private String contactsFax;
-	
+	private String		contactsFax;
+
 	/**
 	 * 法人电话
 	 */
-	private String legalPersonTel;
-	
+	private String		legalPersonTel;
+
 	/**
 	 * 法人传真
 	 */
-	private String legalPersonFax;
-	
+	private String		legalPersonFax;
+
 	/**
 	 * 法人Email
 	 */
-	private String legalPersonEmail;
-	
+	private String		legalPersonEmail;
+
 	/**
 	 * 注册资金
 	 */
-	private BigDecimal registeredCapital;
-	
+	private BigDecimal	registeredCapital;
+
 	/**
 	 * 注册时间
 	 */
-	private Date registrationTime;
-	
+	private Date		registrationTime;
+
 	/**
 	 * 法人代表姓名
 	 */
-	private String legalPerson;
-	
+	private String		legalPerson;
+
 	/**
 	 * 法人身份证号
 	 */
-	private String legalPersonIdCard;
-	
+	private String		legalPersonIdCard;
+
 	/**
 	 * 组织机构代码/统一社会信用代码
 	 */
-	private String orgCode;
-	
+	private String		orgCode;
+
 	/**
 	 * 税务登记号/统一社会信用代码
 	 */
-	private String ratepayCode;
-	
+	private String		ratepayCode;
+
 	/**
 	 * 所属行业
 	 */
-	private Integer industry;
-	
+	private Integer		industry;
+
 	/**
 	 * 企业规模(注册资金)
 	 */
-	private Integer enterpriseScale;
-	
+	private Integer		enterpriseScale;
+
 	/**
 	 * 注册类型
 	 */
-	private String registerType;
-	
+	private String		registerType;
+
 	/**
 	 * 外资来源地
 	 */
-	private String foreignInvestment;
-	
+	private String		foreignInvestment;
+
 	/**
 	 * 领域
 	 */
-	private String field;
-	
+	private String		field;
+
 	/**
 	 * 企业所得税主管税务机关
 	 */
-	private Integer taxAuthority;
-	
+	private Integer		taxAuthority;
+
 	/**
 	 * 企业所得税征收方式
 	 */
-	private Integer ratepayMethod;
-	
+	private Integer		ratepayMethod;
+
 	/**
 	 * 是否上市
 	 */
-	private Integer listed;
-	
+	private Integer		listed;
+
 	/**
 	 * 上市时间
 	 */
-	private Date listedDate;
-	
+	private Date		listedDate;
+
 	/**
 	 * 上市类型
 	 */
-	private Integer listedType;
-	
+	private Integer		listedType;
+
 	/**
 	 * 股票代码
 	 */
-	private String stockCode;
-	
+	private String		stockCode;
+
 	/**
 	 * 是否属于国家级高新区内企业
 	 */
-	private Integer highTechZone;
-	
+	private Integer		highTechZone;
+
 	/**
 	 * 国家级高新区名称
 	 */
-	private String highTechName;
-	
+	private String		highTechName;
+
 	/**
 	 * 是否引入风险投资
 	 */
-	private Integer riskInvestment;
-	
+	private Integer		riskInvestment;
+
 	/**
 	 * 经营范围
 	 */
-	private String businessScope;
-	
+	private String		businessScope;
+
 	/**
 	 * 企业职工
 	 */
-	private Integer firmTotal;
-	
+	private Integer		firmTotal;
+
 	/**
 	 * 科技人员
 	 */
-	private Integer techTotal;
+	private Integer		techTotal;
 
 	public String getId() {
 		return id;
@@ -229,28 +228,28 @@ public class OrgBasicInfoBo {
 		this.unitName = unitName;
 	}
 
-	public Integer getProvince() {
-		return province;
+	public Integer getLicenceProvince() {
+		return licenceProvince;
 	}
 
-	public void setProvince(Integer province) {
-		this.province = province;
+	public void setLicenceProvince(Integer licenceProvince) {
+		this.licenceProvince = licenceProvince;
 	}
-	
-	public Integer getCity() {
-		return city;
+
+	public Integer getLicenceCity() {
+		return licenceCity;
 	}
 
-	public void setCity(Integer city) {
-		this.city = city;
+	public void setLicenceCity(Integer licenceCity) {
+		this.licenceCity = licenceCity;
 	}
-	
-	public Integer getArea() {
-		return area;
+
+	public Integer getLicenceArea() {
+		return licenceArea;
 	}
 
-	public void setArea(Integer area) {
-		this.area = area;
+	public void setLicenceArea(Integer licenceArea) {
+		this.licenceArea = licenceArea;
 	}
 
 	public String getPostalAddress() {
@@ -269,7 +268,6 @@ public class OrgBasicInfoBo {
 		this.postcode = postcode;
 	}
 
-
 	public String getFirstContacts() {
 		return firstContacts;
 	}
@@ -373,7 +371,7 @@ public class OrgBasicInfoBo {
 	public void setRatepayCode(String ratepayCode) {
 		this.ratepayCode = ratepayCode;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getIndustry() {
 		return industry;
@@ -382,7 +380,7 @@ public class OrgBasicInfoBo {
 	public void setIndustry(Integer industry) {
 		this.industry = industry;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getEnterpriseScale() {
 		return enterpriseScale;
@@ -391,8 +389,7 @@ public class OrgBasicInfoBo {
 	public void setEnterpriseScale(Integer enterpriseScale) {
 		this.enterpriseScale = enterpriseScale;
 	}
-	
-    
+
 	public String getRegisterType() {
 		return registerType;
 	}
@@ -416,7 +413,7 @@ public class OrgBasicInfoBo {
 	public void setField(String field) {
 		this.field = field;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTaxAuthority() {
 		return taxAuthority;
@@ -425,7 +422,7 @@ public class OrgBasicInfoBo {
 	public void setTaxAuthority(Integer taxAuthority) {
 		this.taxAuthority = taxAuthority;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getRatepayMethod() {
 		return ratepayMethod;
@@ -434,7 +431,7 @@ public class OrgBasicInfoBo {
 	public void setRatepayMethod(Integer ratepayMethod) {
 		this.ratepayMethod = ratepayMethod;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getListed() {
 		return listed;
@@ -443,7 +440,7 @@ public class OrgBasicInfoBo {
 	public void setListed(Integer listed) {
 		this.listed = listed;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getHighTechZone() {
 		return highTechZone;
@@ -452,7 +449,7 @@ public class OrgBasicInfoBo {
 	public void setHighTechZone(Integer highTechZone) {
 		this.highTechZone = highTechZone;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getRiskInvestment() {
 		return riskInvestment;
@@ -485,7 +482,7 @@ public class OrgBasicInfoBo {
 	public void setTechTotal(Integer techTotal) {
 		this.techTotal = techTotal;
 	}
-	
+
 	public Date getListedDate() {
 		return listedDate;
 	}
@@ -493,7 +490,7 @@ public class OrgBasicInfoBo {
 	public void setListedDate(Date listedDate) {
 		this.listedDate = listedDate;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getListedType() {
 		return listedType;
@@ -530,7 +527,7 @@ public class OrgBasicInfoBo {
 	public void setRegistrationTimeFormattedDate(String registrationTimeFormattedDate) {
 
 	}
-	
+
 	public String getListedDateFormattedDate() {
 		if (this.listedDate == null) {
 			return null;
@@ -542,9 +539,5 @@ public class OrgBasicInfoBo {
 	public void setListedDateFormattedDate(String listedDateFormattedDate) {
 
 	}
-	
-	
-	
-	
 
 }

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