Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r27840 -r28252 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 27840) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 28252) @@ -6845,15 +6845,27 @@ logger.debug("未找到该时间点的使用记录转换配置"); return; } - - //3.如果有取到对应时间点的配置时,先取出该配置的配置科室,逐一遍历所有科室,对科室的所有已审核的使用记录进行合并转换处理(启用新的独立线程异步处理) + + //3.如果有取到对应时间点的配置时,先取出该配置的配置科室,逐一遍历所有科室,对科室的所有未审核或者已审核状态的使用记录进行合并转换处理(启用新的独立线程异步处理) + // 根据配置文件,处理未审核以及已审核状态的使用记录单,或者只处理已审核状态的使用记录单 List useRecordConvertDepartConfigList = useRecordConvertConfig.getUseRecordConvertDepartConfigList(); if(CollectionUtils.isNotEmpty(useRecordConvertDepartConfigList)){ + + // 读取配置:是否只转换已审核状态的使用记录单 + boolean onlyConvertAuditedUseRecord = CssdUtils.getSystemSetConfigByNameBool("onlyConvertAuditedUseRecord", false); + // 默认转换未审核和已审核状态的使用记录单 + String convertStatus = UseRecord.STATUS_UNAUDITED +"','"+ UseRecord.STATUS_AUDITED; + // 值为true,只转换已审核状态的使用记录单 + if (onlyConvertAuditedUseRecord){ + convertStatus = UseRecord.STATUS_AUDITED; + } + for (UseRecordConvertDepartConfig useRecordConvertDepartConfig : useRecordConvertDepartConfigList) { String departCode = useRecordConvertDepartConfig.getDepartCode(); + List auditedUseRecordList = objectDao.findBySql_ForUpdate(UseRecord.class.getSimpleName(), - " where status in ('"+ UseRecord.STATUS_UNAUDITED +"','"+ UseRecord.STATUS_AUDITED +"') and departCoding='"+ departCode +"'"); + " where status in ('"+ convertStatus +"') and departCoding='"+ departCode +"'"); if(CollectionUtils.isNotEmpty(auditedUseRecordList)){ Collection ids = new ArrayList(); for (UseRecord useRecord : auditedUseRecordList) { Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/spring/timer.xml =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/spring/timer.xml (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/spring/timer.xml (revision 28252) @@ -0,0 +1,55 @@ + + + + + + + + + + + timingAutoSignInvoice + + + + + + + + + 0 0 2 * * ? + + + + + + + + + + + timingConvertRecyclingApplication + + + + + + + + + 0 * * * * ? + + + + + + + + + + + + + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js =================================================================== diff -u -r27561 -r28252 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 27561) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 28252) @@ -146,5 +146,9 @@ //器械包标识牌管理 disableIdCard:false, //拍摄管理(图片/视频) - showCameraPhoto:true + showCameraPhoto:true, + //启用使用记录转换配置功能(控制前端页面、以及控制后台转换) + enableUseRecordConvertConfig:true, + //是否只转换已审核状态的使用记录单 + onlyConvertAuditedUseRecord:true } \ No newline at end of file