Antiloveg 8 роки тому
батько
коміт
c31d02d01f

+ 4 - 0
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

@@ -465,6 +465,10 @@ public class AdminContractApiController extends CertifyApiController {
 					.add(buildError(ErrorConstants.STATUS_ERROR, "高企认定申请中或认定未到期!无法提交新申请!", "高企认定申请中或认定未到期!无法提交新申请!"));
 			return res;
 		}
+		Contract c = contractService.findByUidAndYear(uid, year);
+		if (null != c) {
+			res.getError().add(buildError("", "当前年份已有合同申请,无法提交新申请!"));
+		}
 		return res;
 	}
 

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

@@ -1333,10 +1333,6 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkUserLogin(res)) {
-			return res;
-		}
-
 		User curUser = TokenManager.getUserToken();
 		if (!checkCertify(res, curUser)) {
 			return res;

+ 4 - 0
src/main/java/com/goafanti/common/dao/ContractMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.common.model.Contract;
 import com.goafanti.contract.bo.ContractDetail;
 import com.goafanti.contract.bo.ContractSerialNumber;
@@ -24,4 +26,6 @@ public interface ContractMapper {
 	List<ContractSerialNumber> selectContractSerialNumber(String principal);
 
 	int batchDeleteByPrimaryKey(List<String> id);
+
+	Contract findByUidAndYear(@Param("uid") String uid, @Param("year")Integer year);
 }

+ 9 - 0
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -516,4 +516,13 @@
 	    and c.complete_date <![CDATA[ < ]]> #{lEnd,jdbcType=TIMESTAMP}
 	  </if>
   </select>
+  
+  <select id="findByUidAndYear" resultMap="BaseResultMap">
+  	  select 
+    <include refid="Base_Column_List" />
+    from contract
+    where uid = #{uid,jdbcType=VARCHAR}
+    and year = #{year,jdbcType=INTEGER}
+    and deleted_sign = 0
+  </select>
 </mapper>

+ 6 - 1
src/main/java/com/goafanti/contract/controller/ContractApiController.java

@@ -242,9 +242,14 @@ public class ContractApiController extends CertifyApiController {
 		Integer latelyYear = orgCognizanceService.selectLatelyRecordYear(uid);
 		if (null != latelyYear && year - latelyYear < 4) {
 			res.getError()
-					.add(buildError(ErrorConstants.STATUS_ERROR, "高企认定申请中或认定未到期!无法提交新申请!", "高企认定申请中或认定未到期!无法提交新申请!"));
+					.add(buildError(ErrorConstants.STATUS_ERROR, "高企认定申请中或认定未到期!无法提交新申请!", "高企认定申请中或认定未到期!无法提交新申请"));
 			return res;
 		}
+		
+		Contract c = contractService.findByUidAndYear(uid, year);
+		if (null != c) {
+			res.getError().add(buildError("", "当前年份已有合同申请,无法提交新申请!"));
+		}
 		return res;
 	}
 }

+ 2 - 0
src/main/java/com/goafanti/contract/service/ContractService.java

@@ -39,4 +39,6 @@ public interface ContractService {
 
 	Contract saveContract(Contract c);
 
+	Contract findByUidAndYear(String uid, Integer year);
+
 }

+ 5 - 0
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -384,4 +384,9 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		return params;
 	}
 
+	@Override
+	public Contract findByUidAndYear(String uid, Integer year) {
+		return contractMapper.findByUidAndYear(uid, year);
+	}
+
 }