fix: contract update stage log

--bug=1069703@tapd-34675357 --user=王旭 【合同】看板模式-合同完结阶段合同卡片拖拽移动到作废-生成日志详情修改前阶段错误 https://www.tapd.cn/34675357/s/1930522

Author: WangXu10

backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractService.java

@@ -4,6 +4,7 @@
 import cn.cordys.aspectj.constants.LogModule;
 import cn.cordys.aspectj.constants.LogType;
 import cn.cordys.aspectj.context.OperationLogContext;
+import cn.cordys.aspectj.dto.LogContextInfo;
 import cn.cordys.aspectj.dto.LogDTO;
 import cn.cordys.common.constants.BusinessModuleField;
 import cn.cordys.common.constants.FormKey;
@@ -593,14 +594,17 @@ public ResourceTabEnableDTO getTabEnableConfig(String userId, String orgId) {
      * @param request
      * @param userId
      */
+    @OperationLog(module = LogModule.CONTRACT_INDEX, type = LogType.UPDATE, resourceId = "{#request.id}")
     public void updateStage(ContractStageRequest request, String userId, String orgId) {
         Contract contract = contractMapper.selectByPrimaryKey(request.getId());
         if (contract == null) {
             throw new GenericException(Translator.get("contract.not.exist"));
         }
 
-        Map<String, String> oldMap = new HashMap<>();
-        oldMap.put("contractStage", Translator.get("contract.stage." + contract.getStage().toLowerCase()));
+        List<StageConfigResponse> stageConfigList = extContractStageConfigMapper.getStageConfigList(orgId);
+
+        Map<String, String> stageMap = stageConfigList.stream()
+                .collect(Collectors.toMap(StageConfigResponse::getId, StageConfigResponse::getName));
 
         contract.setStage(request.getStage());
         if (StringUtils.isNotBlank(request.getVoidReason())) {
@@ -613,20 +617,25 @@ public void updateStage(ContractStageRequest request, String userId, String orgI
 
         updateStatusSnapshot(request.getId(), request.getStage(), null);
 
-        LogDTO logDTO = new LogDTO(orgId, request.getId(), userId, LogType.UPDATE, LogModule.CONTRACT_INDEX, contract.getName());
-        Map<String, String> newMap = new HashMap<>();
-        newMap.put("contractStage", Translator.get("contract.stage." + request.getStage().toLowerCase()));
-        logDTO.setOriginalValue(oldMap);
-        logDTO.setModifiedValue(newMap);
-        logService.add(logDTO);
-
         if (Strings.CI.equals(request.getStage(), ContractStage.VOID.name()) || Strings.CI.equals(request.getStage(), ContractStage.ARCHIVED.name())) {
             String event = Strings.CI.equals(request.getStage(), ContractStage.VOID.name()) ?
                     NotificationConstants.Event.CONTRACT_VOID : NotificationConstants.Event.CONTRACT_ARCHIVED;
             Customer customer = customerBaseMapper.selectByPrimaryKey(contract.getCustomerId());
             sendNotice(contract, userId, orgId, event, customer.getName());
         }
 
+        final Map<String, String> originalVal = new HashMap<>(1);
+        originalVal.put("contractStage", stageMap.get(contract.getStage()));
+        final Map<String, String> modifiedVal = new HashMap<>(1);
+        modifiedVal.put("contractStage", stageMap.get(request.getStage()));
+        OperationLogContext.setContext(
+                LogContextInfo.builder()
+                        .resourceName(contract.getName())
+                        .originalValue(originalVal)
+                        .modifiedValue(modifiedVal)
+                        .build()
+        );
+
     }
 
     /**

backend/crm/src/main/java/cn/cordys/crm/order/service/OrderService.java

@@ -4,6 +4,7 @@
 import cn.cordys.aspectj.constants.LogModule;
 import cn.cordys.aspectj.constants.LogType;
 import cn.cordys.aspectj.context.OperationLogContext;
+import cn.cordys.aspectj.dto.LogContextInfo;
 import cn.cordys.aspectj.dto.LogDTO;
 import cn.cordys.common.constants.BusinessModuleField;
 import cn.cordys.common.constants.FormKey;
@@ -586,12 +587,18 @@ public Order selectByPrimaryKey(String id) {
         return orderMapper.selectByPrimaryKey(id);
     }
 
+
+    @OperationLog(module = LogModule.ORDER_INDEX, type = LogType.UPDATE, resourceId = "{#request.id}")
     public void updateStage(OrderStageRequest request, String userId, String orgId) {
         Order order = orderMapper.selectByPrimaryKey(request.getId());
         if (order == null) {
             throw new GenericException(CrmHttpResultCode.NOT_FOUND);
         }
 
+        List<StageConfigResponse> stageConfigList = extOrderStageConfigMapper.getStageConfigList(orgId);
+        Map<String, String> stageMap = stageConfigList.stream()
+                .collect(Collectors.toMap(StageConfigResponse::getId, StageConfigResponse::getName));
+
         Map<String, String> oldMap = new HashMap<>();
         oldMap.put("orderStage", Translator.get("order.stage." + order.getStage().toLowerCase()));
 
@@ -603,12 +610,17 @@ public void updateStage(OrderStageRequest request, String userId, String orgId)
 
         updateStageSnapshot(request.getId(), request.getStage());
 
-        LogDTO logDTO = new LogDTO(orgId, request.getId(), userId, LogType.UPDATE, LogModule.ORDER_INDEX, order.getName());
-        Map<String, String> newMap = new HashMap<>();
-        newMap.put("orderStage", Translator.get("order.stage." + request.getStage().toLowerCase()));
-        logDTO.setOriginalValue(oldMap);
-        logDTO.setModifiedValue(newMap);
-        logService.add(logDTO);
+        final Map<String, String> originalVal = new HashMap<>(1);
+        originalVal.put("orderStage", stageMap.get(order.getStage()));
+        final Map<String, String> modifiedVal = new HashMap<>(1);
+        modifiedVal.put("orderStage", stageMap.get(request.getStage()));
+        OperationLogContext.setContext(
+                LogContextInfo.builder()
+                        .resourceName(order.getName())
+                        .originalValue(originalVal)
+                        .modifiedValue(modifiedVal)
+                        .build()
+        );
     }
 
     /**