修改合同到期预警生成规则

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

@@ -44,12 +44,8 @@ public class ContractExpireWarningCalculator implements IWarningCalculator{
 		diffDays = (int) ((endDate.getTime() -now.getTime()) / millisOfDay);
 		
 		if (diffDays < Integer.valueOf(min)) {
-			int value = diffDays - Integer.valueOf(min);
-			if (value>= 0) {
+			int value = Integer.valueOf(min) - diffDays;
 			warnMessage = purchaseSandUnitName + "下"+projectName+"的"+contractName+"还有"+value+"天到期。";
-			}else {
-				warnMessage = purchaseSandUnitName + "下"+projectName+"的"+contractName+"已经过期"+Math.abs(value)+"天。";
-			}
 			return true;
 		}
 		return false;