Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInfoMaintainManagerImpl.java =================================================================== diff -u -r29864 -r29923 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInfoMaintainManagerImpl.java (.../IDCardInfoMaintainManagerImpl.java) (revision 29864) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInfoMaintainManagerImpl.java (.../IDCardInfoMaintainManagerImpl.java) (revision 29923) @@ -106,29 +106,25 @@ } if(StringUtils.equals(type, IDCardQuestionMaintain.class.getSimpleName())){ IDCardQuestionMaintain IDCardQuestionMaintain = new IDCardQuestionMaintain(); - Date registTime = new Date(); if(DatabaseUtil.isPoIdValid(iDCardInfoMaintain.getId())){ IDCardQuestionMaintain = (IDCardQuestionMaintain)iDCardInfoMaintain; - registTime = IDCardQuestionMaintain.getRegistTime(); } IDCardQuestionMaintain.setDiscoverUser(iDCardInfoMaintain.getDiscoverUser()); IDCardQuestionMaintain.setRegistUser(iDCardInfoMaintain.getRegistUser()); - IDCardQuestionMaintain.setRegistTime(registTime); + IDCardQuestionMaintain.setRegistTime(iDCardInfoMaintain.getRegistTime()); IDCardQuestionMaintain.setIdCardDefinitionId(iDCardInfoMaintain.getIdCardDefinitionId()); IDCardQuestionMaintain.setQuestion(text); IDCardQuestionMaintain.setSerialNumber(Long.parseLong(serialNumber)); IDCardQuestionMaintain.setStatus(iDCardInfoMaintain.getStatus()); objectDao.saveOrUpdate(IDCardQuestionMaintain); }else if(StringUtils.equals(type, IDCardRemarkMaintain.class.getSimpleName())){ IDCardRemarkMaintain IDCardRemarkMaintain = new IDCardRemarkMaintain(); - Date registTime = new Date(); if(DatabaseUtil.isPoIdValid(iDCardInfoMaintain.getId())){ IDCardRemarkMaintain = (IDCardRemarkMaintain)iDCardInfoMaintain; - registTime = IDCardRemarkMaintain.getRegistTime(); } IDCardRemarkMaintain.setDiscoverUser(iDCardInfoMaintain.getDiscoverUser()); IDCardRemarkMaintain.setIdCardDefinitionId(iDCardInfoMaintain.getIdCardDefinitionId()); - IDCardRemarkMaintain.setRegistTime(registTime); + IDCardRemarkMaintain.setRegistTime(iDCardInfoMaintain.getRegistTime()); IDCardRemarkMaintain.setRegistUser(iDCardInfoMaintain.getRegistUser()); IDCardRemarkMaintain.setRemark(text); IDCardRemarkMaintain.setSerialNumber(Long.parseLong(serialNumber)); Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/action/IDCardInfoMaintainAction.java =================================================================== diff -u -r29918 -r29923 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/action/IDCardInfoMaintainAction.java (.../IDCardInfoMaintainAction.java) (revision 29918) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/action/IDCardInfoMaintainAction.java (.../IDCardInfoMaintainAction.java) (revision 29923) @@ -96,6 +96,7 @@ String text = StrutsParamUtils.getPraramValue("text", ""); String registTimeStr = StrutsParamUtils.getPraramValue("registTimeStr", ""); try { + registTimeStr = registTimeStr.replace("T", " "); Date registTime = DateTools.coverStrToDate(registTimeStr, DateTools.COMMON_DATE_HMS); iDCardInfoMaintain.setRegistTime(registTime); iDCardInfoMaintainManager.saveOrUpdateIDCardInfoMaintain(iDCardInfoMaintain, serialNumber, type, text);