出库操作3.0

yudao-module-museums/yudao-module-museums-api/src/main/java/cn/iocoder/yudao/module/museums/enums/social/LogRecordConstants.java

@@ -32,6 +32,8 @@ public interface LogRecordConstants {
     String MUSEUMS_SPECIMEN_CREATE_OUTBOUND_SUCCESS = "成功创建标本出库单【{{#specimenOutbound.id}}】,申请人: {{#createReqVO.applicantName}},申请单位: {{#createReqVO.applicationUsage}},研究项目: {{#createReqVO.projectName}}";
     String MUSEUMS_SPECIMEN_UPDATE_RETURN_SUCCESS = "成功更新标本回库单【{{#existingSpecimen.id}}】, 标本状况: {{#existingSpecimen.specimenCondition}}, 退还人: {{#updateReqVO.returner}}, 点收人: {{#updateReqVO.receiver}}, 备注: {{#updateReqVO.remarks}}";
     String MUSEUMS_SPECIMEN_UPDATE_RECOMPILE_SUCCESS = "成功修改标本出库单【{{#updateReqVO.id}}】:{_DIFF{#updateReqVO}}";
-    String MUSEUMS_SPECIMEN_CREATE_CONFIEM_OUTBOUND_SUCCESS = "{{#operatorNickname}}和{{#twoOperatorNickname}}确认了标本出库";
+    String MUSEUMS_SPECIMEN_CREATE_CONFIEM_OUTBOUND_SUCCESS = "成功标本出库单【{{#existingSpecimen.id}}】已确认出库, 标本信息ID: {{#existingSpecimen.infoId}}";
+
+    //    String MUSEUMS_SPECIMEN_CREATE_CONFIEM_OUTBOUND_SUCCESS = "{{#operatorNickname}}和{{#twoOperatorNickname}}确认了标本出库";
     String MUSEUMS_SPECIMEN_APPROVE_OUTBOUND_SUCCESS = "审批结果：{{#approvalMessage}}，审批人：{{#userNickname}}，审批意见：{{#processInstanceId}}{{#rejectionReasons}}";
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/SpecimenOutboundController.java

@@ -47,8 +47,6 @@ public class SpecimenOutboundController {
     private SpecimenOutboundService specimenOutboundService;
     @Resource
     private PermissionApi permissionApi;
-    @Resource
-    private SpecimenOutboundMapper specimenOutboundMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建标本出库申请")

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/service/specimenoutbound/SpecimenOutboundServiceImpl.java

@@ -343,8 +343,11 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
                 specimenInfoMapper.updateCollectionStatus(Long.valueOf(infoId.trim()), 1);  // 设为借出状态
             }
 
-//            System.out.println(existingSpecimen+"==================================================================");
             // 记录日志上下文
+            LogRecordContext.putVariable("existingSpecimen", existingSpecimen);
+
+//            System.out.println(existingSpecimen+"==================================================================");
+//            // 记录日志上下文
             String operatorNickname = adminUserMapper.selectNicknameByUserId(existingSpecimen.getOperator());
             String twoOperatorNickname = adminUserMapper.selectNicknameByUserId(existingSpecimen.getTwoOperator());
             LogRecordContext.putVariable("operatorNickname", operatorNickname);