Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r21088 -r21125 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 21088) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 21125) @@ -5662,18 +5662,20 @@ @Override public void interfereApplicationTime(String[] ids, Date applicationTime) { if (ids != null) { + String operator = AcegiHelper.getLoginUserFullName(); for (String id : ids) { - RecyclingApplication recyclingApplication = get(id); + InvoicePlan invoicePlan = + (InvoicePlan)objectDao.getByProperty_ForUpdate(InvoicePlan.class.getSimpleName(), "id", Long.parseLong(id)); - Date tmepApplicationTime = recyclingApplication.getApplicationTime(); - recyclingApplication.setApplicationTime(applicationTime); + Date tmepApplicationTime = invoicePlan.getApplicationTime(); + invoicePlan.setApplicationTime(applicationTime); - String remark = String.format("申请时间由%s被干预成%s", + String remark = String.format("申请时间被"+ operator +"由%s被干预成%s", ForgonDateUtils.safelyFormatDate(tmepApplicationTime, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""), ForgonDateUtils.safelyFormatDate(applicationTime, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - CssdUtils.appendRemarkOfInvoicePlan(recyclingApplication, remark); - recyclingApplication.setSubmitTime(new Date()); - objectDao.saveOrUpdate(recyclingApplication); + CssdUtils.appendRemarkOfInvoicePlan(invoicePlan, remark); + invoicePlan.setSubmitTime(new Date()); + objectDao.saveOrUpdate(invoicePlan); } } }