feat: 审核流程配置功能

dev_fifo1.0
chenhc 1 year ago
parent 45b7fad953
commit 6dc6e5ab3b

@ -147,10 +147,10 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
sysApprovalFlowMxMapper.updateById(sysApprovalFlowMx); 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<>(); QueryWrapper<SysApprovalFlowMx> qw = new QueryWrapper<>();
qw.eq("approvalFlowId",approvalFlowId); qw.eq("approvalFlowId",approvalFlowId);
@ -182,6 +182,8 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
if (status != newStatus){ if (status != newStatus){
sysApprovalFlow.setStatus(newStatus); sysApprovalFlow.setStatus(newStatus);
sysApprovalFlow.setUpdateTime(date);
sysApprovalFlow.setUpdateUser(approvalUserId);
sysApprovalFlowMapper.updateById(sysApprovalFlow); sysApprovalFlowMapper.updateById(sysApprovalFlow);
} }

@ -2,7 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <mapper namespace="com.glxp.api.dao.inout.ReceiveDao">
<select id="filterList" resultType="com.glxp.api.res.inout.ReceiveResponse"> <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 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_dept ad where ad.code = io.deptCode) deptName,
(select name from auth_warehouse aw where aw.code = io.invCode) invName, (select name from auth_warehouse aw where aw.code = io.invCode) invName,

@ -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, `width` = 120, `tooltip` = NULL, `buttonRule` = '', `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL,
`size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL, `size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL,
`expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 234; `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;

Loading…
Cancel
Save