From 6dc6e5ab3bfa38540da42c6e8483c7228e209fb0 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 14 Mar 2024 15:45:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/impl/SysApprovalFlowServiceImpl.java      |  6 ++++--
 .../resources/mybatis/mapper/inout/ReceiveDao.xml   |  3 ++-
 src/main/resources/schemas/schema_v2.4.sql          | 13 +++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java
index ebb61c28b..4c9db653c 100644
--- a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java
@@ -147,10 +147,10 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
         sysApprovalFlowMxMapper.updateById(sysApprovalFlowMx);
 
         //进行单据状态更新
-        updateDocumentStatus(approvalFlowId);
+        updateDocumentStatus(approvalFlowId,date,approvalUserId);
     }
 
-    private void updateDocumentStatus(String approvalFlowId) {
+    private void updateDocumentStatus(String approvalFlowId,Date date,String approvalUserId) {
         //子状态有一个驳回 为 驳回；全部审核通过 为通过 ；其他为 审核中
         QueryWrapper<SysApprovalFlowMx> qw = new QueryWrapper<>();
         qw.eq("approvalFlowId",approvalFlowId);
@@ -182,6 +182,8 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
 
         if (status != newStatus){
             sysApprovalFlow.setStatus(newStatus);
+            sysApprovalFlow.setUpdateTime(date);
+            sysApprovalFlow.setUpdateUser(approvalUserId);
             sysApprovalFlowMapper.updateById(sysApprovalFlow);
         }
 
diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
index 0080ce870..71f4dd37c 100644
--- a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.ReceiveDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.ReceiveResponse">
-        select IFNULL(saf.status,0) as status,io.*,
+        select IFNULL(saf.status,0) as status,saf.updateTime as auditTime,
+        io.*,
                ( SELECT originName FROM basic_bustype_change bus WHERE bus.originAction = io.billType ) billTypeName,
                (select name from auth_dept ad where ad.code = io.deptCode)                deptName,
                (select name from auth_warehouse aw where aw.code = io.invCode)            invName,
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 07862f637..f0dc43052 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -843,3 +843,16 @@ SET `configId` = 21, `type` = '1', `isShow` = 1, `columnName` = 'status', `colum
     `width` = 120, `tooltip` = NULL, `buttonRule` = '', `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` = 234;
+UPDATE sys_custom_config_detail
+SET `configId` = 23, `type` = '1', `isShow` = 1, `columnName` = 'status', `columnDesc` = '单据状态', `columnType` = 'eltag',
+    `colorRule` = '', `sort` = NULL, `lableRule` = '{\"0\":\"草稿\",\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"已拒绝\"}',
+    `width` = NULL, `tooltip` = NULL, `buttonRule` = '', `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` = 256;
+
+UPDATE sys_custom_config_detail
+SET `configId` = 23, `type` = '1', `isShow` = 1, `columnName` = 'auditRemark', `columnDesc` = '审核详情', `columnType` = 'button',
+    `colorRule` = NULL, `sort` = NULL, `lableRule` = NULL, `width` = NULL, `tooltip` = NULL,
+    `buttonRule` = '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"审核过程\",\"clickFuc\":\"showApprovalFlowDetail\"}]',
+    `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` = 258;