From 97213e6e6070bfd3d337041849b7bc4a84acf8f2 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 4 Mar 2025 17:31:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/common/biz/enums/TmTaskTypeEnum.java | 4 +++- .../com/bonus/material/lease/domain/LeaseApplyDetails.java | 3 +++ .../material/lease/service/impl/LeaseTaskServiceImpl.java | 6 +++--- .../com/bonus/material/ma/controller/TypeController.java | 4 ++-- .../mapper/material/lease/LeaseApplyInfoMapper.xml | 2 +- .../resources/mapper/material/lease/LeaseTaskMapper.xml | 7 ++++--- 6 files changed, 16 insertions(+), 10 deletions(-) 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 7d824132..e9f96f8c 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 @@ -29,7 +29,9 @@ public enum TmTaskTypeEnum { //安全工器具领料任务 TM_TASK_SAFE_LEASE(17, "安全工器具领料任务"), // 宏源领料领料任务 - TM_TASK_HY_LEASE(18, "宏源领料任务"); + TM_TASK_HY_LEASE(18, "宏源领料任务"), + // 领用任务 + TM_TASK_LEASE_APPLY(19, "领用任务"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java index c7e39d0f..839d29bb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java @@ -49,6 +49,9 @@ public class LeaseApplyDetails extends BaseEntity { @ApiModelProperty(value = "规格型号id") private Long typeId; + @ApiModelProperty(value = "三级id") + private Long thirdTypeId; + @ApiModelProperty(value = "规格型号id") private Long taskId; 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 e10215ed..31d47f5d 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 @@ -120,9 +120,9 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { } else { taskStatus = LeaseTaskStatusEnum.LEASE_TASK_SUBMIT.getStatus(); } - int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId()); + int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE_APPLY.getTaskTypeId()); String taskCode = leaseApplyRequestVo.getLeaseApplyInfo().getCode(); - TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId(), + TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_LEASE_APPLY.getTaskTypeId(), taskStatus, leaseApplyRequestVo.getLeaseApplyInfo().getCompanyId(),thisMonthMaxOrder + 1, taskCode); tmTask.setCreateTime(DateUtils.getNowDate()); @@ -278,7 +278,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { leaseDeptInfo = mapper.getDeptIdByParentId(parentIdTemp); } if(!deptName.equals("")){ - int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId()); + int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE_APPLY.getTaskTypeId()); taskCode = genderTaskCodeTwo(thisMonthMaxOrder,leaseDeptInfo.getCompanySX()); leaseDeptInfo.setTaskCode(taskCode); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java index 71d4011e..c547c702 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java @@ -137,8 +137,8 @@ public class TypeController extends BaseController { @ApiOperation(value = "根据物资类型ID-查询子级下拉列表") @RequiresPermissions("ma:type:list") @GetMapping("/selectMaTypeListByTypeId") - public AjaxResult selectMaTypeListByTypeId(@NotNull(message = "物资类型ID不能为空") Long typeId) { - List list = typeService.getMaTypeSelectVoListByParentId(typeId); + public AjaxResult selectMaTypeListByTypeId(Type type) { + List list = typeService.getMaTypeSelectVoListByParentId(type.getTypeId()); return success(list); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index 0d67f26e..9c9584be 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and lai.lease_type = #{leaseType} and lai.estimate_lease_time = #{estimateLeaseTime} and lai.cost_bearing_party = #{costBearingParty} - and tt.task_status != '0' + and tt.task_type = '2' GROUP BY lai.id ORDER BY tt.task_status,tt.create_time desc diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml index c5100b1d..2d5fc734 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml @@ -329,7 +329,7 @@ and sda.dict_type = 'lease_task_status' left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0' left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0' - where 1=1 + where tt.task_type = '19' and lai.code = #{code} and lai.task_id = #{taskId} and lai.lease_person = #{leasePerson} @@ -642,6 +642,7 @@ lad.parent_id AS parentId, mt.type_id AS typeId, mt.type_name AS typeName, + mt2.type_id AS thirdTypeId, mt2.type_name AS maTypeName, CASE mt.manage_type @@ -721,8 +722,8 @@ and sda.dict_type = 'lease_task_status' left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0' left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0' - where - tt.task_status = '1' + where tt.task_type = '19' + and tt.task_status = '1' and lai.task_id = #{taskId} and tt.task_status in From c205a380052f9c12ce242c2fc0beb072d4b11c81 Mon Sep 17 00:00:00 2001 From: zfh <15856818120@163.com> Date: Tue, 4 Mar 2025 18:53:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=8A=A0=E4=B8=8A=E4=BC=9A=E7=AD=BE?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/domain/SysWorkflowConfig.java | 2 +- .../material/work/domain/SysWorkflowNode.java | 2 +- .../work/mapper/SysWorkflowConfigMapper.java | 2 + .../SysWorkflowRecordHistoryMapper.java | 4 +- .../work/mapper/SysWorkflowRecordMapper.java | 5 +- .../impl/SysWorkflowNodeServiceImpl.java | 70 +++++++++++++------ .../SysWorkflowRecordHistoryServiceImpl.java | 7 +- .../material/work/SysWorkflowConfigMapper.xml | 3 + .../material/work/SysWorkflowNodeMapper.xml | 2 +- .../material/work/SysWorkflowRecordMapper.xml | 32 ++++----- .../work/SysWorkflowRecordhistoryMapper.xml | 8 +-- 11 files changed, 87 insertions(+), 50 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowConfig.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowConfig.java index 34ab190b..de892a78 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowConfig.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowConfig.java @@ -29,7 +29,7 @@ public class SysWorkflowConfig { /** * 配置值 */ - private Integer configValue; + private String configValue; /** * 0关闭 1启用 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 d04e5017..f30509f7 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 @@ -78,7 +78,7 @@ public class SysWorkflowNode { private String remark; /** - * 审批结果，0拒绝 1通过 + * 审批结果，0待审批 1通过 2已驳回 */ private int isAccept; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowConfigMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowConfigMapper.java index 9d5f9cdd..012d9fa5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowConfigMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowConfigMapper.java @@ -11,4 +11,6 @@ public interface SysWorkflowConfigMapper { int addSysWorkflowConfig(SysWorkflowConfig sysWorkflowConfig); int deleteSysWorkflowConfig(SysWorkflowConfig sysWorkflowConfig); + + String selectConfigValueByNodeId(Integer nodeId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java index d71caf8b..65606661 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java @@ -3,10 +3,12 @@ package com.bonus.material.work.mapper; import com.bonus.material.work.domain.SysWorkflowRecord; import com.bonus.material.work.domain.SysWorkflowRecordHistory; +import java.util.List; + public interface SysWorkflowRecordHistoryMapper { int addSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory); - SysWorkflowRecordHistory seleteSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory); + List seleteSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordMapper.java index 084db1d5..996a1085 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordMapper.java @@ -2,6 +2,7 @@ package com.bonus.material.work.mapper; import com.bonus.material.work.domain.SysWorkflowRecord; import com.bonus.material.work.domain.dto.SysWorkflowAuditDto; +import org.apache.ibatis.annotations.Param; public interface SysWorkflowRecordMapper { @@ -11,6 +12,8 @@ public interface SysWorkflowRecordMapper { // 修改审批流任务信息 int updateSysWorkflowRecord(SysWorkflowRecord sysWorkflowRecord); + + // 根据任务id，查询审批流任务信息 - SysWorkflowAuditDto getSysWorkflowRecodeByTaskId(Integer taskId); + SysWorkflowAuditDto getSysWorkflowRecodeByTaskId(@Param("taskId") Integer taskId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java index fff60178..0d8bd23b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java @@ -48,19 +48,17 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService { sysWorkflowNode.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); //保存创建时间 sysWorkflowNode.setCreateTime(DateUtils.getNowDate()); - String[] ConfigValue = sysWorkflowNode.getConfigValues().split(","); + if (sysWorkflowNode.getConfigValues().isEmpty()){ throw new ServiceException("请选择审核人员"); } int count = sysWorkflowNodeMapper.addSysWorkflowNode(sysWorkflowNode); - for (int i = 0; i < ConfigValue.length; i++) { - SysWorkflowConfig sysWorkflowConfig = new SysWorkflowConfig(); - sysWorkflowConfig.setNodeId(sysWorkflowNode.getId()); - sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType()); - sysWorkflowConfig.setConfigValue(Integer.valueOf(ConfigValue[i])); - //新增审核详情表信息 - sysWorkflowConfigMapper.addSysWorkflowConfig(sysWorkflowConfig); - } + SysWorkflowConfig sysWorkflowConfig = new SysWorkflowConfig(); + sysWorkflowConfig.setNodeId(sysWorkflowNode.getId()); + sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType()); + sysWorkflowConfig.setConfigValue(sysWorkflowNode.getConfigValues()); + //新增审核详情表信息 + sysWorkflowConfigMapper.addSysWorkflowConfig(sysWorkflowConfig); return count; } @@ -85,39 +83,65 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService { @Transactional public int updateSysWorkflowNode(SysWorkflowNode sysWorkflowNode) { int count = sysWorkflowNodeMapper.updateSysWorkflowNode(sysWorkflowNode); - String[] ConfigValue = sysWorkflowNode.getConfigValues().split(","); if (sysWorkflowNode.getConfigValues().isEmpty()){ throw new ServiceException("请选择审核人员"); } SysWorkflowConfig sysWorkflowConfig = new SysWorkflowConfig(); sysWorkflowConfig.setNodeId(sysWorkflowNode.getId()); sysWorkflowConfigMapper.deleteSysWorkflowConfig(sysWorkflowConfig); - for (int i = 0; i < ConfigValue.length; i++) { - sysWorkflowConfig.setNodeId(sysWorkflowNode.getId()); - sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType()); - sysWorkflowConfig.setConfigValue(Integer.valueOf(ConfigValue[i])); - //新增审核详情表信息 - sysWorkflowConfigMapper.addSysWorkflowConfig(sysWorkflowConfig); - } + sysWorkflowConfig.setNodeId(sysWorkflowNode.getId()); + sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType()); + sysWorkflowConfig.setConfigValue(sysWorkflowNode.getConfigValues()); + //新增审核详情表信息 + sysWorkflowConfigMapper.addSysWorkflowConfig(sysWorkflowConfig); return count; } @Override public List listByTaskId(SysWorkflowNode sysWorkflowNode) { + Long userId = SecurityUtils.getUserId(); List sysWorkflowNodeList = sysWorkflowNodeMapper.listByTaskId(sysWorkflowNode); for (SysWorkflowNode SysWorkflowNode: sysWorkflowNodeList) { SysWorkflowRecordHistory sysWorkflowRecordHistory = new SysWorkflowRecordHistory(); sysWorkflowRecordHistory.setRecordId(SysWorkflowNode.getRecordId()); sysWorkflowRecordHistory.setNodeId(SysWorkflowNode.getNodeId()); - System.out.println(sysWorkflowRecordHistory); - SysWorkflowRecordHistory sysWorkflowRecordHistoryNew = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory); - if (StringUtils.isNotNull(sysWorkflowRecordHistoryNew)){ - SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryNew.getIsAccept()); - SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryNew.getCreateTime()); - SysWorkflowNode.setRemark(sysWorkflowRecordHistoryNew.getRemark()); + List sysWorkflowRecordHistoryList = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory); + if (StringUtils.isNotNull(sysWorkflowRecordHistoryList)){ + //判断是或签还是会签0:或签 1:会签 + if (0==SysWorkflowNode.getNodeSignType()){ + SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryList.get(0).getIsAccept()); + SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryList.get(0).getCreateTime()); + SysWorkflowNode.setRemark(sysWorkflowRecordHistoryList.get(0).getRemark()); + }else { + String[] ConfigValue =SysWorkflowNode.getConfigValues().split(","); + // 过滤数组元素 + for (SysWorkflowRecordHistory sysWorkflowRecordHistoryNew : sysWorkflowRecordHistoryList) { + /*List filteredList = Arrays.stream(ConfigValue) + .filter(value -> value.equals(sysWorkflowRecordHistoryNew.getCreateBy())) + .collect(Collectors.toList()); + //判断是不是所有人都审核完成 + if(filteredList.size()==0){ + + }*/ + //查看当前人是否审核 + if(userId.toString().equals(sysWorkflowRecordHistoryNew.getCreateBy())){ + SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryNew.getIsAccept()); + SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryNew.getCreateTime()); + SysWorkflowNode.setRemark(sysWorkflowRecordHistoryNew.getRemark()); + } + //查看别人审核是否有驳回的 + if (sysWorkflowRecordHistoryNew.getIsAccept().equals(2)){ + SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryNew.getIsAccept()); + SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryNew.getCreateTime()); + SysWorkflowNode.setRemark(sysWorkflowRecordHistoryNew.getRemark()); + } + } + + } } } + return sysWorkflowNodeList; } } 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 161b3254..b82e1af9 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 @@ -17,12 +17,14 @@ import com.bonus.material.work.mapper.SysWorkflowRecordMapper; import com.bonus.material.work.mapper.SysWorkflowTypeMapper; import com.bonus.material.work.service.SysWorkflowRecordHistoryService; import com.bonus.material.work.service.SysWorkflowRecordService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +@Slf4j @Service public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHistoryService { @@ -50,6 +52,9 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis @Override @Transactional public int updateSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory) { + //保存审核人信息 + Long userId = SecurityUtils.getUserId(); + sysWorkflowRecordHistory.setCreateBy(userId.toString()); sysWorkflowRecordHistoryMapper.addSysWorkflowRecordHistory(sysWorkflowRecordHistory); //根据当前审批状态，修改流程状态 if (sysWorkflowRecordHistory.getIsAccept()==1){ @@ -80,12 +85,10 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis sysWorkflowRecord.setWorkflowStatus(2); sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord); System.out.println("-------------节点更新任务信息为完成-------------"); - SysWorkflowAuditDto sysWorkflowRecodeInfo = sysWorkflowRecordMapper.getSysWorkflowRecodeByTaskId(sysWorkflowRecordHistory.getTaskId()); if (sysWorkflowRecodeInfo == null) { throw new ServiceException("任务类型为空"); } - // 根据任务类型修改业务状态 switch (sysWorkflowRecodeInfo.getTaskType()) { // 领料任务:2 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowConfigMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowConfigMapper.xml index 835c0230..49074699 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowConfigMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowConfigMapper.xml @@ -24,4 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sys_workflow_config where node_id=#{nodeId} + 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 3e74e582..fe0d5adf 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 @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select - a.id, - a.task_id, - a.task_type, - a.task_code, - a.workflow_id, - a.workflow_status - from sys_workflow_record a - - - a.task_id = #{taskId} - - - limit 1 - + + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml index 158afeff..d462c8ac 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml @@ -27,9 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"