预警功能bug修复;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/WarningServiceImpl.java

@@ -82,7 +82,6 @@ public class WarningServiceImpl implements WarningService{
 		Boolean isOpen = warnSetting.isOpen();
 		if(isOpen != null) warSettingIdObj.set(WarnSettingConstant.isOpen, isOpen);
 		warnSettingDao.update(warSettingIdObj);
-		
         //修改后触发预警
 		BaseBusinessWarn baseBusinessWarn = new BaseBusinessWarn(warSettingId);
 		baseBusinessWarn.warn();
@@ -111,9 +110,7 @@ public class WarningServiceImpl implements WarningService{
 	
 	@Override
 	public void updateWarnExe(WarnExeRecord warnExeRecord) {
-		KClass type = Amino.getApplicationMetadataContext().getBean(WarnSettingConstant.ENTITY_WARNINGEXE, KClass.class);
-		JsonNode json = JSONObjectUtils.toJson(warnExeRecord);
-		KObject object = JSONObjectUtils.toObject(json, type);
+		KObject object = warnSettingDao.queryWarningExeById(warnExeRecord.getId());
 		object.set("recentlyTime", warnExeRecord.getRecentlyTime());
 		object.set("endTime", warnExeRecord.getEndTime());
 		object.set("warnState", warnExeRecord.getWarnState());

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

@@ -16,7 +16,7 @@ import com.xyst.dinas.contract.service.ContractService;
  * @author Jackpot
  * @date 2021年4月22日
  */
-public class ContractExpireWarningCalculator  implements IWarningCalculator{
+public class ContractExpireWarningCalculator implements IWarningCalculator{
 
 	
 	private int days;
@@ -26,21 +26,27 @@ public class ContractExpireWarningCalculator  implements IWarningCalculator{
 	@Autowired
 	private ContractService contractService;
 	
+	private final int millisOfDay = 1000 * 3600 * 24;
+	
 	@Override
 	public boolean isWarning(WarnSetting warnSetting) {
 		
 		String min = warnSetting.getMin();
-		String target = warnSetting.getTarget();
 		if(min==null || min.trim().length()==0) return false;
 		
 		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)) {
+		int diff = (int) ((endDate.getTime() -now.getTime()) / millisOfDay);
+		
+		if (diff < Integer.valueOf(min)) {
+			int value = diff - Integer.valueOf(min);
 			String contractCode = contract.getString(ContractConstant.CONTRACT_CODE);
-			
-//			warnMessage = "编号["+contractCode+"]"+"的合同"+target+"为"+advanceBalance+",已不足"+min+"!";
+			if (value>= 0) {
+				warnMessage = "编号["+contractCode+"]"+"的合同还有"+value+"天到期!";
+			}else {
+				warnMessage = "编号["+contractCode+"]"+"的合同已经过期"+Math.abs(value)+"天!";
+			}
 			return true;
 		}
 		return false;