Antiloveg 8 years ago
parent
commit
aa561767c2
33 changed files with 1250 additions and 950 deletions
  1. 40 15
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 6 6
      src/main/java/com/goafanti/admin/controller/AdminOrgBaiscInfoApiController.java
  3. 1 1
      src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java
  4. 49 0
      src/main/java/com/goafanti/cognizance/bo/LatelyCogRecord.java
  5. 25 2
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  6. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgCognizanceProportionService.java
  7. 3 0
      src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java
  8. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceProportionServiceImpl.java
  9. 41 4
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  10. 2 0
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  11. 3 0
      src/main/java/com/goafanti/common/dao/OrgCognizanceMapper.java
  12. 1 1
      src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java
  13. 4 4
      src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml
  14. 2 2
      src/main/java/com/goafanti/common/mapper/LegalPersonOwnershipMapper.xml
  15. 2 2
      src/main/java/com/goafanti/common/mapper/NatureOwnershipMapper.xml
  16. 12 6
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  17. 933 857
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  18. 3 3
      src/main/java/com/goafanti/common/mapper/PatentCostMapper.xml
  19. 8 8
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  20. 3 3
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  21. 9 8
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  22. 4 1
      src/main/java/com/goafanti/common/model/TechProject.java
  23. 43 18
      src/main/java/com/goafanti/common/utils/TimeUtils.java
  24. 10 1
      src/main/java/com/goafanti/copyright/bo/CopyrightInfoDetail.java
  25. 11 1
      src/main/java/com/goafanti/patent/bo/PatentInfoDetailBo.java
  26. 4 1
      src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java
  27. 11 0
      src/main/java/com/goafanti/techproject/bo/TechProjectDetailBo.java
  28. 2 1
      src/main/java/com/goafanti/user/bo/InputOrgBasicInfo.java
  29. 7 1
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  30. 1 1
      src/main/resources/props/config_dev.properties
  31. 1 1
      src/main/resources/props/config_local.properties
  32. 1 1
      src/main/resources/props/config_prod.properties
  33. 1 1
      src/main/resources/props/config_test.properties

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

@@ -45,6 +45,7 @@ import com.goafanti.cognizance.bo.InputOrgTechAchievement;
 import com.goafanti.cognizance.bo.InputOrgTechCenter;
 import com.goafanti.cognizance.bo.InputOrgTechCenterDetail;
 import com.goafanti.cognizance.bo.InputOrgTechProduct;
+import com.goafanti.cognizance.bo.LatelyCogRecord;
 import com.goafanti.cognizance.bo.OrgIntellectualPropertyDetailBo;
 import com.goafanti.cognizance.service.OrgActivityCostService;
 import com.goafanti.cognizance.service.OrgActivityService;
@@ -117,6 +118,7 @@ import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
 import com.goafanti.copyright.service.CopyrightInfoService;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -193,10 +195,10 @@ public class AdminApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/confirmProportion", method = RequestMethod.POST)
-	public Result confirmProportion(String id, String sign, Integer status) {
+	public Result confirmProportion(String id, String uid, String sign, Integer status) {
 		Result res = new Result();
-		if (StringUtils.isBlank(id)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到比重ID", "比重ID"));
+		if (StringUtils.isBlank(uid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户ID"));
 			return res;
 		}
 
@@ -214,14 +216,22 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "资料完成状态"));
 			return res;
 		}
+		
+		if (null == id){
+			OrgCognizanceProportion cp = new OrgCognizanceProportion();
+			cp.setId(UUID.randomUUID().toString());
+			cp.setUid(uid);
+			res.setData(orgCognizanceProportionService.insert(disposeProportionStatus(sign, status, cp)));
+			return res;
+		}
 
 		OrgCognizanceProportion ocp = orgCognizanceProportionService.selectByPrimaryKey(id);
 		if (null == ocp) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "比重ID"));
 			return res;
 		}
-
-		return disposeProportionStatus(res, sign, status, ocp);
+		res.setData(orgCognizanceProportionService.updateByPrimaryKeySelective(disposeProportionStatus(sign, status, ocp)));
+		return res;
 	}
 
 	/**
@@ -2968,11 +2978,31 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, cog.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		if (null != orgCognizanceService.selectCognizanceByUidAndYear(cog.getYear(), cog.getUid())) {
-			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
+
+		LatelyCogRecord lcr = orgCognizanceService.selectLatelyRecord(cog.getUid());
+
+		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() != lcr.getState()
+				&& OrgCognizanceStatus.FOSTER.getCode() != lcr.getState()
+				&& OrgCognizanceStatus.CALLBACK.getCode() != lcr.getState()) {
+			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企申请中!无法提交新申请!"));
 			return res;
 		}
 
+		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() == lcr.getState()) {
+			if (null == lcr.getIssuingDate()) {
+				res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企申请中!无法提交新申请!"));
+				return res;
+			}
+			try {
+				if (Boolean.FALSE == TimeUtils.checkCogExpire(lcr.getIssuingDate())) {
+					res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企认定未过期,无法提交新申请!"));
+					return res;
+				}
+			} catch (ParseException e) {
+			}
+
+		}
+
 		OrgCognizance oc = new OrgCognizance();
 		BeanUtils.copyProperties(cog, oc);
 		orgCognizanceService.insertCognizance(oc, TokenManager.getAdminId());
@@ -3395,8 +3425,8 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return status;
 	}
-	
-	private Result disposeProportionStatus(Result res, String sign, Integer status, OrgCognizanceProportion ocp){
+
+	private OrgCognizanceProportion disposeProportionStatus(String sign, Integer status, OrgCognizanceProportion ocp) {
 		if (ProprotionFields.INSTITUTION.getCode().equals(sign)) {
 			if (ProportionStatus.FINISHED.getCode() == status) {
 				ocp.setInstitution(ProportionStatus.FINISHED.getCode());
@@ -3469,13 +3499,8 @@ public class AdminApiController extends CertifyApiController {
 			} else {
 				ocp.setAbility(ProportionStatus.UNFINISHED.getCode());
 			}
-		} else {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "类别标记"));
-			return res;
 		}
-
-		res.setData(orgCognizanceProportionService.updateByPrimaryKeySelective(ocp));
-		return res;
+		return ocp;
 	}
 
 	/*

+ 6 - 6
src/main/java/com/goafanti/admin/controller/AdminOrgBaiscInfoApiController.java

@@ -55,8 +55,8 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/disposeInfo", method = RequestMethod.POST)
-	public Result disposeInfo(@Valid InputOrgBasicInfo info, String listedDateFormattedDate,
-			String registrationTimeFormattedDate, BindingResult bindingResult) {
+	public Result disposeInfo(@Valid InputOrgBasicInfo info, BindingResult bindingResult,
+			String listedDateFormattedDate, String registrationTimeFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -75,7 +75,7 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 			try {
 				listedDate = DateUtils.parseDate(listedDateFormattedDate, AFTConstants.YYYYMMDD);
 			} catch (ParseException e) {
-				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "listedDateFormattedDate"));
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "上市时间"));
 				return res;
 			}
 		}
@@ -84,7 +84,7 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 			try {
 				registrationTime = DateUtils.parseDate(registrationTimeFormattedDate, AFTConstants.YYYYMMDD);
 			} catch (ParseException e) {
-				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "registrationTimeFormattedDate"));
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "注册时间"));
 				return res;
 			}
 		}
@@ -98,8 +98,8 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 		if (null != listedDate) {
 			oi.setListedDate(listedDate);
 		}
-		
-		if (null != registrationTime){
+
+		if (null != registrationTime) {
 			oi.setRegistrationTime(registrationTime);
 		}
 		ohr.setId(info.getHid());

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java

@@ -107,7 +107,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/listTechProject", method = RequestMethod.POST)
-	public Result listClientTechProject(String province, String unitName, String pageNo, String pageSize) {
+	public Result listTechProject(String province, String unitName, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;

+ 49 - 0
src/main/java/com/goafanti/cognizance/bo/LatelyCogRecord.java

@@ -0,0 +1,49 @@
+package com.goafanti.cognizance.bo;
+
+import java.util.Date;
+
+public class LatelyCogRecord {
+	
+	private String id;
+	
+	private Date issuingDate;
+	
+	private Integer state;
+	
+	private Date recordTime;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Date getIssuingDate() {
+		return issuingDate;
+	}
+
+	public void setIssuingDate(Date issuingDate) {
+		this.issuingDate = issuingDate;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public Date getRecordTime() {
+		return recordTime;
+	}
+
+	public void setRecordTime(Date recordTime) {
+		this.recordTime = recordTime;
+	}
+	
+	
+
+}

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

@@ -40,6 +40,7 @@ import com.goafanti.cognizance.bo.InputOrgTechAchievement;
 import com.goafanti.cognizance.bo.InputOrgTechCenter;
 import com.goafanti.cognizance.bo.InputOrgTechCenterDetail;
 import com.goafanti.cognizance.bo.InputOrgTechProduct;
+import com.goafanti.cognizance.bo.LatelyCogRecord;
 import com.goafanti.cognizance.bo.OrgIntellectualPropertyDetailBo;
 import com.goafanti.cognizance.service.OrgActivityCostService;
 import com.goafanti.cognizance.service.OrgActivityService;
@@ -97,6 +98,7 @@ import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.FileUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
 import com.goafanti.copyright.service.CopyrightInfoService;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -2254,10 +2256,31 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (null != orgCognizanceService.selectCognizanceByUidAndYear(cog.getYear(), TokenManager.getUserId())) {
-			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
+		LatelyCogRecord lcr = orgCognizanceService.selectLatelyRecord(TokenManager.getUserId());
+
+		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() != lcr.getState()
+				&& OrgCognizanceStatus.FOSTER.getCode() != lcr.getState()
+				&& OrgCognizanceStatus.CALLBACK.getCode() != lcr.getState()) {
+			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企申请中!无法提交新申请!"));
 			return res;
 		}
+
+		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() == lcr.getState()) {
+			if (null == lcr.getIssuingDate()) {
+				res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企申请中!无法提交新申请!"));
+				return res;
+			}
+			try {
+				if (Boolean.FALSE == TimeUtils.checkCogExpire(lcr.getIssuingDate())) {
+					res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企认定未过期,无法提交新申请!"));
+					return res;
+				}
+			} catch (ParseException e) {
+			}
+
+		}
+
+		
 		OrgCognizance oc = new OrgCognizance();
 		BeanUtils.copyProperties(cog, oc);
 		oc.setUid(TokenManager.getUserId());

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

@@ -10,4 +10,6 @@ public interface OrgCognizanceProportionService {
 
 	int updateByPrimaryKeySelective(OrgCognizanceProportion ocp);
 
+	int insert(OrgCognizanceProportion cp);
+
 }

+ 3 - 0
src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java

@@ -11,6 +11,7 @@ import com.goafanti.cognizance.bo.CognizanceManageCostBo;
 import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
 import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
 import com.goafanti.cognizance.bo.CultivationListBo;
+import com.goafanti.cognizance.bo.LatelyCogRecord;
 import com.goafanti.common.model.OrgCognizance;
 import com.goafanti.common.model.OrgCognizanceLog;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -47,5 +48,7 @@ public interface OrgCognizanceService {
 
 	OrgCognizance selectByPrimaryKey(String id);
 
+	LatelyCogRecord selectLatelyRecord(String uid);
+
 
 }

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

@@ -26,4 +26,9 @@ public class OrgCognizanceProportionServiceImpl implements OrgCognizanceProporti
 		return orgCognizanceProportionMapper.updateByPrimaryKeySelective(ocp);
 	}
 
+	@Override
+	public int insert(OrgCognizanceProportion cp) {
+		return orgCognizanceProportionMapper.insert(cp);
+	}
+
 }

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

@@ -19,19 +19,23 @@ import com.goafanti.cognizance.bo.CognizanceManageCostBo;
 import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
 import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
 import com.goafanti.cognizance.bo.CultivationListBo;
+import com.goafanti.cognizance.bo.LatelyCogRecord;
 import com.goafanti.cognizance.service.OrgCognizanceService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrgCognizanceLogMapper;
 import com.goafanti.common.dao.OrgCognizanceMapper;
+import com.goafanti.common.dao.OrgCognizanceProportionMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.enums.CopyrightStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrgCognizanceStatus;
+import com.goafanti.common.enums.ProportionStatus;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrgCognizance;
 import com.goafanti.common.model.OrgCognizanceLog;
+import com.goafanti.common.model.OrgCognizanceProportion;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -40,13 +44,15 @@ import com.goafanti.core.shiro.token.TokenManager;
 @Service
 public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper> implements OrgCognizanceService {
 	@Autowired
-	private OrgCognizanceMapper			orgCognizanceMapper;
+	private OrgCognizanceMapper				orgCognizanceMapper;
 	@Autowired
-	private OrgCognizanceLogMapper		orgCognizanceLogMapper;
+	private OrgCognizanceLogMapper			orgCognizanceLogMapper;
 	@Autowired
-	private OrganizationIdentityMapper	organizationIdentityMapper;
+	private OrganizationIdentityMapper		organizationIdentityMapper;
 	@Autowired
-	private NoticeMapper				noticeMapper;
+	private NoticeMapper					noticeMapper;
+	@Autowired
+	private OrgCognizanceProportionMapper	orgCognizanceProportionMapper;
 
 	@Override
 	public OrgCognizance insert(OrgCognizance c) {
@@ -248,6 +254,16 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		}
 		log.setComment(c.getComment());
 		orgCognizanceLogMapper.insert(log);
+		
+		OrgCognizanceProportion ocp = orgCognizanceProportionMapper.selectByUid(c.getUid());
+		if (null == ocp){
+			OrgCognizanceProportion o = new OrgCognizanceProportion();
+			o.setId(UUID.randomUUID().toString());
+			o.setUid(c.getUid());
+			orgCognizanceProportionMapper.insert(o);
+		} else {
+			orgCognizanceProportionMapper.updateByPrimaryKeySelective(disposeProportion(ocp));
+		}
 
 	}
 
@@ -299,4 +315,25 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	public OrgCognizance selectByPrimaryKey(String id) {
 		return orgCognizanceMapper.selectByPrimaryKey(id);
 	}
+
+	@Override
+	public LatelyCogRecord selectLatelyRecord(String uid) {
+		return orgCognizanceMapper.selectLatelyRecord(uid);
+	}
+	
+	private OrgCognizanceProportion disposeProportion(OrgCognizanceProportion o){
+		o.setAbility(ProportionStatus.UNFINISHED.getCode());
+		o.setAchievement(ProportionStatus.UNFINISHED.getCode());
+		o.setActivity(ProportionStatus.UNFINISHED.getCode());
+		o.setActivityCost(ProportionStatus.UNFINISHED.getCode());
+		o.setFinance(ProportionStatus.UNFINISHED.getCode());
+		o.setHonorDatum(ProportionStatus.UNFINISHED.getCode());
+		o.setHumanResource(ProportionStatus.UNFINISHED.getCode());
+		o.setInstitution(ProportionStatus.UNFINISHED.getCode());
+		o.setIntellectualProperty(ProportionStatus.UNFINISHED.getCode());
+		o.setRatepay(ProportionStatus.UNFINISHED.getCode());
+		o.setStandard(ProportionStatus.UNFINISHED.getCode());
+		o.setTechProject(ProportionStatus.UNFINISHED.getCode());
+		return o;
+	}
 }

+ 2 - 0
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -68,4 +68,6 @@ public class ErrorConstants {
 
 	public static final String	RECORD_SETTLEMENT				= "RECORD_SETTLEMENT";
 
+	public static final String	STATUS_ERROR					= "STATUS_ERROR";
+
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/OrgCognizanceMapper.java

@@ -7,6 +7,7 @@ import com.goafanti.cognizance.bo.CognizanceCatagoryBo;
 import com.goafanti.cognizance.bo.CognizanceManageCostBo;
 import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
 import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
+import com.goafanti.cognizance.bo.LatelyCogRecord;
 import com.goafanti.common.model.OrgCognizance;
 
 public interface OrgCognizanceMapper {
@@ -35,4 +36,6 @@ public interface OrgCognizanceMapper {
 	OrgCognizance selectCognizanceByUidAndYear(Integer year, String uid);
 
 	int batchDeleteByPrimaryKey(List<String> id);
+
+	LatelyCogRecord selectLatelyRecord(String uid);
 }

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

@@ -23,7 +23,7 @@ public interface OrganizationIdentityMapper {
 
 	OrgIdentityBo selectOrgIdentityBoByUserId(String uid);
 
-	List<OrganizationIdentity> selectAllOrgIndentity();
+	List<OrganizationIdentity> selectAllOrgIndentity(String aid);
 
 	OrgBasicInfoBo selectBasicInfo(String uid, int year);
 }

+ 4 - 4
src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml

@@ -264,7 +264,7 @@
 	ci.accept_time as acceptTime, ci.contact,
 	ci.copyright_name as copyrightName, ci.status, ci.comment, ci.outsource, ci.in_urgent as inUrgent, 
 	ci.authorized_date as authorizedDate, ci.work_issue as workIssue, ci.copyright_number as copyrightNumber,
-	oi.location_province as province,oi.unit_name as unitName, 
+	oi.licence_province as province,oi.unit_name as unitName, 
 	concat(oi.first_contacts,'  ', oi.first_mobile) as firstContact,
 	concat(oi.second_contacts,'  ', oi.second_mobile) as secondContact,
 	concat(oi.third_contacts,'  ', oi.third_mobile) as thirdContact,
@@ -280,7 +280,7 @@
 		and cl.principal = #{principal,jdbcType=VARCHAR})
 	</if>
 	<if test="province != null">
-	    and oi.location_province =  #{province,jdbcType=VARCHAR}
+	    and oi.licence_province =  #{province,jdbcType=VARCHAR}
 	</if>
 	<if test="status != null">
 	    and ci.status = #{status,jdbcType=INTEGER}
@@ -333,7 +333,7 @@
 		and cl.principal = #{principal,jdbcType=VARCHAR})
 	</if>
 	<if test="province != null">
-	    and oi.location_province =  #{province,jdbcType=VARCHAR}
+	    and oi.licence_province =  #{province,jdbcType=VARCHAR}
 	</if>
 	<if test="status != null">
 	    and ci.status = #{status,jdbcType=INTEGER}
@@ -382,7 +382,7 @@
 	ci.accept_time as acceptTime, ci.contact, ci.copyright_name as copyrightName, ci.copyright_info as copyrightInfo, 
 	ci.status, ci.comment, ci.outsource, ci.in_urgent as inUrgent, ci.authorized_date as authorizedDate, ci.copyright_number as copyrightNumber,  
 	ci.work_issue as workIssue,ci.application_url as applicationUrl,ci.certificate_url as certificateUrl,
-	oi.location_province as province, oi.location_city as city,oi.location_area as area, oi.postcode,
+	oi.licence_province as province, oi.licence_city as city,oi.licence_area as area, oi.postal_address as postalAddress, oi.postcode,
 	oi.unit_name as unitName, oi.org_code as orgCode,
 	concat(oi.first_contacts,'  ', oi.first_mobile) as firstContact,
 	concat(oi.second_contacts,'  ', oi.second_mobile) as secondContact,

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

@@ -141,8 +141,8 @@
     ON DUPLICATE KEY UPDATE
 	    type = values(type),
 	    name = values(name),
-	    org_code = values(orgCode),
+	    org_code = values(org_code),
 	    investment = values(investment),
-	    deleted_sign = values(deletedSign)
+	    deleted_sign = values(deleted_sign)
   </insert>
 </mapper>

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

@@ -141,8 +141,8 @@
     ON DUPLICATE KEY UPDATE
 	    type = values(type),
 	    name = values(name),
-	    id_number = values(idNumber),
+	    id_number = values(id_number),
 	    investment = values(investment),
-	    deleted_sign = values(deletedSign)
+	    deleted_sign = values(deleted_sign)
   </insert>
 </mapper>

+ 12 - 6
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -281,7 +281,7 @@
   </update>
   
   <select id="findCognizanceBoByPage" parameterType="String"  resultType="com.goafanti.cognizance.bo.CognizanceBo">
-  	select  c.id as cid, c.uid as uid, c.serial_number as serialNumber, i.location_province as locationProvince,
+  	select  c.id as cid, c.uid as uid, c.serial_number as serialNumber, i.licence_province as locationProvince,
 	i.unit_name as unitName, c.contacts, c.create_time as createTime, 
 	c.comment, c.state, c.certificate_number as certificateNumber, c.large_order as largeOrder,
 	c.issuing_date as issuingDate, c.year, a.name as consultant,
@@ -305,7 +305,7 @@
 		and c.uid = #{uid,jdbcType=VARCHAR}
 	</if>
 	<if test="locationProvince != null">
-		and i.location_province = #{locationProvince, jdbcType=VARCHAR}
+		and i.licence_province = #{locationProvince, jdbcType=VARCHAR}
 	</if>
 	<if test="principal != null">
 		group by c.id
@@ -335,7 +335,7 @@
 		and i.unit_name like  CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%')
 	</if>
 	<if test="locationProvince != null">
-		and i.location_province = #{locationProvince, jdbcType=VARCHAR}
+		and i.licence_province = #{locationProvince, jdbcType=VARCHAR}
 	</if>
 	<if test="principal != null">
 		group by c.id
@@ -435,7 +435,7 @@
   </update>
   
   <select id="findCultivationListByPage" parameterType="java.lang.String" resultType="com.goafanti.cognizance.bo.CultivationListBo">
-  	select u.id as uid,  i.location_province as province, i.unit_name as unitName, i.cog_contacts as cogContacts,
+  	select u.id as uid,  i.licence_province as province, i.unit_name as unitName, i.cog_contacts as cogContacts,
 		i.certificate_number as certificateNumber, i.issuing_date as issuingDate, a.name as consultant,
 		CONCAT(i.first_contacts,'  ', i.first_mobile) as firstContacts,
 	    CONCAT(i.second_contacts,'  ', i.second_mobile) as secondContacts,
@@ -451,7 +451,7 @@
 	    and u.id = #{uid,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
-	    and i.location_province = #{province,jdbcType=VARCHAR}
+	    and i.licence_province = #{province,jdbcType=VARCHAR}
 	</if>
 	<if test="page_sql!=null">
 		${page_sql}
@@ -471,7 +471,13 @@
 	    and u.id = #{uid,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
-	    and i.location_province = #{province,jdbcType=VARCHAR}
+	    and i.licence_province = #{province,jdbcType=VARCHAR}
 	</if>
   </select>
+  
+  <select id="selectLatelyRecord" resultType="com.goafanti.cognizance.bo.LatelyCogRecord" parameterType="java.lang.String" >
+    select c.id, c.issuing_date as issuingDate, l.state, MAX(l.record_time) as recordTime
+		   from org_cognizance c LEFT JOIN org_cognizance_log l on 
+		   c.id = l.cid  where c.uid = #{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>

File diff suppressed because it is too large
+ 933 - 857
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml


+ 3 - 3
src/main/java/com/goafanti/common/mapper/PatentCostMapper.xml

@@ -163,7 +163,7 @@
 		resultType="com.goafanti.patent.bo.PatentApplicationFeeBo">
 		select p.uid as uid , p.id as pid ,o.id as oid, c.id as cid,
 		p.serial_number as serialNumber ,p.patent_number as patentNumber ,
-		o.location_province as locationProvince , o.unit_name as unitName ,
+		o.licence_province as locationProvince , o.unit_name as unitName ,
 		p.patent_name as patentName , p.patent_application_date as
 		patentApplicationDate,
 		c.payment_state as paymentState,c.application_fee as applicationFee ,
@@ -178,7 +178,7 @@
 		</if>
 		
 		<if test="locationProvince != null">
-			and o.location_province = #{locationProvince,jdbcType=VARCHAR}
+			and o.licence_province = #{locationProvince,jdbcType=VARCHAR}
 		</if>
 		<if test="pStart != null">
 			and p.patent_application_date <![CDATA[ > ]]>
@@ -206,7 +206,7 @@
 		</if>
 		
 		<if test="locationProvince != null">
-			and o.location_province = #{locationProvince,jdbcType=VARCHAR}
+			and o.licence_province = #{locationProvince,jdbcType=VARCHAR}
 		</if>
 		<if test="pStart != null">
 			and p.patent_application_date <![CDATA[ > ]]>

+ 8 - 8
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -575,7 +575,7 @@
 		parameterType="String">
 		select p.id, p.uid, p.serial_number as serialNumber, p.patent_number
 		as patentNumber, p.office,
-		o.location_province as locationProvince,
+		o.licence_province as locationProvince,
 		o.unit_name as unitName,
 		p.patent_name as patentName, p.patent_state as
 		patentState, p.create_time as
@@ -640,7 +640,7 @@
 			and p.author = #{author,jdbcType=VARCHAR}
 		</if>
 		<if test="locationProvince != null">
-			and o.location_province =
+			and o.licence_province =
 			#{locationProvince,jdbcType=VARCHAR}
 		</if>
 		<if test="principal != null">
@@ -714,7 +714,7 @@
 		</if>
 		<if test="locationProvince != null">
 			and
-			o.location_province=#{locationProvince,jdbcType=VARCHAR}
+			o.licence_province=#{locationProvince,jdbcType=VARCHAR}
 		</if>
 		<if test="principal != null">
 			group by p.id
@@ -725,7 +725,7 @@
 		parameterType="String">
 		select p.id as pid, p.uid as uid, o.id as oid, c.id as cid,
 		p.serial_number as serialNumber,
-		p.patent_number as patentNumber, o.location_province as locationProvince, o.unit_name
+		p.patent_number as patentNumber, o.licence_province as locationProvince, o.unit_name
 		as unitName,
 		p.patent_catagory as patentCatagory, p.patent_name as patentName, p.patent_state as
 		patentState,
@@ -742,7 +742,7 @@
 		</if>
 		
 		<if test="locationProvince != null">
-			and o.location_province =
+			and o.licence_province =
 			#{locationProvince,jdbcType=VARCHAR}
 		</if>
 		<if test="principal != null">
@@ -768,7 +768,7 @@
 			and l.principal = #{principal,jdbcType=VARCHAR}
 		</if>
 		<if test="locationProvince != null">
-			and o.location_province =
+			and o.licence_province =
 			#{locationProvince,jdbcType=VARCHAR}
 		</if>
 		<if test="principal != null">
@@ -904,8 +904,8 @@
 	<select id="selectPatentInfoDetail" resultType="com.goafanti.patent.bo.PatentInfoDetailBo"
 		parameterType="java.lang.String">
 		select p.id, p.uid, o.unit_name as unitName,o.org_code as orgCode,
-		o.location_province as locationProvince,
-		o.location_city as locationCity, o.location_area as locationArea,
+		o.licence_province as locationProvince,
+		o.licence_city as locationCity, o.licence_area as locationArea, o.postal_address as postalAddress,
 		p.contacts,
 		p.serial_number as serialNumber , p.patent_number as patentNumber ,
 		p.patent_name as patentName, p.office,

+ 3 - 3
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -329,7 +329,7 @@
   
   <select id ="findTechProjectManageListByPage" parameterType="java.lang.String" 
      resultType="com.goafanti.techproject.bo.TechProjectManageListBo">
-  	 select x.* from (select p.id, p.uid, i.location_province as province, 
+  	 select x.* from (select p.id, p.uid, i.licence_province as province, 
 	        i.unit_name as unitName,  
 		    CONCAT(i.first_contacts,'  ', i.first_mobile) as firstContacts,
 		    CONCAT(i.second_contacts,'  ', i.second_mobile) as secondContacts,
@@ -366,7 +366,7 @@
   </select>
   
   <select id="findTechProjectManageCount" resultType="java.lang.Integer" parameterType="String">
- 	select count(1) from ( select x.* from (select p.id, p.uid, i.location_province as province, 
+ 	select count(1) from ( select x.* from (select p.id, p.uid, i.licence_province as province, 
 	        i.unit_name as unitName,  
 		    CONCAT(i.first_contacts,'  ', i.first_mobile) as firstContacts,
 		    CONCAT(i.second_contacts,'  ', i.second_mobile) as secondContacts,
@@ -401,7 +401,7 @@
   
   <select id="selectProjectDetail" resultType="com.goafanti.techproject.bo.TechProjectDetailBo" parameterType="java.lang.String">
   		 select 
-  		 p.id, p.uid, i.location_province as province, i.location_city as city, i.location_area as area,
+  		 p.id, p.uid, i.licence_province as province, i.licence_city as city, i.licence_area as area, i.postal_address as postalAddress,
 	        i.unit_name as unitName,  i.org_code as orgCode,
 		    p.serial_number as serialNumber,  
 		     a.name as consultant, p.contacts, p.project_des as projectDes, p.subsidy, p.dispatch_info as dispatchInfo,

+ 9 - 8
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -57,7 +57,7 @@ public class OrganizationIdentity {
     /**
     * 注册资金
     */
-    private Integer registeredCapital;
+    private BigDecimal registeredCapital;
 
     /**
     * 营业执照注册号
@@ -419,15 +419,16 @@ public class OrganizationIdentity {
         this.unitName = unitName;
     }
 
-    public Integer getRegisteredCapital() {
-        return registeredCapital;
-    }
 
-    public void setRegisteredCapital(Integer registeredCapital) {
-        this.registeredCapital = registeredCapital;
-    }
+    public BigDecimal getRegisteredCapital() {
+		return registeredCapital;
+	}
+
+	public void setRegisteredCapital(BigDecimal registeredCapital) {
+		this.registeredCapital = registeredCapital;
+	}
 
-    public String getLicenceNumber() {
+	public String getLicenceNumber() {
         return licenceNumber;
     }
 

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

@@ -5,6 +5,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.StringUtils;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.goafanti.common.utils.FileUtils;
 
@@ -131,7 +133,8 @@ public class TechProject {
     public void setSerialNumber(Integer serialNumber) {
         this.serialNumber = serialNumber;
     }
-
+    
+    @JsonFormat(shape = Shape.STRING)
     public Integer getContacts() {
         return contacts;
     }

+ 43 - 18
src/main/java/com/goafanti/common/utils/TimeUtils.java

@@ -1,24 +1,49 @@
 package com.goafanti.common.utils;
 
+import java.text.ParseException;
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.core.shiro.token.TokenManager;
 
 public class TimeUtils {
-	    
-          public static  Boolean checkOverTime(String s){
-        	  Boolean flag=false;
-        	  if("getMCode".equals(s)){
-	        	  if(System.currentTimeMillis()-(Long) TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME)>60000){
-	        		 flag = true;
-	        	  }
-        	  }else if("register".equals(s)){
-        		  if(System.currentTimeMillis()-(Long) TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME)>900000){
- 	        		 flag = true;
- 	        	  }
-        	  }else if("resetCode".equals(s)){
-        		  if(System.currentTimeMillis()-(Long) TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE_TIME)>600000){
-        			  flag = true ;
-        		  }
-        	  }
-        	  return flag;
-          }
+
+	public static Boolean checkOverTime(String s) {
+		Boolean flag = false;
+		if ("getMCode".equals(s)) {
+			if (System.currentTimeMillis()
+					- (Long) TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) > 60000) {
+				flag = true;
+			}
+		} else if ("register".equals(s)) {
+			if (System.currentTimeMillis()
+					- (Long) TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) > 900000) {
+				flag = true;
+			}
+		} else if ("resetCode".equals(s)) {
+			if (System.currentTimeMillis()
+					- (Long) TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE_TIME) > 600000) {
+				flag = true;
+			}
+		}
+		return flag;
+	}
+	
+	public static Boolean checkCogExpire(Date issuingDate) throws ParseException{
+		String d = DateFormatUtils.format(issuingDate, AFTConstants.YYYYMMDD);
+		String suffix = d.substring(4, 10);
+		int year = Integer.parseInt(d.substring(0, 3));
+		int expireYear = year + 3;
+		String expireDate = expireYear + suffix;
+		Date expireDay = DateUtils.parseDate(expireDate, AFTConstants.YYYYMMDD);
+		
+		Date nowTime = new Date(System.currentTimeMillis());
+		
+		if (nowTime.getTime() - expireDay.getTime() > 0){
+			return Boolean.TRUE;
+		}
+		return Boolean.FALSE;
+	}
 }

+ 10 - 1
src/main/java/com/goafanti/copyright/bo/CopyrightInfoDetail.java

@@ -10,7 +10,8 @@ public class CopyrightInfoDetail extends CopyrightInfoSummary {
 	private String	area;
 	private String	postcode;
 	private String	orgCode;
-	
+	private String	postalAddress;
+
 	/**
 	 * 软著名字
 	 */
@@ -108,5 +109,13 @@ public class CopyrightInfoDetail extends CopyrightInfoSummary {
 		this.copyrightInfo = copyrightInfo;
 	}
 
+	public String getPostalAddress() {
+		return postalAddress;
+	}
 
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
+    
+	
 }

+ 11 - 1
src/main/java/com/goafanti/patent/bo/PatentInfoDetailBo.java

@@ -17,6 +17,8 @@ public class PatentInfoDetailBo {
 	private String	locationCity;
 
 	private String	locationArea;
+	
+	private String  postalAddress;
 
 	private Integer	contacts;
 
@@ -306,6 +308,14 @@ public class PatentInfoDetailBo {
 	public void setOffice(String office) {
 		this.office = office;
 	}
-	
 
+	public String getPostalAddress() {
+		return postalAddress;
+	}
+
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
+	
+    
 }

+ 4 - 1
src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 /**
  * 用户科技申报项目列表
@@ -115,7 +117,8 @@ public class TechProjectClientListBo {
 	public void setTechField(String techField) {
 		this.techField = techField;
 	}
-
+	
+	@JsonFormat(shape = Shape.STRING)
 	public Integer getState() {
 		return state;
 	}

+ 11 - 0
src/main/java/com/goafanti/techproject/bo/TechProjectDetailBo.java

@@ -14,6 +14,8 @@ public class TechProjectDetailBo extends TechProject {
 	private String city;
 	
 	private String area;
+	
+	private String postalAddress;
 
 
 	public String getUnitName() {
@@ -55,6 +57,15 @@ public class TechProjectDetailBo extends TechProject {
 	public void setArea(String area) {
 		this.area = area;
 	}
+
+	public String getPostalAddress() {
+		return postalAddress;
+	}
+
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
+
 	
 	
 

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

@@ -166,7 +166,7 @@ public class InputOrgBasicInfo {
 	/**
 	 * 领域
 	 */
-	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		field;
 
 	/**
@@ -247,6 +247,7 @@ public class InputOrgBasicInfo {
 	 */
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String highTechName;
+	
 
 	public String getId() {
 		return id;

+ 7 - 1
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.OrgHumanResourceMapper;
 import com.goafanti.common.dao.OrgRatepayMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
@@ -21,6 +22,7 @@ import com.goafanti.common.model.OrgRatepay;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.service.OrganizationIdentityService;
@@ -60,7 +62,11 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@Override
 	public List<OrganizationIdentity> selectAllOrgIndentity() {
-		return organizationIdentityMapper.selectAllOrgIndentity();
+		String aid = null;
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+			aid = TokenManager.getAdminId();
+		}
+		return organizationIdentityMapper.selectAllOrgIndentity(aid);
 	}
 
 	@Override

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.16
+static.host=//afts.hnzhiming.com/1.0.17
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.16
+static.host=//afts.hnzhiming.com/1.0.17
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.16
+static.host=//afts.hnzhiming.com/1.0.17

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.16
+static.host=//aftts.hnzhiming.com/1.0.17
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload