Browse Source

为协议、承保、费用列表新增了操作轨迹详情查询能力,支持按业务主键查看字段级增删改变更记录

lixiaolong 2 months ago
parent
commit
0e497de136

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/dto/LogParam.java

@@ -26,4 +26,7 @@ public class LogParam extends PageRequest {
     @Schema(description = "操作内容")
     @Schema(description = "操作内容")
     private String content;
     private String content;
 
 
+    @Schema(description = "业务主键ID(如协议ID,用于查询某条业务记录的全部操作轨迹)")
+    private String primaryValue;
+
 }
 }

+ 7 - 1
commons/src/main/java/com/jzg/commons/service/impl/OperatorTrajectoryServiceImpl.java

@@ -66,6 +66,7 @@ public class OperatorTrajectoryServiceImpl implements OperatorTrajectoryService
         lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getOperator()),OperatorTrajectory::getCreateBy,logParam.getOperator());
         lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getOperator()),OperatorTrajectory::getCreateBy,logParam.getOperator());
         lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getFunction()),OperatorTrajectory::getModuleName,logParam.getFunction());
         lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getFunction()),OperatorTrajectory::getModuleName,logParam.getFunction());
         lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getContent()),OperatorTrajectory::getOperationContent,logParam.getContent());
         lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getContent()),OperatorTrajectory::getOperationContent,logParam.getContent());
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(logParam.getPrimaryValue()),OperatorTrajectory::getPrimaryValue,logParam.getPrimaryValue());
         lambdaQueryWrapper.orderByDesc(OperatorTrajectory::getCreateTime);
         lambdaQueryWrapper.orderByDesc(OperatorTrajectory::getCreateTime);
         if (CollectionUtils.isNotEmpty(logParam.getOperatingTime())) {
         if (CollectionUtils.isNotEmpty(logParam.getOperatingTime())) {
             List<LocalDate> dates = logParam.getOperatingTime();
             List<LocalDate> dates = logParam.getOperatingTime();
@@ -83,9 +84,14 @@ public class OperatorTrajectoryServiceImpl implements OperatorTrajectoryService
         Page page = operatorTrajectoryMapper.selectPage(logParam.getPage(), lambdaQueryWrapper);
         Page page = operatorTrajectoryMapper.selectPage(logParam.getPage(), lambdaQueryWrapper);
         if (page.getTotal() > 0){
         if (page.getTotal() > 0){
             List<OperatorTrajectory> list = page.getRecords();
             List<OperatorTrajectory> list = page.getRecords();
-            list.stream().forEach(item->{
+            boolean needCompare = StringUtils.isNotEmpty(logParam.getPrimaryValue());
+            list.forEach(item->{
                 String nameByCode = Crud.getNameByCode(item.getOperatorType());
                 String nameByCode = Crud.getNameByCode(item.getOperatorType());
                 item.setOperatorName(nameByCode);
                 item.setOperatorName(nameByCode);
+                // 按业务主键查询时(如协议操作轨迹弹窗),填充字段级变更对比结果
+                if (needCompare) {
+                    item.setCompareResultList(CompatibleUtils.compareFieldsMap(item));
+                }
             });
             });
         }
         }
         return page;
         return page;

+ 7 - 0
tenant/organization/src/main/java/com/jzg/organization/controller/AgreementRulesController.java

@@ -1,10 +1,14 @@
 package com.jzg.organization.controller;
 package com.jzg.organization.controller;
 
 
+import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.entity.dto.AgreementRulesAddParam;
 import com.jzg.commons.entity.dto.AgreementRulesAddParam;
 import com.jzg.commons.entity.dto.AgreementRulesEditParam;
 import com.jzg.commons.entity.dto.AgreementRulesEditParam;
+import com.jzg.commons.entity.po.PtlAgreementUndwrtRules;
 import com.jzg.commons.entity.vo.AgreementRulesVo;
 import com.jzg.commons.entity.vo.AgreementRulesVo;
+import com.jzg.organization.mapper.PtlAgreementUndwrtRulesMapper;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrLinkService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrLinkService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Operation;
@@ -54,6 +58,7 @@ public class AgreementRulesController extends BaseController {
      * @author lipf
      * @author lipf
      * @date 2026/4/13 11:32
      * @date 2026/4/13 11:32
      */
      */
+    @OperatorTrajectory(moduleName = "报价配置/协议管理/承保规则/添加规则", mapperClass = PtlAgreementUndwrtRulesMapper.class, entityClass = AgreementRulesAddParam.class)
     @Operation(summary = "添加承保规则")
     @Operation(summary = "添加承保规则")
     @PostMapping("/rulesAdd")
     @PostMapping("/rulesAdd")
     public HttpResult<String> rulesAdd(@Validated @RequestBody AgreementRulesAddParam param) {
     public HttpResult<String> rulesAdd(@Validated @RequestBody AgreementRulesAddParam param) {
@@ -61,6 +66,7 @@ public class AgreementRulesController extends BaseController {
                 HttpResult.ok("添加承保规则成功") : HttpResult.error("添加承保规则失败");
                 HttpResult.ok("添加承保规则成功") : HttpResult.error("添加承保规则失败");
     }
     }
 
 
+    @OperatorTrajectory(moduleName = "报价配置/协议管理/承保规则/修改规则", type = "U", OperationDict = OperationTypeEnum.UPDATE, mapperClass = PtlAgreementUndwrtRulesMapper.class, entityClass = AgreementRulesEditParam.class)
     @Operation(summary = "修改承保规则")
     @Operation(summary = "修改承保规则")
     @PostMapping("/rulesEdit")
     @PostMapping("/rulesEdit")
     public HttpResult rulesEdit(@RequestBody AgreementRulesEditParam param) {
     public HttpResult rulesEdit(@RequestBody AgreementRulesEditParam param) {
@@ -68,6 +74,7 @@ public class AgreementRulesController extends BaseController {
                 HttpResult.ok("修改承保规则成功") : HttpResult.error("修改承保规则失败");
                 HttpResult.ok("修改承保规则成功") : HttpResult.error("修改承保规则失败");
     }
     }
 
 
+    @OperatorTrajectory(moduleName = "报价配置/协议管理/承保规则/删除规则", OperationDict = OperationTypeEnum.DELETE, type = "D", mapperClass = PtlAgreementUndwrtRulesMapper.class, entityClass = PtlAgreementUndwrtRules.class)
     @Operation(summary = "删除承保规则")
     @Operation(summary = "删除承保规则")
     @DeleteMapping("/rulesDelete")
     @DeleteMapping("/rulesDelete")
     public HttpResult rulesDelete(String id) {
     public HttpResult rulesDelete(String id) {