Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java =================================================================== diff -u -r21236 -r21273 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 21236) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 21273) @@ -304,6 +304,6 @@ */ public void timingConvertRecyclingApplication(); - public void batchSetRectgled(String[] ids); + public JSONObject batchSetRectgled(String[] ids); } Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r21263 -r21273 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21263) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21273) @@ -5621,12 +5621,31 @@ * 批量将使用记录状态设置为“已回收” */ @Override - public void batchSetRectgled(String[] ids) { - for (String id : ids) { - UseRecord useRecord = getForUpdate(id); - useRecord.setRecyclingStatus(useRecord.RECYCLINGSTATUS_RECYCLED); - saveOrUpdate(useRecord); + public JSONObject batchSetRectgled(String[] ids) { + JSONObject obj = new JSONObject(); + obj.put(JSONUtil.JSON_KEY_SUCCESS, false); + try{ + for (String id : ids) { + UseRecord useRecord = getForUpdate(id); + if(null == useRecord){ + obj.put(JSONUtil.JSON_KEY_MESSAGE, "未找到ID为" + id + "的使用记录,请刷新页面后重试!"); + return obj; + } + useRecord.setRecyclingStatus(useRecord.RECYCLINGSTATUS_RECYCLED); + saveOrUpdate(useRecord); + JSONObject jsonLog = new JSONObject(); + JSONUtil.addLogProperty(jsonLog, "使用记录id", useRecord.getId()); + JSONUtil.addLogProperty(jsonLog, "操作", "将使用记录设置成已回收状态"); + JSONUtil.addLogProperty(jsonLog, "病人名称", "【"+useRecord.getPatientName()+"】"); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_USERECORD, Log.TYPE_UPDATE, jsonLog); + } + }catch(Exception e){ + obj.put(JSONUtil.JSON_KEY_SUCCESS, e.getMessage()); + return obj; } + obj.put(JSONUtil.JSON_KEY_SUCCESS, true); + obj.put(JSONUtil.JSON_KEY_MESSAGE, "设置成功"); + return obj; } Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java =================================================================== diff -u -r21236 -r21273 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java (.../UseRecordAction.java) (revision 21236) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java (.../UseRecordAction.java) (revision 21273) @@ -670,20 +670,22 @@ * 批量设置使用记录状态为已回收 */ public void batchSetRectgled(){ + JSONObject obj = new JSONObject(); + obj.put(JSONUtil.JSON_KEY_SUCCESS, false); String ids = StrutsParamUtils.getPraramValue("ids", null); try{ if(StringUtils.isBlank(ids)){ StrutsResponseUtils.output(true, "尚未选中记录"); return; } - useRecordManager.batchSetRectgled(ids.split(",")); - StrutsResponseUtils.output(true, "修改成功"); + obj = useRecordManager.batchSetRectgled(ids.split(",")); + StrutsResponseUtils.output(obj); }catch(RuntimeException e){ e.printStackTrace(); - StrutsResponseUtils.output(false, e.getMessage()); + obj.put(JSONUtil.JSON_KEY_MESSAGE, e.getMessage()); }catch(Exception e){ e.printStackTrace(); - StrutsResponseUtils.output(false,"修改失败"); + obj.put(JSONUtil.JSON_KEY_MESSAGE, "后台出错,请稍后再试"); } } }