楚江ERP：审核发起人优化

@@ -354,6 +354,12 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     private Boolean showExamine;
     private Boolean showExamine;
 
 
     /**
     /**
+     * 流程发起人(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String userId;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -10,6 +10,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -227,6 +228,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private List<PurchaseOrderLine> purchaseOrderLineList;
     private List<PurchaseOrderLine> purchaseOrderLineList;
 
 
     /**
     /**
+     * 流程发起人(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String userId;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -93,6 +93,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
     private BigDecimal sumRevokeQuantity;
     private BigDecimal sumRevokeQuantity;
 
 
     /**
     /**
+     * 流程发起人(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String userId;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -315,6 +315,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         //导入不走审核流
         //导入不走审核流
         if (!"IMPORT".equals(vo.getImportType())) {
         if (!"IMPORT".equals(vo.getImportType())) {
             // 开启审核
             // 开启审核
+            data.setUserId(SecurityUtil.getCurrentUser().getId());
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         }
         }
 
 
@@ -905,6 +906,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
 
 
         //开启审核
         //开启审核
+        vo.setUserId(SecurityUtil.getCurrentUser().getId());
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
     }
     }
 
 

@@ -247,6 +247,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             }
             }
         }
         }
         //开启审核
         //开启审核
+        data.setUserId(SecurityUtil.getCurrentUser().getId());
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
 
         return data.getId();
         return data.getId();
@@ -303,6 +304,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
         //开启审核
         //开启审核
+        data.setUserId(SecurityUtil.getCurrentUser().getId());
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
     }
     }
 
 

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -153,6 +154,7 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         purchaseOrderInfoService.updateRevokeStatus(vo.getPurchaseOrderId(), "UNDOING");
         purchaseOrderInfoService.updateRevokeStatus(vo.getPurchaseOrderId(), "UNDOING");
 
 
         //开启审核
         //开启审核
+        data.setUserId(SecurityUtil.getCurrentUser().getId());
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
 
         return data.getId();
         return data.getId();
@@ -195,6 +197,7 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         BigDecimal bigDecimal = sumRevokeQuantity.divide(new BigDecimal("1000"), 6, RoundingMode.HALF_UP);
         BigDecimal bigDecimal = sumRevokeQuantity.divide(new BigDecimal("1000"), 6, RoundingMode.HALF_UP);
         data.setSumRevokeQuantity(bigDecimal);
         data.setSumRevokeQuantity(bigDecimal);
         //开启审核
         //开启审核
+        data.setUserId(SecurityUtil.getCurrentUser().getId());
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());

 package com.lframework.xingyun.sc.vo.customer.credit;
 package com.lframework.xingyun.sc.vo.customer.credit;
 
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
@@ -470,4 +472,10 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "冻结状态")
     @ApiModelProperty(value = "冻结状态")
     private String frozenStatus;
     private String frozenStatus;
 
 
+    /**
+     * 流程发起人
+     */
+    @ApiModelProperty(value = "流程发起人")
+    private String userId;
+
 }
 }