Antiloveg 8 years ago
parent
commit
6412e9782a

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

@@ -2699,7 +2699,12 @@ public class AdminApiController extends CertifyApiController {
 		}
 		
 		if (OrgCognizanceStatus.CALLBACK.getCode() == o.getState()){
-			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (OrgCognizanceStatus.SETTLEMENT.getCode() == o.getState()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
 			return res;
 		}
 		

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

@@ -98,7 +98,12 @@ public class AdminCopyrightApiController extends CertifyApiController {
 		}
 		
 		if (CopyrightStatus.CALLBACK.getCode() == oci.getStatus()){
-			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (CopyrightStatus.SETTLEMENT.getCode() == oci.getStatus()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
 			return res;
 		}
 
@@ -140,7 +145,12 @@ public class AdminCopyrightApiController extends CertifyApiController {
 		}
 		
 		if (CopyrightStatus.CALLBACK.getCode() == ci.getStatus()){
-			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (CopyrightStatus.SETTLEMENT.getCode() == ci.getStatus()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
 			return res;
 		}
 		AttachmentType attachmentType = AttachmentType.getField(sign);

+ 81 - 22
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -207,9 +207,14 @@ public class AdminPatentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
 			return res;
 		}
-		
-		if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()){
-			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
+
+		if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
+			return res;
+		}
+
+		if (PatentInfoStatus.SETTLEMENT.getCode() == p.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
 			return res;
 		}
 
@@ -291,7 +296,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
 			return res;
@@ -302,9 +307,14 @@ public class AdminPatentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
 			return res;
 		}
-		
-		if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()){
-			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
+
+		if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
+			return res;
+		}
+
+		if (PatentInfoStatus.SETTLEMENT.getCode() == p.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
 			return res;
 		}
 
@@ -319,9 +329,10 @@ public class AdminPatentApiController extends CertifyApiController {
 
 		return res;
 	}
-	
+
 	/**
 	 * 新增专利申请上传专利代理委托书
+	 * 
 	 * @param req
 	 * @param sign
 	 * @param uid
@@ -345,8 +356,6 @@ public class AdminPatentApiController extends CertifyApiController {
 
 		return res;
 	}
-	
-	
 
 	/**
 	 * 下载专利相关材料
@@ -584,6 +593,16 @@ public class AdminPatentApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (PatentInfoStatus.CALLBACK.getCode() == info.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
+			return res;
+		}
+
+		if (PatentInfoStatus.SETTLEMENT.getCode() == info.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
+			return res;
+		}
+
 		PatentCost patentCost = new PatentCost();
 		patentCost.setId(cid);
 		patentCost.setAnnualFeeState(1);
@@ -676,6 +695,23 @@ public class AdminPatentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利记录ID", "专利记录ID"));
 			return res;
 		}
+		
+		PatentInfo p = patentInfoService.selectByPrimaryKey(pid);
+		if (null == p){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+		
+		if (PatentInfoStatus.CALLBACK.getCode() == p.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
+			return res;
+		}
+
+		if (PatentInfoStatus.SETTLEMENT.getCode() == p.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
+			return res;
+		}
+		
 		patentRegistrationService.updateByPrimaryKey(regBo2Reg(rid, pid, patentRegistrationBo));
 		return res;
 	}
@@ -716,6 +752,29 @@ public class AdminPatentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利记录ID", "专利记录ID"));
 			return res;
 		}
+		
+		PatentCost cost = patentCostService.selectByPrimaryKey(cid);
+		if (null == cost) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+
+		if (null == cost.getPid()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+
+		PatentInfo info = patentInfoService.selectByPrimaryKey(cost.getPid());
+
+		if (PatentInfoStatus.CALLBACK.getCode() == info.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前申请已退单,无法修改!"));
+			return res;
+		}
+		
+		if (PatentInfoStatus.SETTLEMENT.getCode() == info.getPatentState()) {
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前申请已结款,无法修改!"));
+			return res;
+		}
 
 		PatentCost pc = new PatentCost();
 		BeanUtils.copyProperties(patentCost, pc);
@@ -1004,32 +1063,32 @@ public class AdminPatentApiController extends CertifyApiController {
 		patentRegistration.setAcceptanceExpressCompany(patentRegistrationBo.getAcceptanceExpressCompany());
 		try {
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
-				patentRegistration.setAcceptanceIssueTime(
-						DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
+				patentRegistration.setAcceptanceIssueTime(DateUtils
+						.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
-				patentRegistration.setAcceptanceReceiveTime(
-						DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
+				patentRegistration.setAcceptanceReceiveTime(DateUtils
+						.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
 			patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
 			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
-				patentRegistration.setAuthorizationIssueTime(
-						DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
+				patentRegistration.setAuthorizationIssueTime(DateUtils
+						.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
-				patentRegistration.setAuthorizationReceiveTime(
-						DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
+				patentRegistration.setAuthorizationReceiveTime(DateUtils
+						.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
 			patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
 			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
-				patentRegistration.setCertificateIssueTime(
-						DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
+				patentRegistration.setCertificateIssueTime(DateUtils
+						.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
-				patentRegistration.setCertificateRecieveTime(
-						DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDDHHMMSS));
+				patentRegistration.setCertificateRecieveTime(DateUtils
+						.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 		} catch (ParseException e) {
 		}

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

@@ -228,7 +228,12 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		}
 		
 		if (TechProjectStatus.CALLBACK.getCode() == t.getState()){
-			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (TechProjectStatus.SETTLEMENT.getCode() == t.getState()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
 			return res;
 		}
 
@@ -437,7 +442,12 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		}
 		
 		if (TechProjectStatus.CALLBACK.getCode() == t.getState()){
-			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (TechProjectStatus.SETTLEMENT.getCode() == t.getState()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
 			return res;
 		}
 		

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

@@ -2107,6 +2107,28 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
+		
+		if (StringUtils.isBlank(cog.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "高企认定"));
+			return res;
+		}
+		
+		OrgCognizance o = orgCognizanceService.selectByPrimaryKey(cog.getId());
+		
+		if (null == o){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "高企认定"));
+			return res;
+		}
+		
+		if (OrgCognizanceStatus.CALLBACK.getCode() == o.getState()){
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (OrgCognizanceStatus.SETTLEMENT.getCode() == o.getState()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
+			return res;
+		} 
 
 		OrgCognizance oc = new OrgCognizance();
 		BeanUtils.copyProperties(cog, oc);

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

@@ -235,7 +235,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		log.setId(UUID.randomUUID().toString());
 		log.setCid(c.getId());
 
-		log.setRecordTime(c.getCreateTime());
+		log.setRecordTime(c.getRecordTime());
 		log.setState(c.getState());
 		if (TokenManager.getToken() instanceof Admin) {
 			log.setPrincipal(TokenManager.getAdminId());

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

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

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

@@ -347,12 +347,12 @@
 			+ internal_design_cost + internal_equipment_cost + internal_other_cost +external_total_cost) as cost1, 
 			external_abroad_cost as territory
 			 from org_activity_cost 
-    where uid = #{1} and (start_date >= (select  str_to_date(CONCAT(#{0}-3,'-01-01'), '%Y-%m-%d %H'))
+    where  (start_date >= (select  str_to_date(CONCAT(#{0}-3,'-01-01'), '%Y-%m-%d %H'))
       and start_date <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H'))) 
 			or (end_date <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H'))   and 
       end_date >= (select  str_to_date(CONCAT(#{0}-3,'-01-01'), '%Y-%m-%d %H')))
       and deleted_sign = 0
-		) m GROUP BY m.uid
+		) m where m.uid = #{1} GROUP BY m.uid
 
   </select>
 	

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

@@ -27,7 +27,7 @@ public class InputCopyright {
 	@Size(min = 0, max = 60, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	copyrightName;
 
-	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 10, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	status;
 

+ 16 - 1
src/main/java/com/goafanti/copyright/controller/CopyrightApiController.java

@@ -88,6 +88,16 @@ public class CopyrightApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "找不到软著", "软著申请"));
 			return res;
 		}
+		
+		if (CopyrightStatus.CALLBACK.getCode() == oci.getStatus()){
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (CopyrightStatus.SETTLEMENT.getCode() == oci.getStatus()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
+			return res;
+		}
 
 		CopyrightInfo ci = new CopyrightInfo();
 		CopyrightLog cl = new CopyrightLog();
@@ -121,7 +131,12 @@ public class CopyrightApiController extends CertifyApiController {
 		}
 		
 		if (CopyrightStatus.CALLBACK.getCode() == ci.getStatus()){
-			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (CopyrightStatus.SETTLEMENT.getCode() == ci.getStatus()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
 			return res;
 		}
 		

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

@@ -193,6 +193,17 @@ public class TechProjectApiController extends CertifyApiController {
 		}
 
 		TechProject t = techProjectService.selectByPrimaryKey(techProject.getId());
+		
+		if (TechProjectStatus.CALLBACK.getCode() == t.getState()){
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (TechProjectStatus.SETTLEMENT.getCode() == t.getState()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
+			return res;
+		}
+		
 		if (null != t.getUid() && t.getUid().equals(curUser.getId())) {
 			TechProject tp = new TechProject();
 			BeanUtils.copyProperties(techProject, tp);
@@ -233,7 +244,12 @@ public class TechProjectApiController extends CertifyApiController {
 		}
 		
 		if (TechProjectStatus.CALLBACK.getCode() == t.getState()){
-			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "当前申请已退单,无法修改!"));
+			res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
+			return res;
+		}
+		
+		if (TechProjectStatus.SETTLEMENT.getCode() == t.getState()){
+			res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
 			return res;
 		}
 		

+ 3 - 1
src/main/resources/props/error.properties

@@ -40,4 +40,6 @@ PWD_NOT_MATCH_ERROR=\u539f\u5bc6\u7801\u8f93\u5165\u4e0d\u5339\u914d\u3002
 
 NON_CERTIFIED=\u672a\u901a\u8fc7\u5b9e\u540d\u8ba4\u8bc1\uff0c\u65e0\u6cd5\u64cd\u4f5c\uff01
 
-RECORD_CALLBACK=\u5f53\u524d\u7533\u8bf7\u5df2\u9000\u5355\uff0c\u65e0\u6cd5\u4fee\u6539\uff01
+RECORD_CALLBACK=\u5f53\u524d\u8bb0\u5f55\u5df2\u9000\u5355\uff0c\u65e0\u6cd5\u4fee\u6539\uff01
+
+RECORD_SETTLEMENT=\u5f53\u524d\u8bb0\u5f55\u5df2\u7ed3\u6b3e\uff0c\u65e0\u6cd5\u4fee\u6539\uff01