Browse Source

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

Conflicts:
	src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html
albertshaw 8 years ago
parent
commit
e156d627f3

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -2860,7 +2860,7 @@ public class AdminApiController extends CertifyApiController {
 	 * 高企培育列表
 	 */
 	@RequestMapping(value = "/cultivate", method = RequestMethod.POST)
-	public Result cultivationList(String uid, Integer province, String unitName, String pageNo, String pageSize) {
+	public Result cultivationList(String uid, Integer locationProvince, String unitName, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -2870,7 +2870,7 @@ public class AdminApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgCognizanceService.listCultivation(uid, province, unitName, pNo, pSize));
+		res.setData(orgCognizanceService.listCultivation(uid, locationProvince, unitName, pNo, pSize));
 		return res;
 	}
 

+ 2 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -101,7 +101,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			params.put("uid", uid);
 		}
 
-		if (null == locationProvince) {
+		if (null != locationProvince) {
 			params.put("locationProvince", locationProvince);
 		}
 
@@ -109,7 +109,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			pageNo = 1;
 		}
 
-		if (pageSize == null || pageSize < 0) {
+		if (pageSize == null || pageSize < 0 || pageSize > 10) {
 			pageSize = 10;
 		}
 		return (Pagination<CognizanceBo>) findPage("findCognizanceBoByPage", "findCognizanceBoCount", params, pageNo,

+ 17 - 6
src/main/java/com/goafanti/common/mapper/TechProjectLogMapper.xml

@@ -115,12 +115,23 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-   <select id="selectTechProjectLogByPid" resultMap="BaseResultMap" parameterType="java.lang.String" >
-  select b.name as principal , m.operator , m.id , m.pid , m.state , m.comment , m.record_time from 
-		(select a.name as operator, p.id ,p.pid  , p.state , p.comment ,p.record_time , p.principal as pri
-		from tech_project_log p LEFT JOIN admin a 
-		on a.id = p.operator ) m LEFT JOIN admin b on m.pri = b. id
-    where pid = #{pid,jdbcType=VARCHAR} order by m.record_time 
+   <select id="selectTechProjectLogByPid" resultType="com.goafanti.common.model.TechProjectLog" parameterType="java.lang.String" >
+  	SELECT
+		tpl.id,
+		tpl.pid,
+		tpl.state ,
+		tpl.comment,
+		tpl.record_time,
+		a.name AS operator,
+		ad.name AS principal
+	FROM
+		tech_project_log tpl
+	LEFT JOIN admin a ON a.id = tpl.operator
+	LEFT JOIN admin ad ON ad.id = tpl.principal
+	WHERE
+		tpl.pid = #{pid,jdbcType=VARCHAR}
+	ORDER BY
+		tpl.record_time 
   </select>
   
    <insert id="batchInsert" parameterType="com.goafanti.common.model.TechProjectLog">

+ 2 - 2
src/main/java/com/goafanti/contract/bo/ContractClientListBo.java

@@ -106,7 +106,7 @@ public class ContractClientListBo {
 		if (this.signDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getSignDate(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getSignDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 
@@ -118,7 +118,7 @@ public class ContractClientListBo {
 		if (this.completeDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCompleteDate(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getCompleteDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 

+ 6 - 18
src/main/java/com/goafanti/contract/bo/InputSaveContract.java

@@ -1,6 +1,5 @@
 package com.goafanti.contract.bo;
 
-
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -10,22 +9,20 @@ import com.goafanti.common.constant.ErrorConstants;
 public class InputSaveContract {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	id;
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	uid;
-	
+
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer contacts;
+	private Integer	contacts;
 
 	private Integer	serialNumber;
 
-
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	type;
 
-
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	depict;
 
@@ -37,28 +34,24 @@ public class InputSaveContract {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	patentNum;
 
-
 	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	copyrightNum;
 
-
 	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	cognizanceYear;
 
-
 	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	techProjectNum;
-	
-	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String previousFee;
 
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	previousFee;
 
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	comment;
-	
+
 	public String getPreviousFee() {
 		return previousFee;
 	}
@@ -82,7 +75,6 @@ public class InputSaveContract {
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
-	
 
 	public Integer getContacts() {
 		return contacts;
@@ -108,7 +100,6 @@ public class InputSaveContract {
 		this.type = type;
 	}
 
-
 	public String getDepict() {
 		return depict;
 	}
@@ -165,7 +156,4 @@ public class InputSaveContract {
 		this.comment = comment;
 	}
 
-	
-	
-
 }

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

@@ -54,7 +54,7 @@ public class InputDemand {
 	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		technicalRequirements;
 	
-	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 1000, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		pictureUrl;
 	
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

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

@@ -172,13 +172,14 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		d.setStatus(DemandStatus.UNRESOLVED.getCode());
-		d.setAuditStatus(DemandAuditStatus.CREATE.getCode());
 		d.setReleaseStatus(DemandReleaseStatus.UNRELEASE.getCode());
 
 		d.setPrincipalId(TokenManager.getAdminId());
 		if (DemandAuditStatus.SUBMIT.getCode().equals(d.getAuditStatus())) {
 			d.setAuditStatus(DemandAuditStatus.INAUDIT.getCode());
 			createAuditorNotice(d);
+		} else {
+			d.setAuditStatus(DemandAuditStatus.CREATE.getCode());
 		}
 
 		d.setCreateTime(now.getTime());

+ 2 - 1
src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java

@@ -136,7 +136,7 @@ public class TechProjectApiController extends CertifyApiController {
 			return res;
 		}
 		TechProject tp = techProjectService.selectByPrimaryKey(pid);
-		if (null != tp.getUid() && tp.getUid().equals(TokenManager.getUserId())) {
+		if (StringUtils.isNotBlank(tp.getUid()) && tp.getUid().equals(TokenManager.getUserId())) {
 			List<TechProjectLog> list = techProjectLogService.selectTechProjectLogByPid(pid);
 			for (TechProjectLog log : list) {
 				if (TechProjectStatus.getStatus(log.getState()) == TechProjectStatus.SIGN
@@ -151,6 +151,7 @@ public class TechProjectApiController extends CertifyApiController {
 		}
 		return res;
 	}
+	
 
 	/**
 	 * update科技项目

+ 4 - 4
src/main/java/com/goafanti/user/bo/InputOrgPro.java

@@ -19,12 +19,12 @@ public class InputOrgPro {
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	companyName;
 
-	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private Integer	locationProvince;
 
-	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private Integer	locationCity;
 
 	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")

+ 1 - 4
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -556,8 +556,6 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 个人资料/团体会员资料
-	 * 
-	 * @return
 	 */
 	@RequestMapping(value = "/member", method = RequestMethod.GET)
 	public Result member() {
@@ -569,8 +567,7 @@ public class UserApiController extends BaseApiController {
 		} else {
 			OrganizationInfo o = organizationInfoService.selectOrgInfoByUserId(ub.getUid());
 			OrganizationProperties p = organizationPropertiesService.selectOrgProByUserId(ub.getUid());
-			OrgProBo bo = new OrgProBo(o, p);
-			res.setData(bo);
+			res.setData(new OrgProBo(o, p));
 		}
 		return res;
 	}

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