预警设置业务查询支持;

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

@@ -13,7 +13,12 @@ import org.springframework.orm.hibernate5.HibernateOperations;
 import com.beecode.bcp.type.KObject;
 import com.xyst.dinas.contract.constant.ContractConstant;
 import com.xyst.dinas.contract.enumeration.ContractStateEnum;
-
+/**
+ * 合同主子表
+ *
+ * @author Jackpot
+ * @date 2021年4月6日
+ */
 public class ContractDao {
 
 

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

@@ -19,7 +19,12 @@ import com.beecode.bcp.type.KObject;
 import com.jiuqi.np.util.DateUtil;
 import com.xyst.dinas.contract.constant.ContractConstant;
 import com.xyst.dinas.contract.enumeration.ContractStateEnum;
-
+/**
+ * 合同主体表
+ *
+ * @author Jackpot
+ * @date 2021年4月6日
+ */
 @Repository
 public class ContractInfoDao {
 	

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

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.json.JSONArray;
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -102,8 +103,12 @@ public class ContractServiceImpl implements ContractService {
 	public KObject queryContractInfo(UUID id) {
 
 		KObject obj = contractInfoDao.load(id);
-		// ContractInfoEntity contractInfoobject =
-		// obj.toObject(ContractInfoEntity.class);
+		return obj;
+	}
+	
+	public KObject queryContract(UUID id) {
+		
+		KObject obj = contractDao.load(id);
 		return obj;
 	}
 
@@ -157,11 +162,11 @@ public class ContractServiceImpl implements ContractService {
 		// BillData equipmentBillData = equipmentBill.getData();
 	}
 
-	@Override
-	public KObject queryContractById(UUID id) {
-		KObject kobject = contractInfoDao.load(id);
-		return kobject;
-	}
+//	@Override
+//	public KObject queryContractById(UUID id) {
+//		KObject kobject = contractInfoDao.load(id);
+//		return kobject;
+//	}
 	
 	@Override
 	public KObject getLastContractByInfoId(UUID infoId) {
@@ -201,6 +206,7 @@ public class ContractServiceImpl implements ContractService {
 		//合同审批通过后,自动新增砂石余量预警设置
 		
 		UUID contractId = contract.getUuid("id");
+		String contractBaseInfo = getContractBaseInfo(contract);
 		List<KObject> detials = contract.get("contractDetails").toList();
 		//
 		for (KObject detail : detials) {
@@ -212,6 +218,7 @@ public class ContractServiceImpl implements ContractService {
 			warnSetting.setBillId(contractId);
 			warnSetting.setTarget(dinasTypeName);
 			warnSetting.setOpen(true);
+			warnSetting.setMemo(contractBaseInfo);
 			warningSettingService.insertWarnSetting(warnSetting);
 
 		}
@@ -259,11 +266,23 @@ public class ContractServiceImpl implements ContractService {
 //		}
 	}
 	
+	private String getContractBaseInfo(KObject contract) {
+		
+		String projectName = contract.get("project").getString("projectName");
+		String purchaseSandUnitName = contract.get("purchaseSandUnit").getString("name");
+		String contractName = contract.getString("contractName");
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("contractName", contractName);
+		jsonObject.put("projectName", projectName);
+		jsonObject.put("purchaseSandUnitName", purchaseSandUnitName);
+		return jsonObject.toString();
+	}
+	
 	@Override
 	public Object queryWarnSettingById(UUID id) {
 		KObject KObj = warnSettingDao.queryWarnSettingById(id);
 		String billId = KObj.getString("billId");
-		KObject contract = contractInfoDao.load(UUID.fromString(billId));
+		KObject contract = contractDao.load(UUID.fromString(billId));
 		Map<String, Object> map = new HashMap<>();
 		map.put("contractName", contract.getString("contractName"));
 		map.put("purchaseSandUnitName", contract.getString("purchaseSandUnitName"));

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

@@ -22,7 +22,7 @@ public class ContractPerformWarningProcessor implements DataProcessor {
 		for (RowData row : rowDatas) {
 			//合同,项目,购砂单位
 			UUID contractId = UUID.fromString(row.get("billId").toString());
-			KObject contract = contractService.queryContractById(contractId);
+			KObject contract = contractService.queryContractInfo(contractId);
 			row.put("projectName", contract.isNull("project") ? "" : contract.get("project").getString("name"));
 			row.put("contractName", contract.getString("contractName"));
 			row.put("purchaseSandUnitName", contract.getString("purchaseSandUnitName"));

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

@@ -6,6 +6,7 @@ import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
 
 import com.beecode.bap.staff.service.StaffService;
 import com.beecode.bcp.type.KObject;
@@ -34,8 +35,9 @@ public class ContractWarnSettingProcessor implements DataProcessor {
 		for (RowData row : rowDatas) {
 			//合同,项目,购砂单位
 			UUID contractId = UUID.fromString(row.get("billId").toString());
-			KObject contract = contractService.queryContractById(contractId);
-			row.put("projectName", contract.isNull("project") ? "" : contract.get("project").getString("name"));
+			KObject contract = contractService.queryContract(contractId);
+			Assert.notNull(contract, "找不到对应的合同!");
+			row.put("projectName", contract.isNull("project") ? "" : contract.get("project").getString("projectName"));
 			row.put("contractName", contract.getString("contractName"));
 			row.put("purchaseSandUnitName", contract.getString("purchaseSandUnitName"));
 			String personnel = row.get("personnel") != null ? row.get("personnel").toString() : "";

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

@@ -16,6 +16,8 @@ public interface ContractService {
 
 	KObject queryContractInfo(UUID id);
 	
+	KObject queryContract(UUID id);
+	
 
 	/**
 	 * 检查当前合同是否能变更
@@ -54,7 +56,7 @@ public interface ContractService {
 	JSONArray getProjectListByPurSandId(UUID purchaseSandId,UUID projectType,String projectName);
 
 	
-	KObject queryContractById(UUID id);
+//	KObject queryContractById(UUID id);
 	
 	/**
 	 * 审批通过后的回调-提交