合同预警设置相关接口完善

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/service/WarningSettingServiceImpl.java

@@ -74,6 +74,8 @@ public class WarningSettingServiceImpl implements IWarningSettingService{
 	@Override
 	public KObject queryWarnSettingById(UUID id) {
 		KObject KObj = warnSettingDao.queryWarnSettingById(id);
+		String billId = KObj.getString("billId");
+		//KObject contract = contractService.queryContractById(UUID.fromString(billId));
 		return KObj;
 	}
 
@@ -98,8 +100,12 @@ public class WarningSettingServiceImpl implements IWarningSettingService{
 	
 	private String UuidListToString(List<UUID> uuids) {
 		StringBuilder str = new StringBuilder();
-		for (UUID uuid : uuids) {
-			str.append(uuid.toString()).append(",");
+		for (int i = 0; i < uuids.size(); i++) {
+			 if (i == uuids.size() - 1) {
+				 str.append(uuids.get(i).toString());
+             } else {
+            	 str.append(uuids.get(i).toString()).append(",");
+             }
 		}
 		return str.toString();
 	}

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

 package com.xyst.dinas.contract.internal.service;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import org.json.JSONArray;
@@ -17,6 +19,7 @@ import com.beecode.inz.common.BaseConstants;
 import com.beecode.inz.workflow.service.InzWorkflowService;
 import com.xyst.dinas.biz.dao.DinasOrganizationDao;
 import com.xyst.dinas.biz.warn.WarnSettingEntity;
+import com.xyst.dinas.biz.warn.dao.WarnSettingDao;
 import com.xyst.dinas.biz.warn.service.IWarningSettingService;
 import com.xyst.dinas.contract.constant.ContractConstant;
 import com.xyst.dinas.contract.enumeration.ContractStateEnum;
@@ -45,6 +48,9 @@ public class ContractServiceImpl implements ContractService {
 	private ProjectFiledDao projectFiledDao;
 	
 	@Autowired
+	private WarnSettingDao warnSettingDao;
+
+	@Autowired
 	private DinasOrganizationDao dinasOrganizationDao;
 
 	@Autowired
@@ -253,5 +259,23 @@ public class ContractServiceImpl implements ContractService {
 //		}
 	}
 	
+	@Override
+	public Object queryWarnSettingById(UUID id) {
+		KObject KObj = warnSettingDao.queryWarnSettingById(id);
+		String billId = KObj.getString("billId");
+		KObject contract = contractInfoDao.load(UUID.fromString(billId));
+		Map<String, Object> map = new HashMap<>();
+		map.put("contractName", contract.getString("contractName"));
+		map.put("purchaseSandUnitName", contract.getString("purchaseSandUnitName"));
+		map.put("project", contract.isNull("project") ? "" : contract.get("project").getString("projectName"));
+		map.put("personnel", KObj.getString("personnel"));
+		map.put("max", KObj.getString("max"));
+		map.put("min", KObj.getString("min"));
+		map.put("target", KObj.getString("target"));
+		map.put("id", KObj.getUuid("id"));
+		map.put("billId", KObj.getString("billId"));
+		return map;
+	}
+	
 
 }

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

 package com.xyst.dinas.contract.query.processor;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.beecode.bap.staff.service.StaffService;
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.query.entity.RowData;
 import com.beecode.inz.query.processor.DataProcessor;
@@ -22,6 +25,9 @@ public class ContractWarnSettingProcessor implements DataProcessor {
 	@Autowired
 	private ContractService contractService;
 	
+	@Autowired
+	private StaffService staffService;
+	
 	@Override
 	public void process(DataProcessorContext context) {
 		List<RowData> rowDatas = context.getRowDatas();
@@ -32,6 +38,23 @@ public class ContractWarnSettingProcessor implements DataProcessor {
 			row.put("projectName", contract.isNull("project") ? "" : contract.get("project").getString("name"));
 			row.put("contractName", contract.getString("contractName"));
 			row.put("purchaseSandUnitName", contract.getString("purchaseSandUnitName"));
+			String personnel = row.get("personnel") != null ? row.get("personnel").toString() : "";
+			String personnelName = "";
+			if (StringUtils.isNotEmpty(personnel)) {
+				List<String> personnelList = Arrays.asList(personnel.split(","));
+				for (int i = 0; i < personnelList.size(); i++) {
+					String personnelId = personnelList.get(i);
+					KObject personnelKObject = staffService.getById(UUID.fromString(personnelId));
+					if (i == personnelList.size() - 1) {
+						personnelName += personnelKObject.getString("name");
+					} else {
+						personnelName += personnelKObject.getString("name") + ",";
+					}
+					
+				}
+			}
+			//personnelName.substring(0, personnelName.length() - 1);
+			row.put("personnelName", personnelName);
 		}
 	}
 }

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

@@ -66,4 +66,6 @@ public interface ContractService {
 	 * @param object
 	 */
 	void afterChangeApproved(KObject object);
+
+	Object queryWarnSettingById(UUID id);
 }

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

@@ -19,6 +19,7 @@ import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
+import com.beecode.xlib.runtime.Assert;
 import com.xyst.dinas.biz.warn.BaseBusinessWarn;
 import com.xyst.dinas.biz.warn.service.IWarningSettingService;
 import com.xyst.dinas.contract.constant.ContractConstant;
@@ -162,4 +163,11 @@ public class ContractController {
 		// warningSettingService.insertWarnSetting(warnSetting);
 	}
 	
+	//查询一条预警设置
+	@GetMapping("/contract/warnsetting/{id}")
+	public Object queryWarnSetting(@PathVariable UUID id) {
+		Assert.notNull(id,"The id must not be null");
+		return contractService.queryWarnSettingById(id);
+	}
+
 }
\ No newline at end of file