退款查询增加字段;

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/constant/ContractConstant.java

@@ -43,8 +43,8 @@ public class ContractConstant {
 	public static final String SALE_DINAS_AMOUNT = "saleDinasAmount";
 	/** 变更原因 */
 	public static final String CHANGE_REASON = "changeReason";
-	
-	
+	/** 结束时间 */
+	public static final String endDate = "endDate";
 	/** 砂石种类 */
 	public static final String dinasType = "dinasType";
 	

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/warn/AdvanceBalanceWarningCalculator.java

 package com.xyst.dinas.contract.warn;
 
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.beecode.bcp.type.KObject;
-import com.xyst.dinas.biz.constant.DinasTypeConstant;
 import com.xyst.dinas.biz.warn.IWarningCalculator;
 import com.xyst.dinas.biz.warn.WarnSetting;
 import com.xyst.dinas.contract.constant.ContractConstant;
@@ -35,7 +32,11 @@ public class AdvanceBalanceWarningCalculator  implements IWarningCalculator{
 		if(min==null || min.trim().length()==0) return false;
 		KObject contract = contractService.queryContract(warnSetting.getBillId());
 		advanceBalance = contract.getDouble(ContractConstant.ADVANCE_BALANCE);
-		
+		if (advanceBalance < Double.valueOf(min)) {
+			String contractCode = contract.getString(ContractConstant.CONTRACT_CODE);
+			warnMessage = "编号["+contractCode+"]"+"的合同"+target+"为"+advanceBalance+",已不足"+min+"!";
+			return true;
+		}
 		return false;
 	}
 

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/warn/ContractExpireWarningCalculator.java

 package com.xyst.dinas.contract.warn;
 
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.beecode.bcp.type.KObject;
@@ -17,7 +19,7 @@ import com.xyst.dinas.contract.service.ContractService;
 public class ContractExpireWarningCalculator  implements IWarningCalculator{
 
 	
-	private double advanceBalance;
+	private int days;
 	
 	private String warnMessage;
 	
@@ -30,9 +32,17 @@ public class ContractExpireWarningCalculator  implements IWarningCalculator{
 		String min = warnSetting.getMin();
 		String target = warnSetting.getTarget();
 		if(min==null || min.trim().length()==0) return false;
-		KObject contract = contractService.queryContract(warnSetting.getBillId());
-		advanceBalance = contract.getDouble(ContractConstant.ADVANCE_BALANCE);
 		
+		KObject contract = contractService.queryContract(warnSetting.getBillId());
+		Date endDate = contract.getDate(ContractConstant.endDate);
+		Date now = new Date();
+		int diff = now.compareTo(endDate);
+		if (diff > Integer.valueOf(min)) {
+			String contractCode = contract.getString(ContractConstant.CONTRACT_CODE);
+			
+//			warnMessage = "编号["+contractCode+"]"+"的合同"+target+"为"+advanceBalance+",已不足"+min+"!";
+			return true;
+		}
 		return false;
 	}
 
@@ -43,7 +53,7 @@ public class ContractExpireWarningCalculator  implements IWarningCalculator{
 
 	@Override
 	public String getActualValue() {
-		return advanceBalance+"";
+		return days+"";
 	}
 
 }

backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/processor/FinanceRefundProcessor.java

@@ -13,6 +13,7 @@ import com.xyst.dinas.biz.service.DinasOrganizationService;
 import com.xyst.dinas.finance.constant.FinanceRefundConstant;
 import com.xyst.dinas.finance.enumeration.FundTypeEnum;
 import com.xyst.dinas.finance.enumeration.RefundStatusEnum;
+import com.xyst.dinas.project.service.PurchaseSandCompanyService;
 
 /**
  * 退款申请查询处理
@@ -24,6 +25,8 @@ public class FinanceRefundProcessor implements DataProcessor {
 
 	@Autowired
 	private DinasOrganizationService orgService;
+	@Autowired
+	private PurchaseSandCompanyService purchaseSandCompanyService;
 	
 	@Override
 	public void process(DataProcessorContext context) {
@@ -34,6 +37,10 @@ public class FinanceRefundProcessor implements DataProcessor {
 			KObject regionalCompany = orgService.load(regionalCompanyId);
 			row.put("regionalCompanyName", regionalCompany.getString("name"));
 			
+			UUID purchaseSandCompanyId = UUID.fromString(row.get("purchaseSandCompany.id").toString());
+			KObject purchaseSandCompany = purchaseSandCompanyService.getById(purchaseSandCompanyId);
+			row.put("purchaseSandCompanyName", purchaseSandCompany.getString("name"));
+			
 			String fundTypeName = null;
 			int fundType = Integer.valueOf(row.get(FinanceRefundConstant.fundType).toString());
 			if(FundTypeEnum.ADVANCE.getValue()==fundType) {

backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/internal/service/PurchaseSandCompanyServiceImpl.java

@@ -33,5 +33,10 @@ public class PurchaseSandCompanyServiceImpl implements PurchaseSandCompanyServic
 	public KObject getById(String id) {
 		return purchaseSandCompanyDao.load(UUID.fromString(id));
 	}
+	
+	@Override
+	public KObject getById(UUID id) {
+		return purchaseSandCompanyDao.load(id);
+	}
 
 }

backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/service/PurchaseSandCompanyService.java

 package com.xyst.dinas.project.service;
 
+import java.util.UUID;
+
 import com.beecode.bcp.type.KObject;
 
 public interface PurchaseSandCompanyService {
@@ -7,5 +9,7 @@ public interface PurchaseSandCompanyService {
 	Boolean verifyName(String name);
 	
 	KObject getById(String id);
+	
+	KObject getById(UUID id);
 
 }