操作日志修改

commons/src/main/java/com/jzg/commons/aop/OperatorTrajectory.java

@@ -1,5 +1,7 @@
 package com.jzg.commons.aop;
 
+import com.jzg.commons.constants.OperationTypeEnum;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -32,6 +34,8 @@ public @interface OperatorTrajectory {
 
     Class<?> mapperClass();
 
+    OperationTypeEnum OperationDict() default OperationTypeEnum.SAVE;
+
 }
 
 

commons/src/main/java/com/jzg/commons/aop/aspect/OperatorTrajectoryAspect.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.async.AsyncFactory;
 import com.jzg.commons.async.AsyncManager;
-import com.jzg.commons.constants.Crud;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.exception.SystemException;
@@ -29,6 +28,7 @@ import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.Map;
 import java.util.Objects;
 
@@ -81,16 +81,6 @@ public class OperatorTrajectoryAspect {
     }
 
 
-    public String getContent(Object obj,String type) {
-        String generated = DescriptionUtils.generateDescription(obj);
-        if (StringUtils.isNotEmpty(generated)){
-            generated = Crud.getNameByCode(type) + generated;
-        }
-        return generated;
-
-    }
-
-
     //拦截异常消息
     @AfterThrowing(pointcut = "@annotation(com.jzg.commons.aop.OperatorTrajectory)", throwing = "ex")
     public void doAfterThrowing(JoinPoint joinPoint, Throwable ex) {
@@ -111,7 +101,14 @@ public class OperatorTrajectoryAspect {
     @Before("@annotation(operatorTrajectory)")
     public void doBefore(JoinPoint point,  OperatorTrajectory operatorTrajectory){
         Object obj = point.getArgs()[0];
-        String id = JSON.parseObject(JSONObject.toJSONString(obj)).getString(operatorTrajectory.primary());
+        String id;
+        if (obj instanceof String){
+            id = obj.toString();
+        }else if (obj instanceof Collection){
+            id = StringUtils.join(obj);
+        }else {
+            id = JSON.parseObject(JSONObject.toJSONString(obj)).getString(operatorTrajectory.primary());
+        }
         if (isRecorded(operatorTrajectory.isRecorded(),obj)){
             return;
         }
@@ -131,10 +128,11 @@ public class OperatorTrajectoryAspect {
             trajectory.setAfterJson(JSON.toJSONString(obj));
         }
         Object beforeData;
+        String operatorName = operatorTrajectory.OperationDict().getName();
         switch(operatorTrajectory.type()){
             //创建
             case "C":
-                trajectory.setOperationContent(getContent(obj,operatorTrajectory.type()));
+                trajectory.setOperationContent(DescriptionUtils.generateDescription(obj,operatorName));
                 operatorTrajectoryService.save(trajectory);
                 break;
             //更新
@@ -144,7 +142,7 @@ public class OperatorTrajectoryAspect {
                 if (!Objects.isNull(beforeData)){
                     trajectory.setBeforeJson(JSON.toJSONString(beforeData));
                 }
-                trajectory.setOperationContent(getContent(obj,operatorTrajectory.type()));
+                trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData,operatorName));
                 operatorTrajectoryService.save(trajectory);
                 break;
             //删除
@@ -152,7 +150,7 @@ public class OperatorTrajectoryAspect {
                 beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), id);
                 trajectory.setPrimaryValue(id);
                 trajectory.setBeforeJson(JSON.toJSONString(beforeData));
-                trajectory.setOperationContent(getContent(beforeData,operatorTrajectory.type()));
+                trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData,operatorName));
                 operatorTrajectoryService.save(trajectory);
                 break;
 

commons/src/main/java/com/jzg/commons/constants/OperationTypeEnum.java

@@ -0,0 +1,27 @@
+package com.jzg.commons.constants;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum OperationTypeEnum {
+
+    SAVE("save", "添加了"),
+    UPDATE("update", "编辑了"),
+    CHANGE("change", "变更了"),
+    SUPPORT("support", "将"),
+    TRANSFER("transfer", "转移了"),
+    DELETE("delete", "删除了"),
+    ACT("act", "为"),
+    ALLOCATION("allocation", "分配"),
+    ENABLED("Enabled", "启用了"),
+    DISABLED("Disabled", "禁用了"),
+    COPY("copy", "复制了"),
+    EDITED_AGREEMENT("Edited_agreement","编辑了协议"),
+    IN_AGREEMENT("In_agreement", "在协议");
+
+    private final String code;
+    private final String name;
+
+}

commons/src/main/java/com/jzg/commons/entity/agreement/vo/PtlAgreementAttributionSaveVo.java

@@ -1,6 +1,7 @@
 package com.jzg.commons.entity.agreement.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.jzg.commons.aop.LogDescriptionField;
 import com.jzg.commons.entity.agreement.dto.PtlAttributionTemplateDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -21,6 +22,7 @@ public class PtlAgreementAttributionSaveVo {
     private String userDept;
 
     @Schema(description = "保险公司id")
+    @LogDescriptionField("保险公司")
     private String insCompanyId;
 
     @Schema(description = "保险公司名称")
@@ -30,6 +32,7 @@ public class PtlAgreementAttributionSaveVo {
     private String templateId;
 
     @Schema(description = "api类型 1 api 2 python")
+    @LogDescriptionField("对接方式-的保险公司账号")
     private String apiType;
 
     @Schema(description = "字段集")
@@ -42,6 +45,7 @@ public class PtlAgreementAttributionSaveVo {
     private String password;
 
     @Schema(description = "保险公司账号简称")
+    @LogDescriptionField("：")
     private String userAbbr;
 
     @Schema(description = "保险公司账号登录地址")

commons/src/main/java/com/jzg/commons/entity/dto/AgreementAddParam.java

@@ -1,6 +1,6 @@
 package com.jzg.commons.entity.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.aop.LogDescriptionField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
@@ -15,6 +15,7 @@ public class AgreementAddParam {
     @Schema(description = "协议名称")
     @Size(min=1,max=50,message = "协议名称长度不能大于50")
     @NotNull(message = "协议名称不能为空")
+    @LogDescriptionField("协议")
     private String agreementTitle;
 
     @Schema(description = "协议简称")

commons/src/main/java/com/jzg/commons/entity/dto/AgreementEditParam.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.dto;
 
+import com.jzg.commons.aop.LogDescriptionField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
@@ -18,6 +19,7 @@ public class AgreementEditParam {
     @Schema(description = "协议名称")
     @Size(min=1,max=50,message = "协议名称长度不能大于50")
     @NotNull(message = "协议名称不能为空")
+    @LogDescriptionField("协议")
     private String agreementTitle;
 
     @Schema(description = "协议简称")

commons/src/main/java/com/jzg/commons/entity/dto/PtlAgreemenCostAdd.java

@@ -0,0 +1,28 @@
+package com.jzg.commons.entity.dto;
+
+import com.jzg.commons.aop.LogDescriptionField;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class PtlAgreemenCostAdd {
+
+    @Schema(description = "协议ID")
+    private String ptlAgreementId;
+
+    @Schema(description = "协议CODE")
+    @LogDescriptionField("协议号")
+    private String ptlAgreementCode;
+
+    @LogDescriptionField("协议名称-中增加了一条新的费用")
+    @Schema(description = "协议名称")
+    private String ptlAgreementName;
+
+
+    @Schema(description = "费用集合")
+    private List<CostAdd> costAddList;
+
+}

commons/src/main/java/com/jzg/commons/entity/dto/PtlAgreementCostEnd.java

@@ -2,6 +2,7 @@ package com.jzg.commons.entity.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.aop.LogDescriptionField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -27,6 +28,14 @@ public class PtlAgreementCostEnd {
     @NotBlank(message = "险种不能为空")
     private String productName;
 
+    @Schema(description = "协议CODE")
+    @LogDescriptionField("协议号")
+    private String ptlAgreementCode;
+
+    @Schema(description = "协议名称")
+    @LogDescriptionField("协议名称-中的的费用")
+    private String ptlAgreementName;
+
     @Schema(description = "险种ID")
     private String productId;
 

commons/src/main/java/com/jzg/commons/entity/dto/SysOrganizationAdd.java

@@ -1,6 +1,7 @@
 package com.jzg.commons.entity.dto;
 
 
+import com.jzg.commons.aop.LogDescriptionField;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
@@ -20,6 +21,7 @@ public class SysOrganizationAdd extends BaseModel {
     @Schema(description = "角色名称")
     @NotNull(message = "角色名称不能为空")
     @Size(min=1,max=20,message = "角色名称长度不能大于20")
+    @LogDescriptionField("团队")
     private String name;
 
     @Schema(description = "所属机构ID")

commons/src/main/java/com/jzg/commons/entity/dto/SysOrganizationEnd.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.dto;
 
+import com.jzg.commons.aop.LogDescriptionField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
@@ -19,6 +20,7 @@ public class SysOrganizationEnd {
     @Schema(description = "角色名称")
     @NotNull(message = "角色名称不能为空")
     @Size(min=1,max=20,message = "角色名称长度不能大于20")
+    @LogDescriptionField("团队")
     private String name;
 
     @Schema(description = "所属机构ID")

commons/src/main/java/com/jzg/commons/entity/vo/PtlAgreementCostVo.java

@@ -2,6 +2,7 @@ package com.jzg.commons.entity.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.aop.LogDescriptionField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.util.Date;
@@ -23,6 +24,14 @@ public class PtlAgreementCostVo {
     @Schema(description = "险种ID")
     private String productId;
 
+    @Schema(description = "协议CODE")
+    @LogDescriptionField("协议号")
+    private String ptlAgreementCode;
+
+    @Schema(description = "协议名称")
+    @LogDescriptionField("协议名称-中的的费用")
+    private String ptlAgreementName;
+
     @Schema(description = "生效时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date effectiveTime;

commons/src/main/java/com/jzg/commons/util/comparble/DescriptionUtils.java

@@ -10,11 +10,12 @@ import java.util.Collection;
 @Slf4j
 public class DescriptionUtils {
 
-    public static String generateDescription(Object obj) {
+    public static String generateDescription(Object obj,String operatorName) {
         if (ObjectUtil.isNull(obj)) {
             return null;
         }
         StringBuilder description = new StringBuilder();
+        description.append(operatorName);
         if (obj instanceof Collection) {
             processCollection((Collection<?>) obj, description);
         } else {
@@ -56,7 +57,11 @@ public class DescriptionUtils {
                     if (appendComma && description.length() > 0) {
                         description.append(",");
                     }
-                    description.append(fieldDescription).append(" %").append(fieldValue).append("%");
+                    if (fieldDescription.contains("-")){
+                        description.append(fieldDescription.substring(0, fieldDescription.indexOf("-"))).append(" %").append(fieldValue).append("%").append(fieldDescription.substring(fieldDescription.substring(0, fieldDescription.indexOf("-")).length()+1, fieldDescription.length())) ;
+                    }else {
+                        description.append(fieldDescription).append(" %").append(fieldValue).append("%");
+                    }
                     appendComma = true;
                 }
             }

platform/src/main/java/com/jzg/controller/AgreementAttributionController.java

@@ -1,12 +1,14 @@
 package com.jzg.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementAttributionDeptVo;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementAttributionQueryVo;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementAttributionSaveVo;
-import com.jzg.commons.entity.dto.AgreementAuthParam;
 import com.jzg.commons.request.RequestSingleParam;
+import com.jzg.mapper.PtlAgreementAttributionMapper;
 import com.jzg.service.PtlAgreementAttributionDeptService;
 import com.jzg.service.PtlAgreementAttributionService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -33,6 +35,7 @@ public class AgreementAttributionController {
     @Resource
     private PtlAgreementAttributionDeptService agreementAttributionDeptService;
 
+    @OperatorTrajectory(entityClass = PtlAgreementAttributionSaveVo.class,mapperClass = PtlAgreementAttributionMapper.class,moduleName = "报价配置/保司账号/添加账号")
     @Operation(summary = "添加保险公司账号接口", description = "添加保险公司账号接口")
     @PostMapping(value = "/addAgreementAttribution")
     public HttpResult<Object> addAgreementAttribution(@RequestBody PtlAgreementAttributionSaveVo agreementAttributionSaveVo){
@@ -52,6 +55,7 @@ public class AgreementAttributionController {
         return HttpResult.ok(agreementAttributionService.getAgreementAttributionList(page,ptlAgreementAttributionQueryVo));
     }
 
+    @OperatorTrajectory(entityClass = PtlAgreementAttributionSaveVo.class,type = "U", OperationDict = OperationTypeEnum.UPDATE, mapperClass = PtlAgreementAttributionMapper.class,moduleName = "报价配置/保司账号/添加账号")
     @Operation(summary = "修改保险公司账号接口", description = "修改保险公司账号接口")
     @PostMapping(value = "/updateAgreementAttribution")
     public HttpResult updateAgreementAttribution(@RequestBody PtlAgreementAttributionSaveVo agreementAttributionSaveVo){
@@ -64,18 +68,21 @@ public class AgreementAttributionController {
         return HttpResult.ok(agreementAttributionService.getAgreementUrlList(companyId));
     }
 
+    @OperatorTrajectory(entityClass = PtlAgreementAttributionSaveVo.class,type = "D",primary = "ids", OperationDict = OperationTypeEnum.DELETE, mapperClass = PtlAgreementAttributionMapper.class,moduleName = "报价配置/保司账号/删除账号")
     @Operation(summary = "批量删除保险公司账号接口", description = "批量删除保险公司账号接口")
     @PostMapping(value = "/deleteAgreementAttribution")
     public HttpResult deleteAgreementAttribution(@RequestSingleParam(value = "ids") List<String> ids){
         return agreementAttributionService.deleteAgreementAttribution(ids) ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
     }
 
+    @OperatorTrajectory(entityClass = PtlAgreementAttributionSaveVo.class,type = "U",primary = "ids", OperationDict = OperationTypeEnum.ENABLED, mapperClass = PtlAgreementAttributionMapper.class,moduleName = "报价配置/保司账号/启用账号")
     @Operation(summary = "批量启用保险公司账号接口", description = "批量启用保险公司账号接口")
     @PostMapping(value = "/enableAgreementAttribution")
     public HttpResult enableAgreementAttribution(@RequestSingleParam(value = "ids") List<String> ids){
         return agreementAttributionService.enableAgreementAttribution(ids) ? HttpResult.ok("启用成功") : HttpResult.error("启用失败");
     }
 
+    @OperatorTrajectory(entityClass = PtlAgreementAttributionSaveVo.class,type = "U",primary = "ids", OperationDict = OperationTypeEnum.DISABLED, mapperClass = PtlAgreementAttributionMapper.class,moduleName = "报价配置/保司账号/禁用账号")
     @Operation(summary = "批量禁用保险公司账号接口", description = "批量禁用保险公司账号接口")
     @PostMapping(value = "/disableAgreementAttribution")
     public HttpResult disableAgreementAttribution(@RequestSingleParam(value = "ids") List<String> ids){

platform/src/main/java/com/jzg/controller/UserRoleController.java

@@ -2,6 +2,7 @@ package com.jzg.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
@@ -63,7 +64,7 @@ public class UserRoleController extends BaseController {
         return userRoleService.roleAdd(sysRoleVo) ? HttpResult.ok("添加角色成功") : HttpResult.error("添加角色失败");
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/角色管理/修改角色",mapperClass = SysRoleMapper.class,type = "U",entityClass = SysRoleVo.class )
+    @OperatorTrajectory(moduleName = "组织架构/角色管理/修改角色",OperationDict = OperationTypeEnum.UPDATE, mapperClass = SysRoleMapper.class,type = "U",entityClass = SysRoleVo.class )
     @Operation(summary = "角色修改")
     @PostMapping("/roleUpdate")
     public HttpResult roleUpdate(@Validated @RequestBody SysRoleVo sysRoleVo){
@@ -93,7 +94,7 @@ public class UserRoleController extends BaseController {
         return userRoleService.roleDeleteValid(roleVo) ? HttpResult.ok("角色可以进行删除") : HttpResult.error("删除角色前，请先移除角色内的所有成员");
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/角色管理/删除角色",mapperClass = SysRoleMapper.class,type = "D", entityClass = SysRoleVo.class )
+    @OperatorTrajectory(moduleName = "组织架构/角色管理/删除角色",OperationDict = OperationTypeEnum.DELETE,mapperClass = SysRoleMapper.class,type = "D", entityClass = SysRoleVo.class )
     @Operation(summary = "角色删除")
     @PostMapping("/roleDelete")
     public HttpResult roleDelete(@RequestBody SysRoleVo roleVo){

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrdersController.java

@@ -28,7 +28,6 @@ public class InsOrdersController {
     @Resource
     private InsOrdersService insOrdersService;
 
-    //@OperatorTrajectory(moduleName = "车险订单（补录）",serviceTag = "insOrdersService",entityClass = InsOrdersAdd.class,isRecorded = "insOrders.isTemporarily")
     @Resource
     private InsTaskImagesService insTaskImagesService;
 

tenant/organization/src/main/java/com/jzg/organization/controller/AgreementController.java

@@ -1,6 +1,7 @@
 package com.jzg.organization.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
@@ -9,6 +10,7 @@ import com.jzg.commons.entity.po.PtlAgreement;
 import com.jzg.commons.entity.vo.AgreementVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.util.AssertionUtils;
+import com.jzg.organization.mapper.PtlAgreementMapper;
 import com.jzg.organization.service.PtlAgreementDeptService;
 import com.jzg.organization.service.PtlAgreementService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -64,6 +66,7 @@ public class AgreementController extends BaseController {
      * @param param
      * @return
      */
+    @OperatorTrajectory(moduleName = "报价配置/协议管理/添加协议",mapperClass = PtlAgreementMapper.class,entityClass = AgreementAddParam.class)
     @Operation(summary = "协议添加")
     @PostMapping("/agreementAdd")
     public HttpResult agreementAdd(@Validated @RequestBody AgreementAddParam param) {
@@ -84,6 +87,7 @@ public class AgreementController extends BaseController {
      * @param param
      * @return
      */
+    @OperatorTrajectory(moduleName = "报价配置/协议管理/添加协议",type = "U", mapperClass = PtlAgreementMapper.class,entityClass = AgreementAddParam.class)
     @Operation(summary = "协议修改")
     @PostMapping("/agreementEdit")
     public HttpResult agreementEdit(@Validated @RequestBody AgreementEditParam param) {
@@ -163,6 +167,7 @@ public class AgreementController extends BaseController {
      * @param upAndDownVo
      * @return
      */
+    @OperatorTrajectory(moduleName = "报价配置/协议管理/(启用、禁用)协议",primary = "ids", type = "U", mapperClass = PtlAgreementMapper.class,entityClass = AgreementAddParam.class)
     @PostMapping("/sysUpAndDown")
     @Operation(summary = "启用/禁用协议")
     public HttpResult upAndDown(@RequestBody UpAndDownVo upAndDownVo) {

tenant/organization/src/main/java/com/jzg/organization/controller/DeptController.java

@@ -1,6 +1,7 @@
 package com.jzg.organization.controller;
 
 import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysDeptParam;
@@ -31,7 +32,7 @@ public class DeptController extends BaseController {
         return sysDeptService.addDept(sysDeptVo) ? HttpResult.ok("添加机构成功") : HttpResult.error("添加机构失败");
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/机构管理/机构修改",mapperClass = SysDeptMapper.class,entityClass = SysDeptVo.class,type = "U")
+    @OperatorTrajectory(moduleName = "组织架构/机构管理/机构修改",OperationDict = OperationTypeEnum.UPDATE, mapperClass = SysDeptMapper.class,entityClass = SysDeptVo.class,type = "U")
     @Operation(summary = "修改机构接口", description = "修改机构接口")
     @PostMapping(value = "/update")
     public HttpResult updateDept(@RequestBody SysDeptVo sysDeptVo) {
@@ -39,7 +40,7 @@ public class DeptController extends BaseController {
         return sysDeptService.updateDept(sysDeptVo) ? HttpResult.ok("修改成功") : HttpResult.error("修改失败");
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/机构管理/机构删除",mapperClass = SysDeptMapper.class,entityClass = SysDeptVo.class,type = "U")
+    @OperatorTrajectory(moduleName = "组织架构/机构管理/机构删除",OperationDict = OperationTypeEnum.DELETE,mapperClass = SysDeptMapper.class,entityClass = SysDeptVo.class,type = "D")
     @Operation(summary = "删除机构接口", description = "删除机构接口")
     @PostMapping(value = "/delete")
     public HttpResult deleteDept(@RequestBody SysDeptVo sysDeptVo) {
@@ -47,7 +48,7 @@ public class DeptController extends BaseController {
     }
 
 
-    @OperatorTrajectory(moduleName = "组织架构/机构管理/机构删除",mapperClass = SysDeptMapper.class,primary = "deptIds",entityClass = SysDeptVo.class,type = "U")
+    @OperatorTrajectory(moduleName = "组织架构/机构管理/机构删除",OperationDict = OperationTypeEnum.DELETE,mapperClass = SysDeptMapper.class,primary = "deptIds",entityClass = SysDeptVo.class,type = "D")
     @Operation(summary = "批量删除机构接口", description = "批量删除机构接口")
     @PostMapping(value = "/batchDeleteDept")
     public HttpResult batchDeleteDept(@RequestBody SysDeptVo sysDeptVo) {

tenant/organization/src/main/java/com/jzg/organization/controller/PtlAgreementCostController.java

@@ -1,9 +1,12 @@
 package com.jzg.organization.controller;
 
 
+import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
-import com.jzg.commons.request.RequestSingleParam;
+import com.jzg.commons.entity.vo.PtlAgreementCostVo;
+import com.jzg.organization.mapper.PtlAgreementCostMapper;
 import com.jzg.organization.service.PtlAgreementCostService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,20 +28,21 @@ public class PtlAgreementCostController {
     @Autowired
     private PtlAgreementCostService ptlAgreementCostService;
 
+    @OperatorTrajectory(moduleName = "报价配置/费用管理/新增费用",OperationDict = OperationTypeEnum.IN_AGREEMENT,mapperClass = PtlAgreementCostMapper.class,entityClass = PtlAgreemenCostAdd.class)
     @Operation(summary = "协议费用管理新增")
     @PostMapping("save")
-    public HttpResult add(@RequestBody @Valid List<CostAdd> costAddList){
-        return ptlAgreementCostService.save(costAddList);
+    public HttpResult add(@RequestBody @Valid PtlAgreemenCostAdd ptlAgreemenCostAdd){
+        return ptlAgreementCostService.save(ptlAgreemenCostAdd);
     }
 
-
+    @OperatorTrajectory(moduleName = "报价配置/费用管理/修改费用",OperationDict = OperationTypeEnum.EDITED_AGREEMENT, type = "U", mapperClass = PtlAgreementCostMapper.class,entityClass = PtlAgreementCostEnd.class)
     @Operation(summary = "协议费用管理修改")
     @PostMapping("update")
     public HttpResult update(@RequestBody @Valid PtlAgreementCostEnd costEndList){
         return ptlAgreementCostService.update(costEndList);
     }
 
-
+    @OperatorTrajectory(moduleName = "报价配置/费用管理/删除费用",OperationDict = OperationTypeEnum.DELETE, type = "D", mapperClass = PtlAgreementCostMapper.class,entityClass = PtlAgreementCostVo.class)
     @Operation(summary = "协议费用管理批量删除")
     @PostMapping("deleteByIds")
     public HttpResult deleteById(@RequestBody @NotEmpty(message = "id不能为空") List<String> ids){
@@ -51,7 +55,7 @@ public class PtlAgreementCostController {
         return ptlAgreementCostService.queryById(id);
     }
 
-
+    @OperatorTrajectory(moduleName = "报价配置/费用管理/(启用、禁用)费用",OperationDict = OperationTypeEnum.ENABLED, type = "U", mapperClass = PtlAgreementCostMapper.class,entityClass = PtlAgreementCostVo.class)
     @Operation(summary = "协议费用管理批量禁用/启用")
     @PostMapping("enableDisableByIds")
     public HttpResult enableDisableByIds(@RequestBody @NotEmpty(message = "id不能为空") List<String> ids, @NotNull(message = "状态不能为空") Boolean isEnabled){

tenant/organization/src/main/java/com/jzg/organization/controller/SysOrganizationController.java

@@ -2,11 +2,14 @@ package com.jzg.organization.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.SysOrganization;
 import com.jzg.commons.entity.vo.SysOrganizationUserLinkQueryVo;
 import com.jzg.commons.util.idgen.IdGenerate;
+import com.jzg.organization.mapper.SysOrganizationMapper;
 import com.jzg.organization.service.SysOrganizationService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.BeanUtils;
@@ -63,6 +66,7 @@ public class SysOrganizationController {
      * @param organizationAdd
      * @return
      */
+    @OperatorTrajectory(moduleName = "业务管理/团队管理/添加团队",mapperClass = SysOrganizationMapper.class,entityClass = SysOrganizationAdd.class)
     @Operation(summary = "团队、渠道、电销组 新增", description = "新增")
     @PostMapping("save")
     public HttpResult save(@Validated  @RequestBody SysOrganizationAdd organizationAdd){
@@ -81,6 +85,7 @@ public class SysOrganizationController {
      * @param organizationEnd
      * @return
      */
+    @OperatorTrajectory(moduleName = "业务管理/团队管理/添加团队",type = "U",OperationDict = OperationTypeEnum.UPDATE, mapperClass = SysOrganizationMapper.class,entityClass = SysOrganizationAdd.class)
     @Operation(summary = "团队、渠道、电销组 修改", description = "修改")
     @PostMapping("update")
     public HttpResult update(@Validated  @RequestBody SysOrganizationEnd organizationEnd){
@@ -100,6 +105,7 @@ public class SysOrganizationController {
      * @param id
      * @return
      */
+    @OperatorTrajectory(moduleName = "业务管理/团队管理/添加团队",type = "D",OperationDict = OperationTypeEnum.DELETE, mapperClass = SysOrganizationMapper.class,entityClass = SysOrganizationAdd.class)
     @Operation(summary = "团队、渠道、电销组 通过ID删除", description = "通过ID删除")
     @GetMapping("deleteById")
     public HttpResult deleteById(@RequestParam("id") String id){

tenant/organization/src/main/java/com/jzg/organization/controller/UserController.java

@@ -3,6 +3,7 @@ package com.jzg.organization.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.annotation.IgnoreTenant;
 import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysUserInfoParam;
@@ -49,21 +50,21 @@ public class UserController extends BaseController {
         return sysUserService.getUserSelect(sysUserInfoListVo);
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/成员管理/添加成员",mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class)
+    @OperatorTrajectory(moduleName = "业务管理/业务员管理/添加成员",mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class)
     @Operation(summary = "新增业务员接口", description = "新增业务员接口")
     @PostMapping(value = "/add")
     public HttpResult addUserInfo(@RequestBody SysUserVo sysUserVo) {
         return sysUserService.addUserInfo(sysUserVo);
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/成员管理/删除成员",type = "D",mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class,primary = "ids")
+    @OperatorTrajectory(moduleName = "业务管理/业务员管理/删除成员",type = "D",OperationDict = OperationTypeEnum.DELETE,mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class,primary = "ids")
     @Operation(summary = "删除业务员接口", description = "删除业务员接口")
     @PostMapping(value = "/delete")
     public HttpResult deleteUser(@RequestBody IsDeleteVo isDeleteVo) {
         return sysUserService.deleteUserInfo(isDeleteVo);
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/成员管理/启用禁用成员",type = "U",mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class)
+    @OperatorTrajectory(moduleName = "业务管理/业务员管理/启用禁用成员",type = "U",OperationDict = OperationTypeEnum.UPDATE,mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class)
     @Operation(summary = "启用禁用业务员接口", description = "启用禁用业务员接口")
     @PostMapping(value = "/isEnable")
     public HttpResult isEnableUser(@RequestBody IsEnableVo isEnableVo) {
@@ -76,13 +77,14 @@ public class UserController extends BaseController {
         return sysUserService.batchLeader(batchLeaderVo);
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/成员管理/修改成员",type = "U",mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class)
+    @OperatorTrajectory(moduleName = "业务管理/业务员管理/修改成员",type = "U",OperationDict = OperationTypeEnum.UPDATE,mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class)
     @Operation(summary = "修改业务员接口", description = "修改业务员接口")
     @PostMapping(value = "/update")
     public HttpResult updateUser(@RequestBody SysUserVo sysUserVo) {
         return sysUserService.updateUserInfo(sysUserVo);
     }
 
+    @OperatorTrajectory(moduleName = "业务管理/业务员管理/添加业务员银行卡",OperationDict = OperationTypeEnum.UPDATE,type = "U",mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class)
     @Operation(summary = "添加业务员银行卡", description = "添加业务员银行卡")
     @PostMapping(value = "/addBankCard")
     public HttpResult addBankCard(@RequestBody SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
@@ -101,7 +103,7 @@ public class UserController extends BaseController {
         return HttpResult.ok(sysUserService.getTransferInfo(userId));
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/成员管理/成员转移",type = "U",mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class)
+    @OperatorTrajectory(moduleName = "业务管理/业务员管理/成员转移",type = "U",OperationDict = OperationTypeEnum.UPDATE,mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class)
     @Operation(summary = "成员资源转移接口", description = "成员资源转移接口")
     @PostMapping(value = "/transfer")
     public HttpResult transfer(@RequestBody UserTransferVo userTransferVo) {
@@ -114,7 +116,7 @@ public class UserController extends BaseController {
         return sysDeptService.checkChangeDept(userId) ? HttpResult.ok("允许变更机构") : HttpResult.error("不允许变更机构");
     }
 
-    @OperatorTrajectory(moduleName = "组织架构/成员管理/变更机构",type = "U",mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class,primary = "userId")
+    @OperatorTrajectory(moduleName = "业务管理/业务员管理/变更机构",OperationDict = OperationTypeEnum.UPDATE,type = "U",mapperClass = SysUserJzgInfoMapper.class,entityClass = SysUserVo.class,primary = "userId")
     @Operation(summary = "变更机构",description = "变更机构")
     @PostMapping(value = "/changeDept")
     public HttpResult changeDept(@RequestBody ChangeDeptVo changeDeptVo){

tenant/organization/src/main/java/com/jzg/organization/mapper/PtlAgreementCostMapper.java

@@ -7,7 +7,6 @@ import com.jzg.commons.entity.dto.CostManagementVo;
 import com.jzg.commons.entity.dto.PtlAgreementCostParam;
 import com.jzg.commons.entity.po.PtlAgreementCost;
 import com.jzg.commons.entity.vo.CostListVo;
-import com.jzg.commons.entity.vo.PtlAgreementCostTypeVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -26,5 +25,6 @@ public interface PtlAgreementCostMapper extends BaseMapper<PtlAgreementCost> {
     Page<CostManagementVo> pageList(Page page,@Param("costParam") PtlAgreementCostParam costParam);
 
 
+    PtlAgreementCostVo selectById(@Param("id") Long id);
 
 }

tenant/organization/src/main/java/com/jzg/organization/service/PtlAgreementCostService.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 public interface PtlAgreementCostService extends IService<PtlAgreementCost> {
 
-    HttpResult save(List<CostAdd> costAddList);
+    HttpResult save(PtlAgreemenCostAdd ptlAgreemenCostAdd);
 
 
     HttpResult update(PtlAgreementCostEnd costEndList);

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -77,7 +77,8 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult save(List<CostAdd> costAddList) {
+    public HttpResult save(PtlAgreemenCostAdd ptlAgreemenCostAdd) {
+        List<CostAdd> costAddList = ptlAgreemenCostAdd.getCostAddList();
         if (costAddList.isEmpty()) {
             return HttpResult.error("保存数据不能为空");
         }

tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -19,6 +19,8 @@
         <result column="audit_person" property="auditPerson" jdbcType="VARCHAR"/>
         <result column="audit_time" property="auditTime" jdbcType="VARCHAR"/>
         <result column="review_description" property="reviewDescription" jdbcType="VARCHAR"/>
+        <result column="agreement_code" property="ptlAgreementCode" jdbcType="VARCHAR"/>
+        <result column="agreement_title" property="ptlAgreementName" jdbcType="VARCHAR"/>
         <collection property="ptlAgreementCostTypeList" column="{costId=id}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostTypeVo" select="selectCostType" />
         <collection property="ruleConditions" column="{costId=id}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostRuleVo" select="selectCostRule" />
     </resultMap>
@@ -163,9 +165,12 @@
             t.update_time,
             t.audit_person,
             t.review_description,
-            t.audit_time
+            t.audit_time,
+            pa.agreement_code,
+            pa.agreement_title
         FROM
             ptl_agreement_cost t
+            LEFT JOIN ptl_agreement pa ON pa.id = t.ptl_agreement_id
            <where>
                t.is_delete = 0
                <if test="id != null">
@@ -316,5 +321,35 @@
         order by pc.create_time desc
     </select>
 
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT
+        t.id,
+        t.ptl_agreement_id,
+        t.product_name,
+        t.product_id,
+        t.effective_time,
+        t.failure_time,
+        t.audit_method,
+        t.cost_describe,
+        t.is_delete,
+        t.create_by,
+        t.create_time,
+        t.update_by,
+        t.update_time,
+        t.audit_person,
+        t.review_description,
+        t.audit_time,
+        pa.agreement_code,
+        pa.agreement_title
+        FROM
+        ptl_agreement_cost t
+        LEFT JOIN ptl_agreement pa ON pa.id = t.ptl_agreement_id
+        <where>
+            t.is_delete = 0
+            <if test="id != null">
+                AND t.id = #{id}
+            </if>
+        </where>
+    </select>
 
 </mapper>