;

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

@@ -111,11 +111,11 @@ public class WarningServiceImpl implements WarningService{
 	@Override
 	public void updateWarnExe(WarnExeRecord warnExeRecord) {
 		KObject object = warnSettingDao.queryWarningExeById(warnExeRecord.getId());
-		object.set("recentlyTime", warnExeRecord.getRecentlyTime());
-		object.set("endTime", warnExeRecord.getEndTime());
-		object.set("warnState", warnExeRecord.getWarnState());
-		object.set("actualValue", warnExeRecord.getActualValue());
-		warnSettingDao.update(object);		
+		if(warnExeRecord.getRecentlyTime()!=null) object.set("recentlyTime", warnExeRecord.getRecentlyTime());
+		if(warnExeRecord.getEndTime()!=null) object.set("endTime", warnExeRecord.getEndTime());
+		if(warnExeRecord.getWarnState()!=null) object.set("warnState", warnExeRecord.getWarnState());
+		if(warnExeRecord.getActualValue()!=null) object.set("actualValue", warnExeRecord.getActualValue());
+		warnSettingDao.update(object);
 	}
 	
 	/**

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

@@ -19,7 +19,7 @@ import com.xyst.dinas.contract.service.ContractService;
 public class ContractExpireWarningCalculator implements IWarningCalculator{
 
 	
-	private int days;
+	private int diffDays;
 	
 	private String warnMessage;
 	
@@ -37,10 +37,10 @@ public class ContractExpireWarningCalculator implements IWarningCalculator{
 		KObject contract = contractService.queryContract(warnSetting.getBillId());
 		Date endDate = contract.getDate(ContractConstant.endDate);
 		Date now = new Date();
-		int diff = (int) ((endDate.getTime() -now.getTime()) / millisOfDay);
+		diffDays = (int) ((endDate.getTime() -now.getTime()) / millisOfDay);
 		
-		if (diff < Integer.valueOf(min)) {
-			int value = diff - Integer.valueOf(min);
+		if (diffDays < Integer.valueOf(min)) {
+			int value = diffDays - Integer.valueOf(min);
 			String contractCode = contract.getString(ContractConstant.CONTRACT_CODE);
 			if (value>= 0) {
 				warnMessage = "编号["+contractCode+"]"+"的合同还有"+value+"天到期!";
@@ -59,7 +59,7 @@ public class ContractExpireWarningCalculator implements IWarningCalculator{
 
 	@Override
 	public String getActualValue() {
-		return days+"";
+		return diffDays+"";
 	}
 
 }