Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r36052 -r36055 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 36052) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 36055) @@ -12026,7 +12026,6 @@ logger.debug("没有待审核使用记录需要处理"); return; } - List ids = new ArrayList(); List auditedUseRecordList = new ArrayList(); for (UseRecord useRecord : unAuditedUseRecordList) { @@ -12058,45 +12057,21 @@ logger.debug(validate); continue; } - ids.add(useRecord.getId()); auditedUseRecordList.add(useRecord); } - if(CollectionUtils.isEmpty(ids)){ + if(CollectionUtils.isEmpty(auditedUseRecordList)){ logger.debug("没有手术状态为【患者离室】待审核使用记录需要处理"); return; } + //查询登记人(需要改审核人为登记人) + Map userMap = getOperatorMap(auditedUseRecordList); Date applicationCreateDate = new Date(); - for (Long useRecordId : ids) { + for (UseRecord useRecord : auditedUseRecordList) { try { List useRecordIdList = new ArrayList(); - useRecordIdList.add(useRecordId); + useRecordIdList.add(useRecord.getId()); createRecyclingApplicationByUseRecords(useRecordIdList, "定时", null, null, applicationCreateDate); - } catch (Exception e) { - e.printStackTrace(); - logger.debug("id=" + useRecordId + "的使用记录,定时审核并转换申请单时报错:" + e.getMessage()); - } - } - //multiAuditedUseRecordsMergeConvertRecyclingApplication(ids, "定时"); - //改审核人为登记人 - List operatorList = new ArrayList(); - if(CollectionUtils.isNotEmpty(auditedUseRecordList)){ - for (UseRecord useRecord : auditedUseRecordList) { String operator = useRecord.getOperator(); - if(StringUtils.isNotBlank(operator) - && !operatorList.contains(operator)){ - operatorList.add(operator); - } - } - Map userMap = new HashMap(); - List userList = objectDao.getCollection(User.class.getSimpleName(), "fullName", operatorList); - if(CollectionUtils.isNotEmpty(userList)){ - for (User user : userList) { - userMap.put(user.getFullName(), user); - } - } - StringBuffer updateSql = new StringBuffer(); - for (UseRecord useRecord : auditedUseRecordList) { - String operator = useRecord.getOperator(); if(StringUtils.isBlank(operator)){ continue; } @@ -12105,14 +12080,46 @@ continue; } //审核操作人 - String tempUpdateSql = String.format("update %s set reviewer = '%s', reviewerCode = '%s' where id = %s ;", + String updateSql = String.format("update %s set reviewer = '%s', reviewerCode = '%s' where id = %s ;", UseRecord.class.getSimpleName(), - StringTools.defaultString(user.getFullName()), + StringTools.defaultString(user.getFullName(), "定时"), StringTools.defaultString(user.getName()), useRecord.getId()); - updateSql.append(tempUpdateSql); + objectDao.excuteSQL(updateSql); + } catch (Exception e) { + e.printStackTrace(); + logger.debug("id=" + useRecord.getId() + "的使用记录,定时审核并转换申请单时报错:" + e.getMessage()); } - objectDao.excuteSQL(updateSql.toString()); } } + + /** + * 查询使用记录的登记人 + * @param auditedUseRecordList + * @return + */ + @SuppressWarnings("unchecked") + private Map getOperatorMap(List auditedUseRecordList) { + Map userMap = new HashMap(); + if(CollectionUtils.isEmpty(auditedUseRecordList)){ + return userMap; + } + List operatorList = new ArrayList(); + for (UseRecord useRecord : auditedUseRecordList) { + String operator = useRecord.getOperator(); + if(StringUtils.isNotBlank(operator) + && !operatorList.contains(operator)){ + operatorList.add(operator); + } + } + if(CollectionUtils.isNotEmpty(operatorList)){ + List userList = objectDao.getCollection(User.class.getSimpleName(), "fullName", operatorList); + if(CollectionUtils.isNotEmpty(userList)){ + for (User user : userList) { + userMap.put(user.getFullName(), user); + } + } + } + return userMap; + } }