优化了日志记录

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

@@ -12,24 +12,26 @@ public interface LogRecordConstants {
 
     String MUSEUMS_SPECIMEN_TYPE = "MUSEUMS 标本";
     String MUSEUMS_SPECIMEN_CREATE_SUB_TYPE = "创建标本";
-    String MUSEUMS_SPECIMEN_CREATE_SUCCESS = "创建了标本【{{#specimenInfo.specimenNumber}}】";
+    String MUSEUMS_SPECIMEN_CREATE_SUCCESS = "成功创建标本【{{#specimenInfo.specimenNumber}}】";
     String MUSEUMS_SPECIMEN_UPDATE_SUB_TYPE = "更新标本";
-    String MUSEUMS_SPECIMEN_UPDATE_SUCCESS = "更新了标本【{{#updateReqVO.specimenNumber}}】: {_DIFF{#updateReqVO}}";
+    String MUSEUMS_SPECIMEN_UPDATE_SUCCESS = "成功更新标本【{{#updateReqVO.specimenNumber}}】: {_DIFF{#updateReqVO}}";
 
     String MUSEUMS_SPECIMEN_DELETE_SUB_TYPE = "删除标本";
-    String MUSEUMS_SPECIMEN_DELETE_SUCCESS = "删除了标本【编号: {{#specimenNumber}}】, 理由: {{#deletedReason}}";
+    String MUSEUMS_SPECIMEN_DELETE_SUCCESS = "删除了标本【编号: {{#specimenNumber}}】, 删除原因: {{#deletedReason}}";
 
     // ======================= SPECIMEN 导入 =======================
     String SPECIMEN_IMPORT_SUB_TYPE = "导入标本";
     String SPECIMEN_IMPORT_SUCCESS = "成功导入标本";
-    String SPECIMEN_IMPORT_SUCCESS_ID = "{{#extra}}";
 
     // ======================= SPECIMEN_OUTBOUND 相关日志 =======================
-    String MUSEUMS_SPECIMEN_OUTBOUND_SUB_TYPE = "标本出库";
-    String MUSEUMS_SPECIMEN_RETURN_SUB_TYPE = "标本回库";
-    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_OUTBOUND_SUB_TYPE = "提交出库申请";
+    String MUSEUMS_SPECIMEN_OUTBOUND_APPROVAL = "标本出库审批";
+    String MUSEUMS_SPECIMEN_OUTBOUND_ORDER_MODIFICATION = "修改出库单";
+    String MUSEUMS_SPECIMEN_OUTBOUND_CONFIRM = "确认标本出库";
+    String MUSEUMS_SPECIMEN_RETURN_SUB_TYPE = "确认标本回库";
+    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 = "{{#operator}}确认了标本出库";
-    String MUSEUMS_SPECIMEN_APPROVE_OUTBOUND_SUCCESS = "审批结果：{{#approvalMessage}}，审批人：{{#userNickname}}，审批建议：{{#processInstanceId}}{{#rejectionReasons}}";
+    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/service/specimeninfo/SpecimenInfoServiceImpl.java

@@ -151,7 +151,7 @@ public class SpecimenInfoServiceImpl implements SpecimenInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class) // 添加事务，异常则回滚所有导入
     @LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = SPECIMEN_IMPORT_SUB_TYPE, bizNo = "1",
-            success = SPECIMEN_IMPORT_SUCCESS, extra = SPECIMEN_IMPORT_SUCCESS_ID)
+            success = SPECIMEN_IMPORT_SUCCESS, extra = "{{#extra}}")
     public SpecimenImportRespVO importSpecimenList(List<SpecimenImportExcelVO> importSpecimens, boolean isUpdateSupport) {
         // 1.1 参数校验
         if (CollUtil.isEmpty(importSpecimens)) {

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

@@ -86,7 +86,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
     //出库审批
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = MUSEUMS_SPECIMEN_OUTBOUND_SUB_TYPE,
+    @LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = MUSEUMS_SPECIMEN_OUTBOUND_APPROVAL,
             bizNo = "{{#req.id}}",
             success = MUSEUMS_SPECIMEN_APPROVE_OUTBOUND_SUCCESS,
             extra = "{{#specimenOutbound.infoId}}")
@@ -152,7 +152,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
 
     //审批前或审批驳回修改出库单
     @Override
-    @LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = MUSEUMS_SPECIMEN_OUTBOUND_SUB_TYPE,
+    @LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = MUSEUMS_SPECIMEN_OUTBOUND_ORDER_MODIFICATION,
             bizNo = "{{#updateReqVO.id}}", // 使用更新的出库单 ID
             success = MUSEUMS_SPECIMEN_UPDATE_RECOMPILE_SUCCESS, extra = "{{#updateReqVO.infoId}}")
     public void recompileSpecimenOutbound(@Valid SpecimenOutboundSaveReqVO updateReqVO) {
@@ -172,7 +172,6 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
                 throw exception(EXISTS_SPECIMEN_IS_LENDING_OUT);
             }
         }
-
         // 更新
         SpecimenOutboundDO updateObj = BeanUtils.toBean(updateReqVO, SpecimenOutboundDO.class);
         updateObj.setInfoId(validInfoIds.toString());
@@ -186,7 +185,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
     //确认出库，已经简化
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = MUSEUMS_SPECIMEN_OUTBOUND_SUB_TYPE,
+    @LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = MUSEUMS_SPECIMEN_OUTBOUND_CONFIRM,
             bizNo = "{{#existingSpecimen.id}}", // 使用出库单 ID
             success = MUSEUMS_SPECIMEN_CREATE_CONFIEM_OUTBOUND_SUCCESS,
             extra = "{{#existingSpecimen.infoId}}") // 使用标本信息 ID