From 3e6337b54c0bc35d38ef89bddd7afb599e030a43 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Fri, 21 Feb 2025 01:47:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E8=BD=AC=E5=AE=A1=E6=A0=B8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/biz/enums/TmTaskTypeEnum.java | 4 + .../material/ma/domain/DirectApplyInfo.java | 4 + .../ma/service/impl/DirectRotationImpl.java | 40 ++++- .../SltAgreementReduceController.java | 13 ++ .../mapper/SltAgreementReduceMapper.java | 14 +- .../service/ISltAgreementReduceService.java | 9 +- .../impl/SltAgreementReduceServiceImpl.java | 5 + .../controller/DirectAuditController.java | 87 ++++++++++ .../material/work/domain/DirectAudit.java | 42 +++++ .../material/work/domain/SysWorkflowNode.java | 11 +- .../work/mapper/DirectAuditMapper.java | 28 ++++ .../work/service/IDirectAuditService.java | 30 ++++ .../work/service/impl/DirectAuditImpl.java | 156 ++++++++++++++++++ .../mapper/material/ma/SupplierInfoMapper.xml | 9 +- .../settlement/SltAgreementReduceMapper.xml | 22 +++ .../material/work/DirectAuditMapper.xml | 83 ++++++++++ .../material/work/SysWorkflowNodeMapper.xml | 2 +- 17 files changed, 527 insertions(+), 32 deletions(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/DirectAudit.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/IDirectAuditService.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/DirectAuditImpl.java create mode 100644 bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java index 75028c96..25aab4cd 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java @@ -20,9 +20,13 @@ public enum TmTaskTypeEnum { TM_TASK_PART_LEASE(12, "配件领料任务"), TM_TASK_PART_TYPE(13, "费用减免任务"), TM_TASK_REPAIR_NUM(14, "数量维修人员信息附件"), + + TM_TASK_DIRECT(16, "直转任务"), //盘点报废 TM_TASK_PART_SCRAP(15, "盘点报废"); + + private final Integer taskTypeId; private final String taskTypeName; 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 ea4fbb4f..794e88ec 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 @@ -154,4 +154,8 @@ public class DirectApplyInfo extends BaseEntity { private Integer taskStatus; + private String flowStatus; + + private String flowId; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java index 1a7befda..ba38ecb0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java @@ -10,6 +10,10 @@ import com.bonus.material.ma.mapper.DirectRotationMapper; import com.bonus.material.ma.service.DirectRotationService; import com.bonus.material.ma.service.WorkSiteDirectManageService; import com.bonus.material.settlement.domain.SltAgreementInfo; +import com.bonus.material.work.domain.SysWorkflowRecord; +import com.bonus.material.work.domain.SysWorkflowRecordHistory; +import com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper; +import com.bonus.material.work.mapper.SysWorkflowRecordMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -17,6 +21,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import static com.bonus.common.biz.enums.TmTaskTypeEnum.TM_TASK_DIRECT; + /** * @author hay * @description 直转申请 @@ -29,6 +35,12 @@ public class DirectRotationImpl implements DirectRotationService { @Resource private DirectRotationMapper mapper; + @Resource + private SysWorkflowRecordMapper wfMapper; + + @Resource + private SysWorkflowRecordHistoryMapper hisMapper; + @Resource(name = "workSiteDirectManageService") private WorkSiteDirectManageService workSiteDirectManageService; @@ -45,13 +57,15 @@ public class DirectRotationImpl implements DirectRotationService { @Override public AjaxResult submit(DirectApplyInfoDetails directApplyInfoDetails) { int id = 0; + String code =""; if (directApplyInfoDetails != null) { if (directApplyInfoDetails.getDirectApplyInfo() != null) { DirectApplyInfo directApplyInfos = directApplyInfoDetails.getDirectApplyInfo(); if (directApplyInfos.getBackAgreementId()==directApplyInfos.getLeaseAgreementId()){ return AjaxResult.error("申请失败，不能转入同单位同工程"); } - directApplyInfos.setCode(workSiteDirectManageService.genderLeaseCode()); + code = workSiteDirectManageService.genderLeaseCode(); + directApplyInfos.setCode(code); directApplyInfos.setCreateTime(new Date()); List urls = new ArrayList<>(); if (directApplyInfoDetails.getDirectApplyInfo().getDirUrls() != null) { @@ -89,9 +103,33 @@ public class DirectRotationImpl implements DirectRotationService { } else { return AjaxResult.error("保存失败"); } + initAuditDir(id,code); + + return AjaxResult.success("保存成功"); } + private void initAuditDir(int id, String code) { + + //1 生成直转审核节点任务 + SysWorkflowRecord wf = new SysWorkflowRecord(); + wf.setTaskId(id); + wf.setTaskType(TM_TASK_DIRECT.getTaskTypeId()); + wf.setTaskCode(code); + wf.setWorkflowId(16); + wfMapper.addSysWorkflowRecord(wf); + //2 生成直转审核人 + SysWorkflowRecordHistory his = new SysWorkflowRecordHistory(); + + his.setRecordId(wf.getId()); + his.setNodeId(9); + his.setNextNodeId(10); + his.setIsAccept(1); + his.setCreateBy(SecurityUtils.getUsername()); + his.setCreateTime(new Date()); + hisMapper.addSysWorkflowRecordHistory(his) ; + } + @Override public AjaxResult edit(DirectApplyInfoDetails directApplyInfoDetails) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java index 6a313c16..a7ddad4e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java @@ -40,6 +40,19 @@ public class SltAgreementReduceController extends BaseController { return getDataTable(list); } + + /** + * 查询结算协议减免申请列表 + */ + @ApiOperation(value = "查询结算协议减免列表") + //@RequiresPermissions("settlement:apply:list") + @GetMapping("/reduceList") + public AjaxResult reduceList(SltAgreementReduce sltAgreement) { + + List list = sltAgreementReduceService.selectAuditReduceList(sltAgreement); + return success(list); + } + /** * 查询协议申请减免明细 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementReduceMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementReduceMapper.java index 59c488d0..05f51208 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementReduceMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementReduceMapper.java @@ -39,17 +39,9 @@ public interface SltAgreementReduceMapper { */ List getReductionList(SltAgreementReduce bean); - /** - * 根据Id删除减免明细 - * @param id - * @return - */ - int deleteReduceDetail(Long id); + List selectAuditReduceList(SltAgreementReduce sltAgreement); + + void deleteReduceDetail(Long id); - /** - * 修改减免申请 - * @param sltAgreement - * @return - */ Long updateReduce(SltAgreementReduce sltAgreement); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementReduceService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementReduceService.java index 75a713ad..3de19035 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementReduceService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/ISltAgreementReduceService.java @@ -2,6 +2,7 @@ package com.bonus.material.settlement.service; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.settlement.domain.SltAgreementReduce; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -23,10 +24,8 @@ public interface ISltAgreementReduceService { List selectByMaModel(SltAgreementReduce sltAgreement); - /** - * 修改减免申请 - * @param sltAgreement - * @return - */ + @Transactional(rollbackFor = Exception.class) AjaxResult editApply(SltAgreementReduce sltAgreement); + + List selectAuditReduceList(SltAgreementReduce sltAgreement); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java index 2a5e25db..c4f84e36 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java @@ -175,6 +175,11 @@ public class SltAgreementReduceServiceImpl implements ISltAgreementReduceService } } + @Override + public List selectAuditReduceList(SltAgreementReduce sltAgreement) { + return sltAgreementRecudceMapper.selectAuditReduceList(sltAgreement); + } + private void initSltAgreement(SltAgreementReduce sltAgreement) { sltAgreement.setCode(generateCode()); sltAgreement.setCreateTime(new Date()); 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 new file mode 100644 index 00000000..0b33f9d1 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/DirectAuditController.java @@ -0,0 +1,87 @@ +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; +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; + +/** + * @author hay + * @description 业务办理--直转审核 + * @date 2025/2/17 13:13 + */ +@Api(tags = "直转审核任务接口") +@RestController +@RequestMapping("/directAudit") +public class DirectAuditController extends BaseController { + + @Resource + private IDirectAuditService service; + + + /** + * 直转记录查询列表 + */ + @ApiOperation(value = "直转记录查询列表") + @GetMapping("/list") + public TableDataInfo list(DirectApplyInfo directApplyInfo) { + startPage(); + try { + directApplyInfo.setAuditor(SecurityUtils.getUserId()+""); + List directApplyInfos = service.getList(directApplyInfo); + return getDataTable(directApplyInfos); + } catch (Exception e) { + return getDataTable(new ArrayList<>()); + } + } + + + + + @ApiOperation(value = "查看审批详情") + @GetMapping("/getAuditInfo") + public AjaxResult getAuditInfo(DirectAudit du) { + try { + return AjaxResult.success(service.getAuditInfo(du)); + } catch (Exception e) { + return AjaxResult.success(new DirectApplyInfo()); + } + } + + /** + * 审核直转申请 + */ + @ApiOperation(value = "审核直转申请") + @PostMapping("/auditDir") + public AjaxResult auditDir(@RequestBody DirectAudit audit) { + try { + return service.auditDir(audit); + } catch (Exception e) { + return AjaxResult.error("保存失败"); + } + } + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/DirectAudit.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/DirectAudit.java new file mode 100644 index 00000000..1d883321 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/DirectAudit.java @@ -0,0 +1,42 @@ +package com.bonus.material.work.domain; + + +import com.bonus.material.ma.domain.DirectApplyInfo; +import lombok.Data; +import lombok.ToString; + +import java.util.List; + +@Data +@ToString +public class DirectAudit { + + private Integer id; + + private DirectApplyInfo dir; + + private String creator; + + private String createTime; + + private int nodeId; + + private String nodeName; + + private String isAccept; + + private int nextNodeId; + + private String nextNodeName; + + private String remark; + + private int flowId; + + private String flowStatus; + + private String userId; + + private List nodeList; + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java index 213989ef..41494944 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java @@ -82,14 +82,5 @@ public class SysWorkflowNode { */ private int isAccept; - /** - * - */ - private Integer recordId; - - /** - * - */ - private Integer nodeId; - + private String nodeLabel; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java new file mode 100644 index 00000000..5b3657ce --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/DirectAuditMapper.java @@ -0,0 +1,28 @@ +package com.bonus.material.work.mapper; + + +import com.bonus.common.biz.domain.lease.LeaseApplyInfo; +import com.bonus.material.lease.domain.LeaseApplyDetails; +import com.bonus.material.ma.domain.DirectApplyInfo; +import com.bonus.material.ma.domain.Type; +import com.bonus.material.work.domain.DirectAudit; +import com.bonus.material.work.domain.SysWorkflowRecord; + +import java.util.List; + +/** +* @description 业务办理--领用任务 +* @author hay +* @date 2025/2/17 13:18 +*/ +public interface DirectAuditMapper { + + + List getList(DirectApplyInfo directApplyInfo); + + + + List getAuditInfo(DirectAudit du); + + void updateWorkflowRecord(DirectAudit fr); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/IDirectAuditService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/IDirectAuditService.java new file mode 100644 index 00000000..df41d949 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/IDirectAuditService.java @@ -0,0 +1,30 @@ +package com.bonus.material.work.service; + + +import com.bonus.common.biz.domain.lease.LeaseApplyInfo; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; +import com.bonus.material.ma.domain.DirectApplyInfo; +import com.bonus.material.ma.domain.Type; +import com.bonus.material.settlement.domain.SltAgreementInfo; +import com.bonus.material.work.domain.DirectAudit; + +import java.util.List; + +/** + * @author hay + * @description 业务办理--直转审核 + * @date 2025/2/17 13:15 + */ +public interface IDirectAuditService { + + + List getList(DirectApplyInfo directApplyInfo); + + + + List getAuditInfo(DirectAudit du); + + AjaxResult auditDir(DirectAudit audit); +} + 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 new file mode 100644 index 00000000..a3614105 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/DirectAuditImpl.java @@ -0,0 +1,156 @@ +package com.bonus.material.work.service.impl; + + +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.SecurityUtils; +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.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.stream.Collectors; + +/** + * @author hay + * @description 业务办理--直转审核 + * @date 2025/2/17 13:16 + */ +@Service +@Slf4j +public class DirectAuditImpl implements IDirectAuditService { + + @Resource + private DirectAuditMapper mapper; + + @Resource + private SysWorkflowNodeMapper wfnMapper; + + @Resource + private SysWorkflowRecordHistoryMapper hisMapper; + + @Resource + private SysWorkflowRecordMapper wfrMapper; + + @Override + public List getList(DirectApplyInfo directApplyInfo) { + return mapper.getList(directApplyInfo); + } + + + @Override + public List getAuditInfo(DirectAudit du) { + List list = new ArrayList<>(); + try { + + List auditlist = mapper.getAuditInfo(du); + + if(auditlist!=null && auditlist.size()>0){ + list.add(auditlist.get(0)); + for(int i= 0 ; i nodes = wfnMapper.selectSysWorkflowNodeList(node); + int flowId = audit.getFlowId(); + if(nodes !=null && nodes.size()>0){ + + for(SysWorkflowNode n : nodes){ + int flowNodeId = n.getId(); + String nodeLable = n.getNodeLabel(); + if (audit.getNodeId()==flowNodeId) { + + DirectAudit fr = new DirectAudit(); + fr.setId(flowId); + if(2==Integer.parseInt(isAccept)){ + fr.setFlowStatus("3"); + }else{ + if("2".equals(nodeLable)){ + fr.setFlowStatus("2"); + }else{ + fr.setFlowStatus("1"); + + //这里未判断下个节点的逻辑，后面需要修改 + int nextNodeId = flowNodeId +1; + + //2 生成直转审核人 + SysWorkflowRecordHistory his = new SysWorkflowRecordHistory(); + + his.setRecordId(flowId); + his.setNodeId(flowNodeId); + his.setNextNodeId(nextNodeId); + his.setIsAccept(Integer.parseInt(isAccept)); + his.setCreateBy(SecurityUtils.getUsername()); + his.setCreateTime(new Date()); + his.setRemark(remark); + hisMapper.addSysWorkflowRecordHistory(his) ; + + } + + + } + + + mapper.updateWorkflowRecord(fr); + + } + + + } + } + + + return AjaxResult.success(); + } +} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml index b731db29..2cb99d9a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into ma_supplier_info @@ -118,4 +119,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{supplierId} - \ No newline at end of file + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml index 865682f7..f1439e85 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml @@ -260,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sai.agreement_id = #{agreementId} and mt2.type_id = #{typeId} group by mt.type_id + + + + + 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 new file mode 100644 index 00000000..392d1f92 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + update sys_workflow_record set workflow_status = #{flowStatus} where id = #{id} + + 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 c20c3aaf..346992af 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 @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"