添加合同编号和合同名称重复校验的接口

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/ContractDao.java

@@ -55,6 +55,22 @@ public class ContractDao {
 	 * @param infoid
 	 * @return
 	 */
+	public List<KObject> getContractListNoDiscardBySomeoneParmString(String paramName,String paramValue) {
+		return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
+			@Override
+			public List<KObject> doInHibernate(Session session) throws HibernateException {
+				Query<KObject> query = session.createQuery("from " + ContractConstant.ENTITY_CONTRACT + " where (discard is null or discard = 0) and "+paramName+" =:paramKey", KObject.class);
+				query.setParameter("paramKey", paramValue);
+				return query.getResultList();
+			}
+		});
+	}
+	
+	/**
+	 * 查询项目下所有执行中的合同
+	 * @param infoid
+	 * @return
+	 */
 	public List<KObject> getExecutingContractByProject(UUID projectId) {
 		return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
 			@Override

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java

@@ -357,4 +357,22 @@ public class ContractServiceImpl implements ContractService {
 	public List<KObject> queryExeContractListInLife(UUID regionalCompanyId,@Nullable Date startDate,@Nullable Date endDate){
 		return contractDao.queryExeContractListInLife(regionalCompanyId, startDate, endDate);
 	}
+
+	@Override
+	public Boolean checkContractCodeRepeat(String contractCode) {
+		List<KObject> noDiscardContractList = contractDao.getContractListNoDiscardBySomeoneParmString(ContractConstant.CONTRACT_CODE,contractCode);
+		if(noDiscardContractList.size()>0){
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public Boolean checkContractNameRepeat(String contractName) {
+		List<KObject> noDiscardContractList = contractDao.getContractListNoDiscardBySomeoneParmString(ContractConstant.CONTRACT_NAME,contractName);
+		if(noDiscardContractList.size()>0){
+			return false;
+		}
+		return true;
+	}
 }

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/service/ContractService.java

@@ -34,6 +34,16 @@ public interface ContractService {
 	void discardContract(UUID id);
 	
 	/**
+	 * 检查合同编号是否重复
+	 * @param id
+	 */
+	Boolean checkContractCodeRepeat(String contractCode);
+	/**
+	 * 检查合同名称是否重复
+	 * @param id
+	 */
+	Boolean checkContractNameRepeat(String contractName);
+	/**
 	 * 检查当前项目是否能用
 	 * @param id
 	 */

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/web/ContractController.java

@@ -77,6 +77,19 @@ public class ContractController {
 		return contractInfo;
 	}
 	
+	@PostMapping("/contract/repeat/check/code")
+	public Object checkContractCodeRepeat(@RequestBody BaseEntity contract) {
+		String contractCode = contract.getId();
+		Boolean result = contractService.checkContractCodeRepeat(contractCode);
+		return ResponseObj.success("校验成功", result);
+	}
+	@PostMapping("/contract/repeat/check/name")
+	public Object checkContractNameRepeat(@RequestBody BaseEntity contract) {
+		String contractName = contract.getId();
+		Boolean result = contractService.checkContractNameRepeat(contractName);
+		return ResponseObj.success("校验成功", result);
+	}
+	
 	@PostMapping("/contract/projectable/check")
 	public Object checkProjectAbled(@RequestBody BaseEntity contract) {
 		UUID id = UUID.fromString(contract.getId());