Antiloveg 8 years ago
parent
commit
0b7d25c471

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

@@ -1020,7 +1020,6 @@ public class AdminApiController extends CertifyApiController {
 
 		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(
 				orgIntellectualProperty.getUid(), orgIntellectualProperty.getIntellectualPropertyNumber());
-		
 
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
@@ -1043,7 +1042,7 @@ public class AdminApiController extends CertifyApiController {
 			oip.setType(IntellectualPropertyType.COMMON.getCode());
 			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
-			if (null != p && !p.getId().equals(oip.getId())){
+			if (null != p && !p.getId().equals(oip.getId())) {
 				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
 				return res;
 			}
@@ -1529,21 +1528,16 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgActivityCost, oac);
 
 		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear());
-
+		OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
 		if (StringUtils.isBlank(oac.getId())) {
 			if (null != ccc) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
 				return res;
 			}
-			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
+
 			if (null != ac) {
-				Calendar c = Calendar.getInstance();
-				c.setTime(ac.getStartDate());
-				Integer s = c.get(Calendar.YEAR);
-				c.setTime(ac.getEndDate());
-				Integer e = c.get(Calendar.YEAR);
-				if (oac.getYear() < s || oac.getYear() > e) {
-					res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
+				res = disposeActivityYear(res, ac, oac);
+				if (!res.getError().isEmpty()) {
 					return res;
 				}
 
@@ -1561,6 +1555,10 @@ public class AdminApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
 				return res;
 			}
+			res = disposeActivityYear(res, ac, oac);
+			if (!res.getError().isEmpty()) {
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;
@@ -3091,4 +3089,17 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return ocp;
 	}
+
+	private Result disposeActivityYear(Result res, OrgActivity ac, OrgActivityCost oac) {
+		Calendar c = Calendar.getInstance();
+		c.setTime(ac.getStartDate());
+		Integer s = c.get(Calendar.YEAR);
+		c.setTime(ac.getEndDate());
+		Integer e = c.get(Calendar.YEAR);
+		if (oac.getYear() < s || oac.getYear() > e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
+			return res;
+		}
+		return res;
+	}
 }

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

@@ -1412,7 +1412,13 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkUserLogin(res)) {
+		if (StringUtils.isBlank(orgActivityCost.getAid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "项目ID"));
+			return res;
+		}
+
+		if (null == orgActivityCost.getYear()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "费用年份"));
 			return res;
 		}
 
@@ -1427,15 +1433,20 @@ public class CognizanceApiController extends CertifyApiController {
 
 		OrgActivityCost oac = new OrgActivityCost();
 		BeanUtils.copyProperties(orgActivityCost, oac);
-		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
-				TokenManager.getUserId());
+		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByUidAndAidAndYear(oac.getAid(),
+				TokenManager.getUserId(), orgActivityCost.getYear());
+		OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
 		if (StringUtils.isBlank(oac.getId())) {
 			if (null != ccc) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
-
-			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
+			
+			res = disposeActivityYear(res, ac, oac);
+			if (!res.getError().isEmpty()) {
+				return res;
+			}
+			
 			oac.setStartDate(ac.getStartDate());
 			oac.setEndDate(ac.getEndDate());
 			oac.setId(UUID.randomUUID().toString());
@@ -1443,10 +1454,14 @@ public class CognizanceApiController extends CertifyApiController {
 			oac.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgActivityCostService.insert(oac);
 		} else {
-			if (null != ccc && !ccc.getId().equals(oac.getId())){
+			if (null != ccc && !ccc.getId().equals(oac.getId())) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
+			res = disposeActivityYear(res, ac, oac);
+			if (!res.getError().isEmpty()) {
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;
@@ -1610,14 +1625,15 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
-		
-		if (StringUtils.isBlank(orgIntellectualProperty.getIntellectualPropertyNumber())){
+
+		if (StringUtils.isBlank(orgIntellectualProperty.getIntellectualPropertyNumber())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "知识产权编号", "知识产权编号"));
 			return res;
 		}
-		
-		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(TokenManager.getUserId(), orgIntellectualProperty.getIntellectualPropertyNumber());
-		
+
+		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(
+				TokenManager.getUserId(), orgIntellectualProperty.getIntellectualPropertyNumber());
+
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
 				orgIntellectualProperty.setAuthorizationDate(
@@ -1629,7 +1645,7 @@ public class CognizanceApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgIntellectualProperty, oip);
 
 		if (StringUtils.isBlank(oip.getId())) {
-			if (null != p){
+			if (null != p) {
 				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
 				return res;
 			}
@@ -1640,7 +1656,7 @@ public class CognizanceApiController extends CertifyApiController {
 			oip.setType(IntellectualPropertyType.COMMON.getCode());
 			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
-			if (null != p && !p.getId().equals(oip.getId())){
+			if (null != p && !p.getId().equals(oip.getId())) {
 				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
 				return res;
 			}
@@ -2575,14 +2591,6 @@ public class CognizanceApiController extends CertifyApiController {
 		return fileName;
 	}
 
-	// 判断用户是否通过认证
-	/*
-	 * private Result checkCertify(Result res) { OrganizationIdentity o =
-	 * organizationIdentityService.selectOrgIdentityByUserId(TokenManager.
-	 * getUserId()); if (null == o || 5 != o.getAuditStatus()) {
-	 * res.getError().add(buildError(ErrorConstants.NON_CERTIFIED,
-	 * "未通过实名认证,无法操作!")); } return res; }
-	 */
 
 	// 高企认定
 	private CognizanceDetailBo handleCognizanceDetail(String uid, String cid, Integer year) {
@@ -2593,5 +2601,18 @@ public class CognizanceApiController extends CertifyApiController {
 	private AnnualReportBo handleAnnualReport(String uid, Integer year) {
 		return orgAnnualReportService.selectAnnualReportBo(uid, year);
 	}
+	
+	private Result disposeActivityYear(Result res, OrgActivity ac, OrgActivityCost oac) {
+		Calendar c = Calendar.getInstance();
+		c.setTime(ac.getStartDate());
+		Integer s = c.get(Calendar.YEAR);
+		c.setTime(ac.getEndDate());
+		Integer e = c.get(Calendar.YEAR);
+		if (oac.getYear() < s || oac.getYear() > e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
+			return res;
+		}
+		return res;
+	}
 
 }

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

@@ -21,7 +21,7 @@ public interface OrgActivityCostService {
 
 	int deleteByAid(List<String> id);
 
-	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String userId);
+	OrgActivityCost selectOrgActivityCostByUidAndAidAndYear(String aid, String userId, Integer year);
 
 	OrgActivityCost selectByPrimaryKey(String id);
 

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

@@ -97,8 +97,8 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 
 
 	@Override
-	public OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String uid) {
-		return orgActivityCostMapper.selectOrgActivityCostByUidAndAid(aid, uid);
+	public OrgActivityCost selectOrgActivityCostByUidAndAidAndYear(String aid, String uid, Integer year) {
+		return orgActivityCostMapper.selectOrgActivityCostByUidAndAidAndYear(aid, uid, year);
 	}
 
 

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

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.cognizance.bo.OrgActivityDetailCostBo;
 import com.goafanti.common.model.OrgActivityCost;
 
@@ -24,7 +26,7 @@ public interface OrgActivityCostMapper {
 
 	int batchDeleteByAid(List<String> aid);
 
-	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String uid);
+	OrgActivityCost selectOrgActivityCostByUidAndAidAndYear(@Param("aid")String aid, @Param("uid")String uid, @Param("year")Integer year);
 
 	OrgActivityCost selectOrgActivityCostByAidAndYear(String aid, Integer year);
 

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

@@ -358,11 +358,15 @@
 	</foreach>
   </update>
   
-  <select id="selectOrgActivityCostByUidAndAid" resultMap="BaseResultMap" >
+  <select id="selectOrgActivityCostByUidAndAidAndYear" resultMap="BaseResultMap" >
     select 
     <include refid="Base_Column_List" />
     from org_activity_cost
-    where aid = #{0} and uid = #{1} and deleted_sign = 0
+    where 
+    	aid = #{aid,jdbcType=VARCHAR} 
+    and uid = #{uid,jdbcType=VARCHAR} 
+    and year = #{year,jdbcType=INTEGER} 
+    and deleted_sign = 0
   </select>
   
    <select id="selectOrgActivityCostByAidAndYear" resultMap="BaseResultMap" >