diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java index 15166c2a..d85d2350 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java @@ -1,21 +1,33 @@ package com.jero.modules.activiti.process.fb.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.DictPoint; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.entity.ProcessNode; import com.jero.modules.activiti.mapper.ProcessNodeMapper; +import com.jero.modules.activiti.process.common.entity.ProcessDraft; +import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; +import com.jero.modules.laws.common.util.CurrentUserUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Objects; /** * @Author: liao @@ -32,6 +44,8 @@ public class ProcessFbInfoController { private ProcessNodeMapper processNodeMapper; @Resource private IProcessHandleService processHandleService; + @Resource + private ProcessDraftService processDraftService; @DictPoint @GetMapping("/getNodeList") @@ -47,4 +61,17 @@ public class ProcessFbInfoController { return Result.OK(processNodeList); } + @ApiOperation(value = "查询草稿") + @GetMapping("/getDraftList") + public Result getDraftList(ProcessDraft processDraft, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId()); + queryWrapper.eq(!Objects.isNull(processDraft.getPrcType()), ProcessDraft::getPrcType, processDraft.getPrcType()); + Page page = new Page<>(pageNo, pageSize); + IPage sentList = processDraftService.page(page, queryWrapper); + return Result.OK(sentList); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index bd709811..68c8d5ff 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -134,7 +134,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl objectMap = JSON.parseObject(businessInfoDTO.getBusinessJson(), Map.class); @@ -146,6 +147,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl