Antiloveg преди 8 години
родител
ревизия
d191c55c82
променени са 18 файла, в които са добавени 262 реда и са изтрити 52 реда
  1. 23 0
      schema/2017-04-26.sql
  2. 15 16
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  3. 77 0
      src/main/java/com/goafanti/admin/controller/AdminSummaryApiController.java
  4. 1 1
      src/main/java/com/goafanti/cognizance/bo/InputApplyCognizance.java
  5. 2 2
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  6. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgActivityService.java
  7. 6 1
      src/main/java/com/goafanti/cognizance/service/OrgIntellectualPropertyService.java
  8. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgActivityServiceImpl.java
  9. 57 2
      src/main/java/com/goafanti/cognizance/service/impl/OrgIntellectualPropertyServiceImpl.java
  10. 2 0
      src/main/java/com/goafanti/common/dao/OrgActivityMapper.java
  11. 2 0
      src/main/java/com/goafanti/common/dao/OrgIntellectualPropertyMapper.java
  12. 17 1
      src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml
  13. 22 0
      src/main/java/com/goafanti/common/mapper/OrgIntellectualPropertyMapper.xml
  14. 1 1
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  15. 2 2
      src/main/java/com/goafanti/patent/bo/InputPatentInfo.java
  16. 2 2
      src/main/java/com/goafanti/techproject/bo/InputTechProject.java
  17. 13 12
      src/main/java/com/goafanti/user/bo/InputOrgBasicInfo.java
  18. 13 12
      src/main/java/com/goafanti/user/bo/OrgBasicInfoBo.java

+ 23 - 0
schema/2017-04-26.sql

@@ -5,6 +5,29 @@ ADD COLUMN  `position` VARCHAR(32) NULL COMMENT '职位';
 alter table `organization_identity` 
 change  `consultant`  `tech_principal` VARCHAR(36) NULL COMMENT '高企技术负责人';
 
+alter table `copyright_log` 
+MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '备注';
+
+alter table `patent_log`
+MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '备注';
+
+alter table `patent_info`
+MODIFY COLUMN  `patent_des`  VARCHAR(128) NULL COMMENT '专利简介';
+
+alter table `tech_project_log`
+MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '备注';
+
+alter table `tech_project`
+MODIFY COLUMN  `dispatch_info`  VARCHAR(128) NULL COMMENT '派单信息';
+
+alter table `org_cognizance_log`
+MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '备注';
+
+alter table `org_cognizance`
+MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '派单信息';
+
+
+
 
 
 

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

@@ -189,14 +189,14 @@ public class AdminApiController extends CertifyApiController {
 	private CopyrightInfoService			copyrightInfoService;
 	@Resource
 	private OrgCognizanceProportionService	orgCognizanceProportionService;
-	
+
 	/**
 	 * 统计专利、软著及科技项目申报业务情况
 	 */
-	@RequestMapping(value = "/getBusinessCount", method = RequestMethod.GET )
-	public Result countBusiness(String uid){
+	@RequestMapping(value = "/getBusinessCount", method = RequestMethod.GET)
+	public Result countBusiness(String uid) {
 		Result res = new Result();
-		if (StringUtils.isBlank(uid)){
+		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户ID"));
 			return res;
 		}
@@ -1171,7 +1171,7 @@ public class AdminApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/intellectualList", method = RequestMethod.POST)
-	public Result intellectualList(String pageNo, String pageSize, String uid) {
+	public Result intellectualList(String pageNo, String pageSize, String uid, String startDate, String endDate) {
 		Result res = new Result();
 
 		if (StringUtils.isBlank(uid)) {
@@ -1189,7 +1189,7 @@ public class AdminApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, uid));
+		res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, uid, startDate, endDate));
 		return res;
 	}
 
@@ -2769,15 +2769,14 @@ public class AdminApiController extends CertifyApiController {
 	public Result disposeCenterDetail(@Valid InputOrgTechCenterDetail orgTechCenterDetail, BindingResult bindingResult,
 			String projectTimeFormattedDate, String termStartTimeFormattedDate, String termEndTimeFormattedDate) {
 		Result res = new Result();
-		
 
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					OrgTechCenterDetailFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		
-		if (StringUtils.isBlank(orgTechCenterDetail.getCid())){
+
+		if (StringUtils.isBlank(orgTechCenterDetail.getCid())) {
 			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "研发部门相关信息未保存,无法保存!"));
 			return res;
 		}
@@ -2981,7 +2980,7 @@ public class AdminApiController extends CertifyApiController {
 		List<Admin> list = adminService.selectCognizancePrincipal();
 		Map<String, String> map = new TreeMap<String, String>();
 		for (Admin o : list) {
-			map.put(o.getId(), o.getName()+ " " + o.getPosition());
+			map.put(o.getId(), o.getName() + " " + o.getPosition());
 		}
 		res.setData(map);
 		return res;
@@ -3080,16 +3079,16 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 		OrgCognizance oc = orgCognizanceService.selectByPrimaryKey(cid);
-		if (null == oc){
+		if (null == oc) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高企ID"));
 			return res;
 		}
-		
-		if (year - oc.getYear() != 0){
+
+		if (year - oc.getYear() != 0) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高企ID及年份"));
 			return res;
 		}
-		
+
 		res.setData(handleCognizanceDetail(uid, cid, year));
 		return res;
 	}
@@ -3144,8 +3143,8 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "高企认定"));
 			return res;
 		}
-		
-		if (null == cog.getYear()){
+
+		if (null == cog.getYear()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "年份"));
 			return res;
 		}

+ 77 - 0
src/main/java/com/goafanti/admin/controller/AdminSummaryApiController.java

@@ -0,0 +1,77 @@
+package com.goafanti.admin.controller;
+
+import java.util.Calendar;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.cognizance.service.OrgActivityService;
+import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.utils.StringUtils;
+@RestController
+@RequestMapping(value = "/api/admin/summary")
+public class AdminSummaryApiController extends CertifyApiController{
+	
+	private static final Integer year = Calendar.getInstance().get(Calendar.YEAR)-1;
+	@Resource
+	private OrgIntellectualPropertyService	orgIntellectualPropertyService;
+	@Resource
+	private OrgActivityService				orgActivityService;
+	
+	/**
+	 * 高企信息汇总导出--获得知识产权数量
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/intellectualProperty", method = RequestMethod.GET)
+	public Result intellectualProperty(String uid){
+		Result res = new Result();
+		if (StringUtils.isBlank(uid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户ID"));
+			return res;
+		}
+		
+		res.setData(orgIntellectualPropertyService.selectIntellectualPropertyCount(year, uid));;
+		return res;
+	}
+	
+	/**
+	 * 高企信息汇总导出--知识产权列表
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/intellectualPropertyList", method = RequestMethod.GET)
+	public Result intellectualPropertyList(String uid){
+		Result res = new Result();
+		if (StringUtils.isBlank(uid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户ID"));
+			return res;
+		}
+		res.setData(orgIntellectualPropertyService.selectIntellectualPropertyList(year, uid));
+		return res;
+	}
+	
+	/**
+	 * 高企信息汇总导出--企业研发活动列表
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/activity", method = RequestMethod.GET)
+	public Result activity(String uid){
+		Result res = new Result();
+		if (StringUtils.isBlank(uid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户ID"));
+			return res;
+		}
+		res.setData(orgActivityService.selectAcivityList(year, uid));
+		return res;
+	}
+	
+
+}

+ 1 - 1
src/main/java/com/goafanti/cognizance/bo/InputApplyCognizance.java

@@ -15,7 +15,7 @@ public class InputApplyCognizance {
 	@Min(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer contacts;
 	
-	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String comment;
 	
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

+ 2 - 2
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -1647,7 +1647,7 @@ public class CognizanceApiController extends CertifyApiController {
 	 */
 
 	@RequestMapping(value = "/intellectualList", method = RequestMethod.GET)
-	public Result intellectualList(String pageNo, String pageSize) {
+	public Result intellectualList(String pageNo, String pageSize, String startDate, String endDate) {
 		Result res = new Result();
 
 		if (!checkUserLogin(res)) {
@@ -1662,7 +1662,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, TokenManager.getUserId()));
+		res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, TokenManager.getUserId(), startDate, endDate));
 		return res;
 	}
 

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgActivityService.java

@@ -26,4 +26,6 @@ public interface OrgActivityService {
 
 	OrgActivity selectDetailByIdAndYear(String id, int year);
 
+	List<OrgActivity> selectAcivityList(Integer year, String uid);
+
 }

+ 6 - 1
src/main/java/com/goafanti/cognizance/service/OrgIntellectualPropertyService.java

@@ -2,6 +2,7 @@ package com.goafanti.cognizance.service;
 
 import java.util.List;
 
+import com.goafanti.cognizance.bo.AnnualReportPropertyRightBo;
 import com.goafanti.cognizance.bo.OrgIntellectualPropertyDetailBo;
 import com.goafanti.common.model.OrgIntellectualProperty;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -10,7 +11,7 @@ public interface OrgIntellectualPropertyService {
 
 	OrgIntellectualProperty insert(OrgIntellectualProperty orgIntellectualProperty);
 
-	Pagination<OrgIntellectualProperty> listIntellectual(Integer pNo, Integer pSize, String userId);
+	Pagination<OrgIntellectualProperty> listIntellectual(Integer pNo, Integer pSize, String userId, String startDate, String endDate );
 
 	int delete(String id);
 
@@ -26,4 +27,8 @@ public interface OrgIntellectualPropertyService {
 
 	OrgIntellectualPropertyDetailBo selectCopyrightTypeDetail(String id);
 
+	AnnualReportPropertyRightBo selectIntellectualPropertyCount(Integer year, String uid);
+
+	List<OrgIntellectualProperty> selectIntellectualPropertyList(Integer year, String uid);
+
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityServiceImpl.java

@@ -134,4 +134,9 @@ public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> im
 		}
 		return oa;
 	}
+
+	@Override
+	public List<OrgActivity> selectAcivityList(Integer year, String uid) {
+		return orgActivityMapper.selectAcivityList(year, uid);
+	}
 }

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

@@ -1,5 +1,7 @@
 package com.goafanti.cognizance.service.impl;
 
+import java.text.ParseException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -8,10 +10,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.bo.AnnualReportPropertyRightBo;
 import com.goafanti.cognizance.bo.OrgIntellectualPropertyDetailBo;
 import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.OrgAnnualReportMapper;
 import com.goafanti.common.dao.OrgIntellectualPropertyMapper;
 import com.goafanti.common.model.OrgIntellectualProperty;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 
@@ -20,6 +26,8 @@ public class OrgIntellectualPropertyServiceImpl extends BaseMybatisDao<OrgIntell
 		implements OrgIntellectualPropertyService {
 	@Autowired
 	private OrgIntellectualPropertyMapper orgIntellectualPropertyMapper;
+	@Autowired
+	private OrgAnnualReportMapper orgAnnualReportMapper;
 
 	@Override
 	public OrgIntellectualProperty insert(OrgIntellectualProperty orgIntellectualProperty) {
@@ -29,12 +37,36 @@ public class OrgIntellectualPropertyServiceImpl extends BaseMybatisDao<OrgIntell
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<OrgIntellectualProperty> listIntellectual(Integer pageNo, Integer pageSize, String uid) {
+	public Pagination<OrgIntellectualProperty> listIntellectual(Integer pageNo, Integer pageSize, String uid,
+			String startDate, String endDate) {
 		Map<String, Object> params = new HashMap<>();
-		
+		Date sDate = null;
+		Date eDate = null;
 		if (!StringUtils.isBlank(uid)){
 			params.put("uid", uid);
 		}
+		
+		if (!StringUtils.isBlank(startDate)){
+			try {
+				sDate = DateUtils.parseDate(startDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+		
+		if (StringUtils.isBlank(endDate)){
+			try {
+				eDate = DateUtils.parseDate(endDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+		
+		if (null != sDate){
+			params.put("sDate", sDate);
+		}
+		
+		if (null != eDate){
+			params.put("eDate", eDate);
+		}
 
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
@@ -82,4 +114,27 @@ public class OrgIntellectualPropertyServiceImpl extends BaseMybatisDao<OrgIntell
 		return orgIntellectualPropertyMapper.selectCopyrightTypeDetail(id);
 	}
 
+	@Override
+	public AnnualReportPropertyRightBo selectIntellectualPropertyCount(Integer year, String uid) {
+		AnnualReportPropertyRightBo p = orgAnnualReportMapper.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
+		if (null != p) {
+			p.setInventionPatent(null == p.getInventionPatent() ? 0 : p.getInventionPatent());
+			p.setDefensePatent(null == p.getDefensePatent() ? 0 : p.getDefensePatent());
+			p.setNationalCrop(null == p.getNationalCrop() ? 0 : p.getNationalCrop());
+			p.setNewPlantCariety(null == p.getNewPlantCariety() ? 0 : p.getNewPlantCariety());
+			p.setNationalDrug(null == p.getNationalDrug() ? 0 : p.getNationalDrug());
+			p.setChineseMedicine(null == p.getChineseMedicine() ? 0 : p.getChineseMedicine());
+			p.setUtilityPatent(null == p.getUtilityPatent() ? 0 : p.getUtilityPatent());
+			p.setCircuitDesign(null == p.getCircuitDesign() ? 0 : p.getCircuitDesign());
+			p.setExteriorPatent(null == p.getExteriorPatent() ? 0 : p.getExteriorPatent());
+			p.setSoftwareWorks(null == p.getSoftwareWorks() ? 0 : p.getSoftwareWorks());
+		}
+		return p;
+	}
+
+	@Override
+	public List<OrgIntellectualProperty> selectIntellectualPropertyList(Integer year, String uid) {
+		return orgIntellectualPropertyMapper.selectIntellectualPropertyList(year, uid);
+	}
+
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrgActivityMapper.java

@@ -21,4 +21,6 @@ public interface OrgActivityMapper {
 	int batchDeleteByPrimaryKey(List<String> id);
 
 	List<ActivityNumberBo> selectOrgActivityNumberBoByUid(String uid);
+
+	List<OrgActivity> selectAcivityList(Integer year, String uid);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrgIntellectualPropertyMapper.java

@@ -25,4 +25,6 @@ public interface OrgIntellectualPropertyMapper {
 	OrgIntellectualPropertyDetailBo selectPatentTypeDetail(String id);
 
 	OrgIntellectualPropertyDetailBo selectCopyrightTypeDetail(String id);
+
+	List<OrgIntellectualProperty> selectIntellectualPropertyList(Integer year, String uid);
 }

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

@@ -328,7 +328,7 @@
     <if test="endDate != null">
     	and  end_date <![CDATA[ < ]]> #{endDate,jdbcType=TIMESTAMP}
     </if>
-    order by start_date 
+    order by start_date desc
     <if test="page_sql != null">
     	${page_sql}
     </if>
@@ -370,6 +370,22 @@
   	  where uid = #{uid,jdbcType=VARCHAR} and deleted_sign = 0
   </select>
   
+  <select id="selectAcivityList" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from org_activity
+    where uid = #{1} and (
+    start_date 
+		 >= (select  str_to_date(CONCAT(#{0}-2,'-01-01'), '%Y-%m-%d %H'))
+				and  start_date   <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	)
+	or (
+	end_date 
+		 >= (select  str_to_date(CONCAT(#{0}-2,'-01-01'), '%Y-%m-%d %H'))
+				and  end_date   <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	)
+	and deleted_sign = 0
+  </select>
  <!--  <select id="selectDetailById" parameterType="java.lang.String" resultMap="BaseResultMap">
   	
   </select> -->

+ 22 - 0
src/main/java/com/goafanti/common/mapper/OrgIntellectualPropertyMapper.xml

@@ -206,6 +206,12 @@
     <if test="uid != null">
 	    and  uid = #{uid,jdbcType=VARCHAR}
 	</if>
+	<if test="sDate != null">
+		and authorization_date <![CDATA[ >= ]]> #{sDate,jdbcType=TIMESTAMP}
+	</if>
+	<if test="eDate != null">
+		and authorization_date <![CDATA[ <= ]]> #{eDate,jdbcType=TIMESTAMP}
+	</if>
 	order by authorization_date desc
     <if test="page_sql != null">
     	${page_sql}
@@ -220,6 +226,12 @@
 	    <if test="uid != null">
 		    and  uid = #{uid,jdbcType=VARCHAR}
 		</if>
+		<if test="sDate != null">
+		and authorization_date <![CDATA[ >= ]]> #{sDate,jdbcType=TIMESTAMP}
+	</if>
+	<if test="eDate != null">
+		and authorization_date <![CDATA[ <= ]]> #{eDate,jdbcType=TIMESTAMP}
+	</if>
     </select>
     
   <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
@@ -258,4 +270,14 @@
     from org_intellectual_property o LEFT JOIN copyright_info c on o.pid = c.id
     where o.id = #{id,jdbcType=VARCHAR} and o.deleted_sign = 0 and c.delete_sign = 0
   </select>
+  
+  <select id="selectIntellectualPropertyList" resultMap="BaseResultMap">
+   select 
+    <include refid="Base_Column_List" />
+    from org_intellectual_property
+    where uid = #{1} and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H'))
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+  </select>
 </mapper>

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

@@ -910,7 +910,7 @@
 		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
 		postalAddress,
-		oi.postcode, oi.contacts, oi.contact_mobile as contactMobile,
+		oi.postcode, oi.first_contacts as firstContacts, oi.first_mobile as firstMobile,
 		oi.contacts_fixed_tel as contactsFixedTel, oi.contacts_fax as
 		contactsFax,oi.legal_person_tel as legalPersonTel,
 		oi.legal_person_fax as legalPersonFax, oi.legal_person_email as legalPersonEmail,

+ 2 - 2
src/main/java/com/goafanti/patent/bo/InputPatentInfo.java

@@ -31,7 +31,7 @@ public class InputPatentInfo {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	patentField;
 
-	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	patentDes;
     
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -86,7 +86,7 @@ public class InputPatentInfo {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		principal;
 	
-	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		comment;
 	
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

+ 2 - 2
src/main/java/com/goafanti/techproject/bo/InputTechProject.java

@@ -22,7 +22,7 @@ public class InputTechProject {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		department;
 
-	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		dispatchInfo;
 
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -62,7 +62,7 @@ public class InputTechProject {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		principal;
 	
-	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		comment;
 
 	public Integer getState() {

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

@@ -56,16 +56,16 @@ public class InputOrgBasicInfo {
 	private String		postcode;
 
 	/**
-	 * 联系人姓名
+	 * 联系人姓名(第一联系人)
 	 */
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		contacts;
+	private String		firstContacts;
 
 	/**
-	 * 联系人手机
+	 * 联系人手机(第一联系人)
 	 */
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		contactMobile;
+	private String		firstMobile;
 
 	/**
 	 * 联系人电话
@@ -317,20 +317,21 @@ public class InputOrgBasicInfo {
 		this.postcode = postcode;
 	}
 
-	public String getContacts() {
-		return contacts;
+
+	public String getFirstContacts() {
+		return firstContacts;
 	}
 
-	public void setContacts(String contacts) {
-		this.contacts = contacts;
+	public void setFirstContacts(String firstContacts) {
+		this.firstContacts = firstContacts;
 	}
 
-	public String getContactMobile() {
-		return contactMobile;
+	public String getFirstMobile() {
+		return firstMobile;
 	}
 
-	public void setContactMobile(String contactMobile) {
-		this.contactMobile = contactMobile;
+	public void setFirstMobile(String firstMobile) {
+		this.firstMobile = firstMobile;
 	}
 
 	public String getContactsFixedTel() {

+ 13 - 12
src/main/java/com/goafanti/user/bo/OrgBasicInfoBo.java

@@ -48,14 +48,14 @@ public class OrgBasicInfoBo {
 	private String postcode;
 	
 	/**
-	 * 联系人姓名
+	 * 联系人姓名(第一联系人)
 	 */
-	private String contacts;
+	private String firstContacts;
 	
 	/**
-	 * 联系人手机
+	 * 联系人手机(第一联系人)
 	 */
-	private String contactMobile;
+	private String firstMobile;
 	
 	/**
 	 * 联系人电话
@@ -269,20 +269,21 @@ public class OrgBasicInfoBo {
 		this.postcode = postcode;
 	}
 
-	public String getContacts() {
-		return contacts;
+
+	public String getFirstContacts() {
+		return firstContacts;
 	}
 
-	public void setContacts(String contacts) {
-		this.contacts = contacts;
+	public void setFirstContacts(String firstContacts) {
+		this.firstContacts = firstContacts;
 	}
 
-	public String getContactMobile() {
-		return contactMobile;
+	public String getFirstMobile() {
+		return firstMobile;
 	}
 
-	public void setContactMobile(String contactMobile) {
-		this.contactMobile = contactMobile;
+	public void setFirstMobile(String firstMobile) {
+		this.firstMobile = firstMobile;
 	}
 
 	public String getContactsFixedTel() {