feat: 审核开关-业务页面修改

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -151,6 +151,9 @@ public class PurApplyController {
             purApplyRequest.setCreateUser(authAdmin.getId() + ""); //查询自己
         }
 
+        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+        purApplyRequest.setSysApprovalFlow(sys_approval_flow);
+
         List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
         PageInfo<PurApplyResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);
@@ -169,12 +172,17 @@ public class PurApplyController {
     public BaseResponse auditList(@RequestBody PurApplyRequest purApplyRequest) {
 
         if (purApplyRequest.getStatus() == null) {
-            purApplyRequest.setStatus(10);  //查询未审核和已审核状态
+            purApplyRequest.setStatus(12);  //查询已审核状态
         }
 //        if (purApplyRequest.getIsInvCode() != null && purApplyRequest.getIsInvCode()) {
 //            AuthAdmin authAdmin = customerService.getUserBean();
 //            purApplyRequest.setTargetInvCode(authAdmin.getLocInvCode() + ""); //查询自己仓库
 //        }
+
+        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+        purApplyRequest.setSysApprovalFlow(sys_approval_flow);
+
+
         List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
         PageInfo<PurApplyResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -133,6 +133,9 @@ public class PurOrderController {
             purOrderRequest.setStatus(11);  //查询未审核和草稿状态
         }
 
+        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+        purOrderRequest.setSysApprovalFlow(sys_approval_flow);
+
         List<PurOrderResponse> purApplyEntities = purOrderService.queryPageList(purOrderRequest);
         PageInfo<PurOrderResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);
@@ -151,8 +154,12 @@ public class PurOrderController {
     public BaseResponse auditList(PurOrderRequest purOrderRequest) {
 
         if (purOrderRequest.getStatus() == null) {
-            purOrderRequest.setStatus(10);  //查询未审核和已审核状态
+            purOrderRequest.setStatus(10);  //查询待审核
         }
+
+        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+        purOrderRequest.setSysApprovalFlow(sys_approval_flow);
+
         List<PurOrderResponse> purApplyEntities = purOrderService.queryPageList(purOrderRequest);
         PageInfo<PurOrderResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);

src/main/java/com/glxp/api/controller/purchase/PurPlanController.java

@@ -142,6 +142,9 @@ public class PurPlanController {
             purApplyRequest.setStatus(11);  //查询未审核和草稿状态
         }
 
+        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+        purApplyRequest.setSysApprovalFlow(sys_approval_flow);
+
         List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
         PageInfo<PurPlanResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);
@@ -160,8 +163,12 @@ public class PurPlanController {
     public BaseResponse auditList(PurPlanRequest purApplyRequest) {
 
         if (purApplyRequest.getStatus() == null) {
-            purApplyRequest.setStatus(10);  //查询未审核和已审核状态
+            purApplyRequest.setStatus(10);  //查询待审核
         }
+
+        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+        purApplyRequest.setSysApprovalFlow(sys_approval_flow);
+
         List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
         PageInfo<PurPlanResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);
@@ -181,6 +188,10 @@ public class PurPlanController {
         if (purApplyRequest.getStatus() == null) {
             purApplyRequest.setStatus(12);  //查询已审核状态
         }
+
+        Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
+        purApplyRequest.setSysApprovalFlow(sys_approval_flow);
+
         List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
         PageInfo<PurPlanResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);

src/main/java/com/glxp/api/entity/basic/SysApprovalFlow.java

@@ -64,6 +64,11 @@ public class SysApprovalFlow {
     */
     @TableField(value = "updateUser")
     private String updateUser;
+    /**
+    * 更新人
+    */
+    @TableField(value = "updateUserName")
+    private String updateUserName;
 
     /**
     * 更新时间

src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java

@@ -113,4 +113,6 @@ public class PurApplyRequest extends ListPageRequest {
     private Boolean isUser;
     private Boolean isInvCode;
 
+    private Boolean sysApprovalFlow;
+
 }

src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java

@@ -96,6 +96,7 @@ public class PurOrderRequest extends ListPageRequest {
     private String startAuditDate;
     private String endAuditDate;
     private String orderBy;
+    private Boolean sysApprovalFlow;
 
 
 

src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java

@@ -98,5 +98,9 @@ public class PurPlanRequest extends ListPageRequest {
     private String orderBy;
 
 
+    private Boolean sysApprovalFlow;
+
+
+
 
 }

src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java

@@ -92,4 +92,9 @@ public class PurApplyResponse {
      */
     private Date flowAuditTime;
 
+    private String flowAuditByName;
+    private String approvalFlowId;
+
+
+
 }

src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java

@@ -83,9 +83,12 @@ public class PurOrderResponse {
      */
     private int flowStatus;
 
+
     /**
      * 审核时间
      */
     private Date flowAuditTime;
 
+    private String flowAuditByName;
+    private String approvalFlowId;
 }

src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java

@@ -87,4 +87,7 @@ public class PurPlanResponse {
      * 审核时间
      */
     private Date flowAuditTime;
+
+    private String flowAuditByName;
+    private String approvalFlowId;
 }

src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java

@@ -102,6 +102,7 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
     public void submitApprovalFlow(SubmitApprovalFlowRequest submitApprovalFlowRequest) {
 
         Long userId = customerService.getUserId();
+        String userName = customerService.getUserBean().getEmployeeName();
         String id = submitApprovalFlowRequest.getId();
         SysApprovalFlowMx sysApprovalFlowMx = sysApprovalFlowMxMapper.selectVoById(id);
         if (ObjectUtil.isNull(sysApprovalFlowMx)){
@@ -147,10 +148,10 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
         sysApprovalFlowMxMapper.updateById(sysApprovalFlowMx);
 
         //进行单据状态更新
-        updateDocumentStatus(approvalFlowId,date,approvalUserId);
+        updateDocumentStatus(approvalFlowId,date,approvalUserId,userName);
     }
 
-    private void updateDocumentStatus(String approvalFlowId,Date date,String approvalUserId) {
+    private void updateDocumentStatus(String approvalFlowId,Date date,String approvalUserId,String userName) {
         //子状态有一个驳回 为 驳回；全部审核通过 为通过 ；其他为 审核中
         QueryWrapper<SysApprovalFlowMx> qw = new QueryWrapper<>();
         qw.eq("approvalFlowId",approvalFlowId);
@@ -184,6 +185,7 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
             sysApprovalFlow.setStatus(newStatus);
             sysApprovalFlow.setUpdateTime(date);
             sysApprovalFlow.setUpdateUser(approvalUserId);
+            sysApprovalFlow.setUpdateUserName(userName);
             sysApprovalFlowMapper.updateById(sysApprovalFlow);
         }
 

src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.glxp.api.dao.purchase.PurApplyDao">
     <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurApplyRequest"
             resultType="com.glxp.api.res.purchase.PurApplyResponse">
-        SELECT IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime,
+        SELECT IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime,saf.updateUserName as flowAuditByName,
         pur_apply.*,
                cb.employeeName       createByName,
                ab.employeeName       auditByName,
@@ -44,18 +44,37 @@
                 and DATE_FORMAT(pur_apply.auditTime, '%Y-%m-%d') <= #{endAuditDate}
                 ]]>
             </if>
-            <if test="status != null and status != 10 and status != 11 and status != 12">
-                and pur_apply.status = #{status}
-            </if>
-            <if test="status == 10">
-                and (saf.status=2 or saf.status=1 or saf.status=3)
-            </if>
-            <if test="status == 11">
-                and (saf.status is null or saf.status=0 or saf.status=1 or saf.status=3)
+
+            <if test="!sysApprovalFlow">
+                <if test="status != null and status != 10 and status != 11 and status != 12 ">
+                    and pur_apply.status = #{status}
+                </if>
+                <if test="status == 10">
+                    and (pur_apply.status = 2 )
+                </if>
+                <if test="status == 11">
+                    and (pur_apply.status = 1 or pur_apply.status = 2 or pur_apply.status = 4)
+                </if>
+                <if test="status == 12">
+                    and (pur_apply.status = 3)
+                </if>
             </if>
-            <if test="status == 12">
-                and (saf.status=2 or saf.status=3)
+
+            <if test="sysApprovalFlow">
+                <if test="status != null and status != 10 and status != 11 and status != 12 ">
+                    and saf.status = #{status}
+                </if>
+                <if test="status == 10">
+                    and (saf.status = 2)
+                </if>
+                <if test="status == 11">
+                    and (saf.status = 1 or saf.status = 2 or saf.status = 4 or saf.status is null)
+                </if>
+                <if test="status == 12">
+                    and (saf.status = 3)
+                </if>
             </if>
+
             <if test="deptCode != '' and deptCode != null">
                 AND deptCode = #{deptCode}
             </if>

src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -132,6 +132,7 @@
                      INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
                      left JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
                      left join pur_apply on pur_apply.id = pur_apply_detail.orderIdFk
+                    Left Join sys_approval_flow as saf ON pur_apply.approvalFlowId = saf.id
         <where>
             <if test="nameCode != null and nameCode != ''">
                 AND basic_products.nameCode like concat('%', #{nameCode}, '%')
@@ -164,7 +165,7 @@
                 and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') <= #{endDate}
                 ]]>
             </if>
-            and pur_apply.status = 3
+            and  (pur_apply.status = 3 or saf.status = 3)
         </where>
         GROUP BY basic_products.uuid
     </select>

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -35,15 +35,15 @@
 
     <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest"
             resultType="com.glxp.api.res.purchase.PurOrderResponse">
-        SELECT pur_order.*,
+        SELECT IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime,saf.updateUserName as flowAuditByName,
+        pur_order.*,
                cb.employeeName     createUserName,
                ab.employeeName     auditUserName,
                db.employeeName     applyCreateBy,
                auth_warehouse.NAME invName,
                aw1.name            applyInvName,
                auth_dept.`name`    deptName,
-               basic_corp.name     supName,
-        IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime
+               basic_corp.name     supName
         FROM pur_order
                      LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
                      LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
@@ -52,7 +52,7 @@
                      LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
                      left join basic_corp on pur_order.supId = basic_corp.erpId
                      left join auth_warehouse aw1 on pur_order.applyInv = aw1.`code`
-        Left Join sys_approval_flow as saf ON pur_order.approvalFlowId = saf.id
+                     Left Join sys_approval_flow as saf ON pur_order.approvalFlowId = saf.id
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}
@@ -77,16 +77,38 @@
                 and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') <= #{endAuditDate}
                 ]]>
             </if>
-            <if test="status != null and status != 10 and status != 11">
-                and pur_order.status = #{status}
-            </if>
-            <if test="status == 10">
-                and (pur_order.status = 3 or pur_order.status = 2 or pur_order.status = 4)
+
+            <if test="!sysApprovalFlow">
+                <if test="status != null and status != 10 and status != 11 and status != 12 ">
+                    and pur_order.status = #{status}
+                </if>
+                <if test="status == 10">
+                    and (pur_order.status = 2 )
+                </if>
+                <if test="status == 11">
+                    and (pur_order.status = 1 or pur_order.status = 2 or pur_order.status = 4)
+                </if>
+                <if test="status == 12">
+                    and (pur_order.status = 3)
+                </if>
             </if>
-            <if test="status == 11">
-                and (pur_order.status = 1 or pur_order.status = 2 or pur_order.status = 4)
+
+            <if test="sysApprovalFlow">
+                <if test="status != null and status != 10 and status != 11 and status != 12 ">
+                    and saf.status = #{status}
+                </if>
+                <if test="status == 10">
+                    and (saf.status = 2)
+                </if>
+                <if test="status == 11">
+                    and (saf.status = 1 or saf.status = 2 or saf.status = 4 or saf.status is null)
+                </if>
+                <if test="status == 12">
+                    and (saf.status = 3)
+                </if>
             </if>
 
+
             <if test="deptCode != '' and deptCode != null">
                 AND deptCode = #{deptCode}
             </if>

src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml

@@ -150,6 +150,7 @@
                      INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
                      INNER JOIN basic_corp ON pur_order_detail.supId = basic_corp.erpId
                      left join pur_order on pur_order.id = pur_order_detail.orderIdFk
+                     Left Join sys_approval_flow as saf ON pur_order.approvalFlowId = saf.id
         <where>
             <if test="nameCode != null and nameCode != ''">
                 AND basic_products.nameCode like concat('%', #{nameCode}, '%')
@@ -182,7 +183,7 @@
                 and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') <= #{endDate}
                 ]]>
             </if>
-            and pur_order.status = 3
+            and (pur_order.status = 3 or saf.status = 3)
         </where>
     </select>
 

src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml

@@ -4,14 +4,14 @@
 <mapper namespace="com.glxp.api.dao.purchase.PurPlanDao">
     <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurPlanRequest"
             resultType="com.glxp.api.res.purchase.PurPlanResponse">
-        SELECT IFNULL(saf.status,0) as flowStatus,saf.updateTime as flowAuditTime,
+        SELECT IFNULL(saf.status,1) as flowStatus,saf.updateTime as flowAuditTime,saf.updateUserName as flowAuditByName,
         pur_plan.*,
                cb.employeeName     createUserName,
                ab.employeeName     auditUserName,
                db.employeeName     applyCreateBy,
                auth_warehouse.NAME invName,
                aw1.name            applyInvName,
-               auth_dept.`name`    deptName,
+               auth_dept.`name`    deptName
 
         FROM pur_plan
                      LEFT JOIN auth_user cb ON pur_plan.createUser = cb.id
@@ -45,18 +45,38 @@
                 and DATE_FORMAT(pur_plan.auditTime, '%Y-%m-%d') <= #{endAuditDate}
                 ]]>
             </if>
-            <if test="status != null and status != 10 and status != 11">
-                and pur_plan.status = #{status}
-            </if>
-            <if test="status == 10">
-                and (pur_plan.status = 3 or pur_plan.status = 2 or pur_plan.status = 4)
-            </if>
-            <if test="status == 11">
-                and (pur_plan.status = 1 or pur_plan.status = 2 or pur_plan.status = 4)
+
+            <if test="!sysApprovalFlow">
+                <if test="status != null and status != 10 and status != 11 and status != 12 ">
+                    and pur_plan.status = #{status}
+                </if>
+                <if test="status == 10">
+                    and (pur_plan.status = 2 )
+                </if>
+                <if test="status == 11">
+                    and (pur_plan.status = 1 or pur_plan.status = 2 or pur_plan.status = 4)
+                </if>
+                <if test="status == 12">
+                    and (pur_plan.status = 3)
+                </if>
             </if>
-            <if test="status == 12">
-                and (pur_plan.status = 3)
+
+            <if test="sysApprovalFlow">
+                <if test="status != null and status != 10 and status != 11 and status != 12 ">
+                    and saf.status = #{status}
+                </if>
+                <if test="status == 10">
+                    and (saf.status = 2)
+                </if>
+                <if test="status == 11">
+                    and (saf.status = 1 or saf.status = 2 or saf.status = 4 or saf.status is null)
+                </if>
+                <if test="status == 12">
+                    and (saf.status = 3)
+                </if>
             </if>
+
+
             <if test="deptCode != '' and deptCode != null">
                 AND deptCode = #{deptCode}
             </if>

src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml

@@ -147,6 +147,7 @@
         INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
         left JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
         left join pur_plan on pur_plan.id = pur_plan_detail.orderIdFk
+        Left Join sys_approval_flow as saf ON pur_plan.approvalFlowId = saf.id
         <where>
             <if test="nameCode != null and nameCode != ''">
                 AND basic_products.nameCode like concat('%', #{nameCode}, '%')
@@ -175,7 +176,7 @@
             <if test="endDate != null and endDate !=''">
                 <![CDATA[ and DATE_FORMAT(pur_plan.createTime,'%Y-%m-%d') <= #{endDate}]]>
             </if>
-              and pur_plan.status=3
+            and (pur_plan.status = 3 or saf.status = 3)
         </where>
     </select>
 </mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -873,7 +873,7 @@ CALL Pro_Temp_ColumnWork('basic_sk_project', 'price',
 UPDATE sys_custom_config_detail
 SET `configId` = 19, `type` = '1', `isShow` = 1, `columnName` = 'oper', `columnDesc` = '操作', `columnType` = 'button',
     `colorRule` = '', `sort` = NULL, `lableRule` = '', `width` = 500, `tooltip` = NULL,
-    `buttonRule` = '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"编辑\",\"clickFuc\":\"newDistributionForm\",\"disabledFuc\":\"row.status==3\",\"hasPermi\":\"\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"打印\",\"clickFuc\":\"printOrder\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"删除\",\"clickFuc\":\"deleteDialog\"}]',
+    `buttonRule` = '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"编辑\",\"clickFuc\":\"newDistributionForm\",\"disabledFuc\":\"!(row.status!=3 || row.flowStatus!=3)\",\"hasPermi\":\"\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"打印\",\"clickFuc\":\"printOrder\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"删除\",\"clickFuc\":\"deleteDialog\"}]',
     `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL, `size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL,
     `inputType` = NULL, `disabledFuc` = NULL, `expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 215;
 UPDATE sys_custom_config_detail
@@ -951,3 +951,85 @@ VALUES (38005, 23, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL,
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
 VALUES (38006, 23, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38007, 27, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38008, 27, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38009, 29, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38010, 29, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38011, 31, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38012, 31, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38013, 33, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38014, 33, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38015, 33, '1', 1, 'flowAuditByName', '流程审核人', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38016, 31, '1', 1, 'auditRemark', '审核详情', 'button', NULL, NULL, NULL, NULL, NULL, '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"审核过程\",\"clickFuc\":\"showApprovalFlowDetail\"}]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38017, 33, '1', 1, 'auditRemark', '审核详情', 'button', NULL, NULL, NULL, NULL, NULL, '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"审核过程\",\"clickFuc\":\"showApprovalFlowDetail\"}]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+
+CALL Pro_Temp_ColumnWork('sys_approval_flow', 'updateUserName',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''更新人名字'' ',
+                         1);
+
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38018, 35, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38019, 35, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38021, 37, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38020, 37, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38022, 39, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38023, 39, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38024, 42, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38025, 42, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38026, 39, '1', 1, 'auditRemark', '审核详情', 'button', NULL, NULL, NULL, NULL, NULL, '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"审核过程\",\"clickFuc\":\"showApprovalFlowDetail\"}]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38027, 44, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38028, 44, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38029, 46, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL, '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38030, 46, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
+VALUES (38031, 46, '1', 1, 'auditRemark', '审核详情', 'button', NULL, NULL, NULL, NULL, NULL, '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"审核过程\",\"clickFuc\":\"showApprovalFlowDetail\"}]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+