diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseTaskController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseTaskController.java index cc5ec151..127d4727 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseTaskController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseTaskController.java @@ -126,4 +126,28 @@ public class LeaseTaskController extends BaseController { } } + + /** + * 审核人员领用记录查询 + */ + @ApiOperation(value = "审核人员领用记录查询") + @GetMapping("/auditList") + public AjaxResult auditList(LeaseApplyInfo leaseApplyInfo) { + Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); + try { + List list = service.selectAuditLeaseApplyInfoList(leaseApplyInfo); + if (leaseApplyInfo.getIsApp()==null){ + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); + }else { + return AjaxResult.success(list); + } + } catch (Exception e) { + if (leaseApplyInfo.getIsApp()==null){ + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, new ArrayList<>())); + }else { + return AjaxResult.success(new ArrayList<>()); + } + } + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java index af4b042a..870c6c7d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java @@ -69,4 +69,6 @@ public interface LeaseTaskMapper { * @return 结果 */ List getTypeDataList(Type bean); + + List selectAuditLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseTaskService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseTaskService.java index eba75d63..854b12d3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseTaskService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseTaskService.java @@ -64,5 +64,7 @@ public interface ILeaseTaskService { * @return */ List getTypeDataList(Type bean); + + List selectAuditLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo); } 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 74cbbee2..f6bf1758 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 @@ -24,9 +24,15 @@ 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.SysWorkflowRecord; +import com.bonus.material.work.domain.SysWorkflowType; +import com.bonus.material.work.mapper.SysWorkflowRecordMapper; +import com.bonus.material.work.mapper.SysWorkflowTypeMapper; +import com.bonus.material.work.service.SysWorkflowRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -63,7 +69,8 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { @Resource private BmFileInfoMapper bmFileInfoMapper; - + @Resource + private SysWorkflowRecordService sysWorkflowRecordService; /** * 新增领用任务 * @@ -71,6 +78,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { * @return 结果 */ @Override + @Transactional public AjaxResult insertLeaseApplyInfo(LeaseApplyRequestVo leaseApplyRequestVo) { if (null == leaseApplyRequestVo.getLeaseApplyInfo()) { return AjaxResult.error("请先填写领用任务信息"); @@ -113,6 +121,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { bmFileInfoMapper.insertBmFileInfo(bmFileInfo); }); } + sysWorkflowRecordService.addSysWorkflowRecord(tmTask.getTaskId().intValue(),taskCode,2); if (count > 0) { return insertPurchaseCheckDetails(leaseApplyRequestVo.getLeaseApplyDetailsList(), leaseApplyRequestVo.getLeaseApplyInfo().getId()); } else { @@ -273,6 +282,23 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { return mapper.getTypeDataList(bean); } + @Override + public List selectAuditLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo) { + Long userId = SecurityUtils.getUserId(); + leaseApplyInfo.setUserId(userId == 0 ? null : userId); + List list = mapper.selectAuditLeaseApplyInfoList(leaseApplyInfo); + if (!CollectionUtils.isEmpty(list)) { + String keyWord = leaseApplyInfo.getKeyWord(); + // 如果关键字不为空,进行过滤 + if (!StringUtils.isBlank(keyWord)) { + list = list.stream() + .filter(item -> containsKeyword(item, keyWord)) + .collect(Collectors.toList()); + } + } + return list; + } + /** * 关键字搜索 * @param item diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowNodeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowNodeController.java index 5e05050b..aeb8a14c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowNodeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowNodeController.java @@ -82,4 +82,20 @@ public class SysWorkflowNodeController extends BaseController { return error(); } } + + /** + * 根据任务id查询工作流详情列表 + */ + @ApiOperation(value = "根据任务id查询工作流详情列表") + @GetMapping("/listByTaskId") + public TableDataInfo listByTaskId(SysWorkflowNode sysWorkflowNode) + { + try { + startPage(); + List list = sysWorkflowNodeService.listByTaskId(sysWorkflowNode); + return getDataTable(list); + }catch (Exception e){ + return getDataTableError(null); + } + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowTypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowTypeController.java index 47c312a6..c1eba864 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowTypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowTypeController.java @@ -82,4 +82,5 @@ public class SysWorkflowTypeController extends BaseController { return error(); } } + } 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 2d108db3..7c91c69e 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 @@ -66,4 +66,19 @@ public class SysWorkflowNode { * 配置值 */ private String configValues; + + /** + * 任务Id + */ + private String taskId; + + /** + * 备注 意见 驳回原因 + */ + private String remark; + + /** + * 审批结果,0拒绝 1通过 + */ + private Integer isAccept; } 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 988b90bf..e62c7267 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 @@ -14,4 +14,6 @@ public interface SysWorkflowNodeMapper { int deleteSysWorkflowNode(SysWorkflowNode sysWorkflowNode); int updateSysWorkflowNode(SysWorkflowNode sysWorkflowNode); + + List listByTaskId(SysWorkflowNode sysWorkflowNode); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/SysWorkflowNodeService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/SysWorkflowNodeService.java index 1448e9d9..272b343f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/SysWorkflowNodeService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/SysWorkflowNodeService.java @@ -13,4 +13,6 @@ public interface SysWorkflowNodeService { int deleteSysWorkflowNode(SysWorkflowNode sysWorkflowNode); int updateSysWorkflowNode(SysWorkflowNode sysWorkflowNode); + + List listByTaskId(SysWorkflowNode sysWorkflowNode); } 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 31d6ecd1..259872e9 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 @@ -93,4 +93,10 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService { } return count; } + + @Override + public List listByTaskId(SysWorkflowNode sysWorkflowNode) { + + return sysWorkflowNodeMapper.listByTaskId(sysWorkflowNode); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java index da5782fa..d1177be7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java @@ -3,9 +3,11 @@ package com.bonus.material.work.service.impl; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.security.utils.SecurityUtils; +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.SysWorkflowNodeMapper; import com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper; import com.bonus.material.work.mapper.SysWorkflowRecordMapper; import com.bonus.material.work.mapper.SysWorkflowTypeMapper; @@ -28,6 +30,9 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService { @Resource private SysWorkflowRecordHistoryMapper sysWorkflowRecordHistoryMapper; + @Resource + private SysWorkflowNodeMapper sysWorkflowNodeMapper; + @Override @Transactional public int addSysWorkflowRecord(int taskId,String taskCode,int taskType) { @@ -37,7 +42,7 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService { sysWorkflowType.setIsEnable(1); List sysWorkflowTypeList =sysWorkflowTypeMapper.selectSysWorkflowTypeList(sysWorkflowType); if (sysWorkflowTypeList.size()<1){ - throw new ServiceException("新增任务失败,请创建领料审核流程"); + throw new ServiceException("新增任务失败,请创建审核流程"); } sysWorkflowType = sysWorkflowTypeList.get(0); SysWorkflowRecord sysWorkflowRecord = new SysWorkflowRecord(); @@ -47,11 +52,15 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService { sysWorkflowRecord.setTaskCode(taskCode); //创建审批任务 int count = sysWorkflowRecordMapper.addSysWorkflowRecord(sysWorkflowRecord); + //获取当前审核流下的节点 + SysWorkflowNode sysWorkflowNode = new SysWorkflowNode(); + sysWorkflowNode.setTypeId(sysWorkflowType.getId()); + List sysWorkflowNodeList = sysWorkflowNodeMapper.selectSysWorkflowNodeList(sysWorkflowNode); //创建审核记录 SysWorkflowRecordHistory sysWorkflowRecordHistory = new SysWorkflowRecordHistory(); sysWorkflowRecordHistory.setRecordId(sysWorkflowRecord.getId()); - sysWorkflowRecordHistory.setNodeId(1); - sysWorkflowRecordHistory.setNextNodeId(2); + sysWorkflowRecordHistory.setNodeId(sysWorkflowNodeList.get(0).getId()); + sysWorkflowRecordHistory.setNextNodeId(sysWorkflowNodeList.get(1).getId()); sysWorkflowRecordHistory.setIsAccept(1); sysWorkflowRecordHistory.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); sysWorkflowRecordHistory.setCreateTime(DateUtils.getNowDate()); 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 b98f7922..56d52592 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 @@ -391,4 +391,65 @@ where m.del_flag = '0' and m.parent_id = #{typeId} - \ No newline at end of file + + 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 0b8ae019..dd731643 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 @@ -65,7 +65,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where swn.type_id=#{typeId} and type_name like concat('%', #{typeName}, '%') and node_sign_type = #{nodeSignType} + GROUP BY swn.id ORDER BY swn.node_sort + +