diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index 510f11d7..572ecb9a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -28,13 +28,11 @@ import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; +import com.bonus.material.work.domain.SysWorkflowNode; import com.bonus.material.work.domain.SysWorkflowRecord; import com.bonus.material.work.domain.SysWorkflowRecordHistory; import com.bonus.material.work.domain.SysWorkflowType; -import com.bonus.material.work.mapper.SysWorkflowConfigMapper; -import com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper; -import com.bonus.material.work.mapper.SysWorkflowRecordMapper; -import com.bonus.material.work.mapper.SysWorkflowTypeMapper; +import com.bonus.material.work.mapper.*; import com.bonus.material.work.service.SysWorkflowRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DataAccessException; @@ -82,6 +80,11 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { @Resource private SysWorkflowRecordHistoryMapper sysWorkflowRecordHistoryMapper; + + @Resource + private SysWorkflowNodeMapper sysWorkflowNodeMapper; + + /** * 新增领用任务 * @@ -395,17 +398,19 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { log.info("当前节点为{}",leaseApplyInfoNew.getNodeId()); SysWorkflowRecordHistory sysWorkflowRecordHistory = sysWorkflowRecordHistoryMapper.getWorkflowRecordHistoryByRecordId(leaseApplyInfoNew.getRecordId()); leaseApplyInfoNew.setNodeId(sysWorkflowRecordHistory.getNodeId()); + //设置当前节点 if (1==leaseApplyInfoNew.getNodeSignType() && sysWorkflowRecordHistory.getNodeSort()==1){ leaseApplyInfoNew.setNodeId(sysWorkflowRecordHistory.getNextNodeId()); } String configValue = sysWorkflowConfigMapper.selectConfigValueByNodeId(leaseApplyInfoNew.getNodeId()); + SysWorkflowNode sysWorkflowNode = sysWorkflowNodeMapper.selectSysWorkflowNodeById(leaseApplyInfoNew.getNodeId()); leaseApplyInfoNew.setConfigValue(configValue); //判断当前节点是否审核 sysWorkflowRecordHistory.setRecordId(leaseApplyInfoNew.getRecordId()); sysWorkflowRecordHistory.setNodeId(leaseApplyInfoNew.getNodeId()); List SysWorkflowRecordHistoryList = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory); //判断是或签还是会签0:或签 1:会签 - if (0==leaseApplyInfoNew.getNodeSignType()){ + if (0==sysWorkflowNode.getNodeSignType()){ //当前节点已经审核需要修改节点值 if (SysWorkflowRecordHistoryList.get(0)!=null){ String configValueNew = sysWorkflowConfigMapper.selectConfigValueByNodeId(SysWorkflowRecordHistoryList.get(0).getNextNodeId()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyInfo.java index 794e88ec..042168a8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectApplyInfo.java @@ -2,6 +2,7 @@ package com.bonus.material.ma.domain; import com.bonus.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; @@ -158,4 +159,18 @@ public class DirectApplyInfo extends BaseEntity { private String flowId; + @ApiModelProperty(value = "本流程节点id") + private Integer nodeId; + + @ApiModelProperty(value = "下个流程节点id") + private Integer nextNodeId; + + @ApiModelProperty(value = "流程配置值") + private String configValue; + + @ApiModelProperty(value = "所属记录") + private Integer recordId; + + @ApiModelProperty(value = "流程节点签名方式 0:或签 1:会签") + private Integer nodeSignType; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java index 1595f541..939348ab 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/record/service/impl/DerateRecordQueryServiceImpl.java @@ -1,28 +1,50 @@ package com.bonus.material.record.service.impl; import com.bonus.common.biz.domain.BmFileInfo; +import com.bonus.common.core.exception.ServiceException; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.material.ma.domain.DirectApplyInfo; import com.bonus.material.record.mapper.DerateRecordQueryMapper; import com.bonus.material.record.mapper.SltRecordQueryMapper; import com.bonus.material.record.service.IDerateReocrdQueryService; import com.bonus.material.record.service.ISltReocrdQueryService; import com.bonus.material.settlement.domain.SltAgreementInfo; import com.bonus.material.settlement.domain.SltAgreementReduce; +import com.bonus.material.work.domain.SysWorkflowNode; +import com.bonus.material.work.domain.SysWorkflowRecordHistory; +import com.bonus.material.work.mapper.SysWorkflowConfigMapper; +import com.bonus.material.work.mapper.SysWorkflowNodeMapper; +import com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * @description 减免记录查询 * @author hay * @date 2025/2/19 10:47 */ +@Slf4j @Service public class DerateRecordQueryServiceImpl implements IDerateReocrdQueryService { @Resource private DerateRecordQueryMapper mapper; + @Resource + private SysWorkflowNodeMapper sysWorkflowNodeMapper; + + @Resource + private SysWorkflowRecordHistoryMapper sysWorkflowRecordHistoryMapper; + + + @Resource + private SysWorkflowConfigMapper sysWorkflowConfigMapper; + + @Override public List getList(SltAgreementInfo bean) { return mapper.getList(bean); @@ -32,7 +54,62 @@ public class DerateRecordQueryServiceImpl implements IDerateReocrdQueryService { public List getAuditList(SltAgreementInfo bean) { Long userId = SecurityUtils.getUserId(); bean.setUserId(userId); - return mapper.getAuditList(bean); + List sltAgreementReduceList = mapper.getAuditList(bean); + try { + for (SltAgreementReduce sltAgreementReduceNew : sltAgreementReduceList) { + log.info("当前节点为{}",sltAgreementReduceNew.getNodeId()); + SysWorkflowRecordHistory sysWorkflowRecordHistory = sysWorkflowRecordHistoryMapper.getWorkflowRecordHistoryByRecordId(sltAgreementReduceNew.getRecordId()); + sltAgreementReduceNew.setNodeId(sysWorkflowRecordHistory.getNodeId()); + //设置当前节点 + if (1==sltAgreementReduceNew.getNodeSignType() && sysWorkflowRecordHistory.getNodeSort()==1){ + sltAgreementReduceNew.setNodeId(sysWorkflowRecordHistory.getNextNodeId()); + } + String configValue = sysWorkflowConfigMapper.selectConfigValueByNodeId(sltAgreementReduceNew.getNodeId()); + SysWorkflowNode sysWorkflowNode = sysWorkflowNodeMapper.selectSysWorkflowNodeById(sltAgreementReduceNew.getNodeId()); + sltAgreementReduceNew.setConfigValue(configValue); + //判断当前节点是否审核 + sysWorkflowRecordHistory.setRecordId(sltAgreementReduceNew.getRecordId()); + sysWorkflowRecordHistory.setNodeId(sltAgreementReduceNew.getNodeId()); + List sysWorkflowRecordHistoryList = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory); + //判断是或签还是会签0:或签 1:会签 + if (0==sysWorkflowNode.getNodeSignType()){ + //当前节点已经审核需要修改节点值 + if (sysWorkflowRecordHistoryList.get(0)!=null){ + String configValueNew = sysWorkflowConfigMapper.selectConfigValueByNodeId(sysWorkflowRecordHistoryList.get(0).getNextNodeId()); + sltAgreementReduceNew.setNodeId(sysWorkflowRecordHistoryList.get(0).getNextNodeId()); + sltAgreementReduceNew.setConfigValue(configValueNew); + } + }else { + String[] ConfigValue = configValue.split(","); + List filteredList = Arrays.stream(ConfigValue).collect(Collectors.toList()); + for (SysWorkflowRecordHistory sysWorkflowRecordHistoryNew : sysWorkflowRecordHistoryList) { + if (sysWorkflowRecordHistoryNew != null) { + // 过滤数组元素 + filteredList = filteredList.stream() + .filter(value -> value != null && !value.equals(sysWorkflowRecordHistoryNew.getCreateBy())) + .collect(Collectors.toList()); + sltAgreementReduceNew.setConfigValue(filteredList.toString()); + } + } + //判断是否这个节点的所有人都审核 + if (filteredList.size() == 0) { + String configValueNew = sysWorkflowConfigMapper.selectConfigValueByNodeId(sysWorkflowRecordHistoryList.get(0).getNextNodeId()); + sltAgreementReduceNew.setNodeId(sysWorkflowRecordHistoryList.get(0).getNextNodeId()); + sltAgreementReduceNew.setConfigValue(configValueNew); + } else { + if (sysWorkflowRecordHistoryList.size() > 0) { + sltAgreementReduceNew.setNodeId(sltAgreementReduceNew.getNodeId()); + sltAgreementReduceNew.setConfigValue(filteredList.toString()); + } + } + } + } + + }catch (Exception e){ + log.info("查询结果出错{}",e.getMessage()); + throw new ServiceException("查询结果出错"); + } + return sltAgreementReduceList; } @Override diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java index b5bd0461..033714b5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java @@ -228,8 +228,7 @@ public class SltAgreementInfo extends BaseEntity { private BigDecimal scrapCost; private BigDecimal loseCost; private BigDecimal reductionCost; + //结算费用 private BigDecimal totalCostAll; - - } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduce.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduce.java index 6aaf7882..266eecc8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduce.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduce.java @@ -134,4 +134,19 @@ public class SltAgreementReduce extends BaseEntity { private Integer proId; private String projectName; + + @ApiModelProperty(value = "本流程节点id") + private Integer nodeId; + + @ApiModelProperty(value = "下个流程节点id") + private Integer nextNodeId; + + @ApiModelProperty(value = "流程配置值") + private String configValue; + + @ApiModelProperty(value = "所属记录") + private Integer recordId; + + @ApiModelProperty(value = "流程节点签名方式 0:或签 1:会签") + private Integer nodeSignType; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java index 0b33f9d1..66fe2fe2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java @@ -1,22 +1,10 @@ package com.bonus.material.work.controller; -import cn.hutool.core.convert.Convert; -import com.bonus.common.biz.config.ListPagingUtil; -import com.bonus.common.biz.domain.lease.LeaseApplyInfo; -import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; -import com.bonus.common.log.annotation.SysLog; -import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; -import com.bonus.material.lease.service.ILeaseTaskService; import com.bonus.material.ma.domain.DirectApplyInfo; -import com.bonus.material.ma.domain.DirectApplyInfoDetails; -import com.bonus.material.ma.domain.Type; -import com.bonus.material.settlement.domain.SltAgreementInfo; import com.bonus.material.work.domain.DirectAudit; import com.bonus.material.work.service.IDirectAuditService; import io.swagger.annotations.Api; @@ -24,7 +12,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; @@ -61,7 +48,7 @@ public class DirectAuditController extends BaseController { - @ApiOperation(value = "查看审批详情") +/* @ApiOperation(value = "查看审批详情") @GetMapping("/getAuditInfo") public AjaxResult getAuditInfo(DirectAudit du) { try { @@ -69,7 +56,7 @@ public class DirectAuditController extends BaseController { } catch (Exception e) { return AjaxResult.success(new DirectApplyInfo()); } - } + }*/ /** * 审核直转申请 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowNodeMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowNodeMapper.java index e62c7267..f98b05f1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowNodeMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowNodeMapper.java @@ -16,4 +16,6 @@ public interface SysWorkflowNodeMapper { int updateSysWorkflowNode(SysWorkflowNode sysWorkflowNode); List listByTaskId(SysWorkflowNode sysWorkflowNode); + + SysWorkflowNode selectSysWorkflowNodeById(Integer nodeId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/DirectAuditImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/DirectAuditImpl.java index a3614105..94ae476f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/DirectAuditImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/DirectAuditImpl.java @@ -7,24 +7,15 @@ import com.bonus.material.ma.domain.DirectApplyInfo; import com.bonus.material.work.domain.DirectAudit; import com.bonus.material.work.domain.SysWorkflowNode; -import com.bonus.material.work.domain.SysWorkflowRecord; import com.bonus.material.work.domain.SysWorkflowRecordHistory; -import com.bonus.material.work.mapper.DirectAuditMapper; -import com.bonus.material.work.mapper.SysWorkflowNodeMapper; -import com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper; -import com.bonus.material.work.mapper.SysWorkflowRecordMapper; +import com.bonus.material.work.mapper.*; import com.bonus.material.work.service.IDirectAuditService; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; import javax.annotation.Resource; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -40,17 +31,68 @@ public class DirectAuditImpl implements IDirectAuditService { private DirectAuditMapper mapper; @Resource - private SysWorkflowNodeMapper wfnMapper; + private SysWorkflowNodeMapper sysWorkflowNodeMapper; @Resource - private SysWorkflowRecordHistoryMapper hisMapper; + private SysWorkflowRecordHistoryMapper sysWorkflowRecordHistoryMapper; + @Resource - private SysWorkflowRecordMapper wfrMapper; + private SysWorkflowConfigMapper sysWorkflowConfigMapper; @Override public List getList(DirectApplyInfo directApplyInfo) { - return mapper.getList(directApplyInfo); + + List directApplyInfoList = mapper.getList(directApplyInfo); + for (DirectApplyInfo directApplyInfoNew : directApplyInfoList) { + log.info("当前节点为{}",directApplyInfoNew.getNodeId()); + SysWorkflowRecordHistory sysWorkflowRecordHistory = sysWorkflowRecordHistoryMapper.getWorkflowRecordHistoryByRecordId(directApplyInfoNew.getRecordId()); + directApplyInfoNew.setNodeId(sysWorkflowRecordHistory.getNodeId()); + //设置当前节点 + if (1==directApplyInfoNew.getNodeSignType() && sysWorkflowRecordHistory.getNodeSort()==1){ + directApplyInfoNew.setNodeId(sysWorkflowRecordHistory.getNextNodeId()); + } + String configValue = sysWorkflowConfigMapper.selectConfigValueByNodeId(directApplyInfoNew.getNodeId()); + SysWorkflowNode sysWorkflowNode = sysWorkflowNodeMapper.selectSysWorkflowNodeById(directApplyInfoNew.getNodeId()); + directApplyInfoNew.setConfigValue(configValue); + //判断当前节点是否审核 + sysWorkflowRecordHistory.setRecordId(directApplyInfoNew.getRecordId()); + sysWorkflowRecordHistory.setNodeId(directApplyInfoNew.getNodeId()); + List sysWorkflowRecordHistoryList = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory); + //判断是或签还是会签0:或签 1:会签 + if (0==sysWorkflowNode.getNodeSignType()){ + //当前节点已经审核需要修改节点值 + if (sysWorkflowRecordHistoryList.get(0)!=null){ + String configValueNew = sysWorkflowConfigMapper.selectConfigValueByNodeId(sysWorkflowRecordHistoryList.get(0).getNextNodeId()); + directApplyInfoNew.setNodeId(sysWorkflowRecordHistoryList.get(0).getNextNodeId()); + directApplyInfoNew.setConfigValue(configValueNew); + } + }else { + String[] ConfigValue = configValue.split(","); + List filteredList = Arrays.stream(ConfigValue).collect(Collectors.toList()); + for (SysWorkflowRecordHistory sysWorkflowRecordHistoryNew : sysWorkflowRecordHistoryList) { + if (sysWorkflowRecordHistoryNew != null) { + // 过滤数组元素 + filteredList = filteredList.stream() + .filter(value -> value != null && !value.equals(sysWorkflowRecordHistoryNew.getCreateBy())) + .collect(Collectors.toList()); + directApplyInfoNew.setConfigValue(filteredList.toString()); + } + } + //判断是否这个节点的所有人都审核 + if (filteredList.size() == 0) { + String configValueNew = sysWorkflowConfigMapper.selectConfigValueByNodeId(sysWorkflowRecordHistoryList.get(0).getNextNodeId()); + directApplyInfoNew.setNodeId(sysWorkflowRecordHistoryList.get(0).getNextNodeId()); + directApplyInfoNew.setConfigValue(configValueNew); + } else { + if (sysWorkflowRecordHistoryList.size() > 0) { + directApplyInfoNew.setNodeId(directApplyInfoNew.getNodeId()); + directApplyInfoNew.setConfigValue(filteredList.toString()); + } + } + } + } + return directApplyInfoList; } @@ -102,7 +144,7 @@ public class DirectAuditImpl implements IDirectAuditService { String isAccept = audit.getIsAccept(); String remark = audit.getRemark(); - List nodes = wfnMapper.selectSysWorkflowNodeList(node); + List nodes = sysWorkflowNodeMapper.selectSysWorkflowNodeList(node); int flowId = audit.getFlowId(); if(nodes !=null && nodes.size()>0){ @@ -134,7 +176,7 @@ public class DirectAuditImpl implements IDirectAuditService { his.setCreateBy(SecurityUtils.getUsername()); his.setCreateTime(new Date()); his.setRemark(remark); - hisMapper.addSysWorkflowRecordHistory(his) ; + sysWorkflowRecordHistoryMapper.addSysWorkflowRecordHistory(his) ; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java index 94866ca9..17a10864 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java @@ -86,6 +86,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis List sysWorkflowRecordHistoryList = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory); //获取该节点需要审核人员信息 String configValueNew = sysWorkflowConfigMapper.selectConfigValueByNodeId(sysWorkflowRecordHistory.getNodeId()); + sysWorkflowNode = sysWorkflowNodeList.get(sysWorkflowNodeList.size()-1); String[] ConfigValue = configValueNew.split(","); List filteredList = Arrays.stream(ConfigValue).collect(Collectors.toList()); for (SysWorkflowRecordHistory sysWorkflowRecordHistoryNew : sysWorkflowRecordHistoryList) { @@ -95,7 +96,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis .filter(value ->value != null && !value.equals(sysWorkflowRecordHistoryNew.getCreateBy())) .collect(Collectors.toList()); //判断是否这个节点的所有人都审核 - if (filteredList.size()==0){ + if ((filteredList.size()==0&& sysWorkflowNode.getNodeSignType()==1 )||sysWorkflowNode.getNodeSignType()==0){ SysWorkflowRecord sysWorkflowRecord = new SysWorkflowRecord(); sysWorkflowRecord.setTaskId(sysWorkflowRecordHistory.getTaskId()); sysWorkflowRecord.setWorkflowStatus(2); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml index 1e983ab4..7976f3ae 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml @@ -120,15 +120,19 @@ - \ No newline at end of file + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml index dcebb3d5..42c05e82 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml @@ -4,7 +4,7 @@ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml index 73888d9a..18d5400c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml @@ -83,6 +83,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY swn.id +