Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java =================================================================== diff -u -r26440 -r26442 --- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 26440) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java (.../SystemWarningManagerImpl.java) (revision 26442) @@ -7,17 +7,14 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import net.sf.json.JSONObject; + import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.FastDateFormat; -import net.sf.json.JSONObject; - import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.vo.LoginUserData; @@ -28,7 +25,6 @@ import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance; -import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsStock; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.RegistrationCertification; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier; @@ -50,8 +46,6 @@ import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.SqlUtils; -import freemarker.template.utility.DateUtil; - /** * @author wangyi 2013-03-26 上午 09:51 */ @@ -505,7 +499,7 @@ if(names.size() > 0){ for (int i = 0; i < names.size(); i++) { SystemWarningItemVO vo = new SystemWarningItemVO(); - vo.setWarningItemType(names.get(i) + "已经6天内没有做生物监测,请今天必须做生物监测"); + vo.setWarningItemType(names.get(i) + "已经"+ numberOfwarningDays +"天内没有做生物监测,请今天必须做生物监测"); vo.setWarningAmount(1); warningList.add(vo); } @@ -702,9 +696,9 @@ * @param numberOfwarningDays 配置的提醒天数 * @return */ - private List getWarningOfBiologicalMonitoring(int numberOfwarningDays){ - String endTime = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss").format(new Date()); - String startTime = DataIndex.getNextNumDay(new Date(), -numberOfwarningDays, "yyyy-MM-dd HH:mm:ss"); + private List getWarningOfBiologicalMonitoring(int numberOfwarningDays){ + String endTime = FastDateFormat.getInstance("yyyy-MM-dd 00:00:00").format(new Date()); + String startTime = DataIndex.getNextNumDay(new Date(), -numberOfwarningDays, "yyyy-MM-dd 00:00:00"); String sql = " select s.name from Sterilizer s where s.id not in (select sterilizer_id from SterilizationRecord where biologicalMonitoringEndDate " + " between " + dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI") + " and "+ dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI")+")";