Antiloveg 8 years ago
parent
commit
acd946f3df

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

@@ -28,4 +28,6 @@ public interface ContractMapper {
 	int batchDeleteByPrimaryKey(List<String> id);
 
 	Contract findByUidAndYear(@Param("uid") String uid, @Param("year")Integer year);
+
+	Integer findLatelyRecordByUid(String uid);
 }

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

@@ -525,4 +525,12 @@
     and cognizance_year = #{year,jdbcType=INTEGER}
     and deleted_sign = 0
   </select>
+  
+  <select id="findLatelyRecordByUid" parameterType="java.lang.String" resultType="java.lang.Integer">
+   	select
+   		Max(cognizance_year)
+   	from contract
+   	where uid = #{uid,jdbcType=VARCHAR}
+   	and deleted_sign = 0
+  </select>
 </mapper>

+ 5 - 4
src/main/java/com/goafanti/contract/controller/ContractApiController.java

@@ -190,10 +190,10 @@ public class ContractApiController extends CertifyApiController {
 		Contract c = new Contract();
 		BeanUtils.copyProperties(contract, c);
 		Contract ct = contractService.selectByPrimaryKey(c.getId());
-		if (null != ct && !ContractStatus.COMPLETE.getCode().equals(ct.getStatus())) {
+		if (null != ct && !ContractStatus.CREATE.getCode().equals(ct.getStatus())) {
 			res.setData(contractService.updateByPrimaryKeySelective(c));
 		} else {
-			res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
+			res.getError().add(buildError("", "当前合同为非草稿状态,无法操作!"));
 		}
 		return res;
 	}
@@ -262,8 +262,9 @@ public class ContractApiController extends CertifyApiController {
 			return res;
 		}
 
-		Contract c = contractService.findByUidAndYear(uid, year);
-		if (null != c) {
+		Integer cYear = contractService.findLatelyRecordByUid(uid);
+		
+		if (null != cYear) {
 			res.getError().add(buildError("", "当前年份已有合同申请,无法提交新申请!"));
 		}
 		return res;

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

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

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

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

+ 1 - 0
src/main/resources/shiro_base_auth.ini

@@ -7,6 +7,7 @@
 /user/signIn.html=anon
 /admin/login=anon
 /admin/login.html=anon
+/admin/index.html=admin
 /signin=anon
 /managesignin=anon
 /register=anon