Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentrepair/action/InstrumentRepairAction.java =================================================================== diff -u -r33110 -r33133 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentrepair/action/InstrumentRepairAction.java (.../InstrumentRepairAction.java) (revision 33110) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentrepair/action/InstrumentRepairAction.java (.../InstrumentRepairAction.java) (revision 33133) @@ -1,5 +1,6 @@ package com.forgon.disinfectsystem.tousse.instrumentrepair.action; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -19,6 +20,7 @@ import com.forgon.entity.PageEntity; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; +import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.json.DateJsonValueProcessor; import com.forgon.tools.json.JSONUtil; @@ -118,6 +120,17 @@ String tousseMaterialInfo = StrutsParamUtils.getPraramValue("tousseMaterialInfo", ""); JSONObject result = new JSONObject(); try { + SimpleDateFormat sdf = new SimpleDateFormat(DateTools.COMMON_DATE_HM); + Date registerDateTime = StrutsParamUtils.getDatePraramValue("registerDateTime", instrumentRepair.getRegisterDateTime(), sdf); + Date repairDateTime = StrutsParamUtils.getDatePraramValue("repairDateTime", instrumentRepair.getRepairDateTime(), sdf); + Date outHandoverDateTime = StrutsParamUtils.getDatePraramValue("outHandoverDateTime", instrumentRepair.getOutHandoverDateTime(), sdf); + Date returnHandoverDateTime = StrutsParamUtils.getDatePraramValue("returnHandoverDateTime", instrumentRepair.getReturnHandoverDateTime(), sdf); + Date discardDateTime = StrutsParamUtils.getDatePraramValue("discardDateTime", instrumentRepair.getDiscardDateTime(), sdf); + instrumentRepair.setRegisterDateTime(registerDateTime); + instrumentRepair.setRepairDateTime(repairDateTime); + instrumentRepair.setOutHandoverDateTime(outHandoverDateTime); + instrumentRepair.setReturnHandoverDateTime(returnHandoverDateTime); + instrumentRepair.setDiscardDateTime(discardDateTime); instrumentRepairManager.saveInstrumentRepair(instrumentRepair, tousseMaterialInfo); JSONUtil.addSuccess(result, true); JSONUtil.addMessage(result, "保存成功!");