Browse Source

字长、备注等问题修复BUG修复

anderx 8 years ago
parent
commit
2c734fa903

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

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

@@ -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.tech_broker_id as techBrokerId
   		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

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

@@ -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 -->

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

+ 1 - 2
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -133,8 +133,7 @@ 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 + "}")
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private Integer remark;
 	
 	public Integer getRemark() {