合同增加service接口

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

@@ -188,6 +188,16 @@ public class ContractServiceImpl implements ContractService {
 	}
 	
 	@Override
+	public KObject getExecutingContractByContractInfoId(UUID infoId) {
+		List<KObject> executingContracts = contractDao.getExecutingContractByContractInfoId(infoId);
+		if(executingContracts.size() != 1){
+			//不该出现的情况，需要查明
+			logger.error("不该出现的情况，需要查明:合同["+infoId.toString()+"]是变更审批，审批完成后发现原合同没有执行中的");
+		}
+		return executingContracts.get(0);
+	}
+	
+	@Override
 	public void changelog(UUID infoId) {
 		KObject log = Amino.getApplicationContext()
 				.getBean(LogConstants.LOG_ENTIY_NAME, KClass.class).newInstance();

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/ContractWarnSettingProcessor.java

@@ -36,7 +36,7 @@ public class ContractWarnSettingProcessor implements DataProcessor {
 			//合同,项目,购砂单位
 			UUID contractId = UUID.fromString(row.get("billId").toString());
 			KObject contractInfo = contractService.queryContractInfo(contractId);
-			KObject contract = contractService.getLastContractByInfoId(contractInfo.getUuid("id"));
+			KObject contract = contractService.getExecutingContractByContractInfoId(contractInfo.getUuid("id"));
 			Assert.notNull(contract, "找不到对应的合同!");
 			row.put("projectName", contract.isNull("project") ? "" : contract.get("project").getString("projectName"));
 			row.put("contractName", contract.getString("contractName"));

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

@@ -60,6 +60,8 @@ public interface ContractService {
 	
 	KObject getLastContractByInfoId(UUID infoId);
 	
+	KObject getExecutingContractByContractInfoId(UUID infoId);
+	
 	/**
 	 * 记录变更操作日志
 	 **/