diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 01a2c3ef..702588ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -493,7 +493,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { queryWrapper.eq(ProcessNode::getIsView, 1); queryWrapper.eq(ProcessNode::getXmlNodeId, nodeId); ProcessNode processNode = processNodeService.getOne(queryWrapper, false); - + if (processNode == null){ + return; + } List linkList = new ArrayList<>(); userIdList.forEach(userId -> { ProcessNodeLink link = new ProcessNodeLink(); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessLinkController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessLinkController.java deleted file mode 100644 index ba1d9bdf..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessLinkController.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.controller; - -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessLink; -import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessLinkService; -import com.jero.common.api.vo.ResultCommon; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.bind.annotation.*; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import org.apache.commons.lang3.StringUtils; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; - -/** - * 项目合规评估流程关联标准(process_project_assess_link)表控制层 - * - * @author xxxxx - */ -@Slf4j -@Api(tags = "项目合规评估流程关联标准") -@RestController -@RequestMapping("ProcessProjectAssessLink") -public class ProcessProjectAssessLinkController extends JeroController { - /** - * 服务对象 - */ - @Resource - private ProcessProjectAssessLinkService processProjectAssessLinkService; - - /** - * 分页列表查询 - */ - @ApiOperation(value = "项目合规评估流程关联标准-分页列表查询", notes = "项目合规评估流程关联标准-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessProjectAssessLink processProjectAssessLink, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessLink, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = processProjectAssessLinkService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 列表查询 - */ - @ApiOperation(value = "项目合规评估流程关联标准-列表查询", notes = "项目合规评估流程关联标准-列表查询") - @GetMapping(value = "/list") - public Result> queryList(ProcessProjectAssessLink processProjectAssessLink, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessLink, req.getParameterMap()); - List list = processProjectAssessLinkService.list(queryWrapper); - return Result.OK(list); - } - - /** - * 添加 - */ - @AutoLog(value = "项目合规评估流程关联标准-添加") - @ApiOperation(value = "项目合规评估流程关联标准-添加", notes = "项目合规评估流程关联标准-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessProjectAssessLink processProjectAssessLink) { - processProjectAssessLinkService.add(processProjectAssessLink); - return Result.OK(ResultCommon.OK); - } - - /** - * 编辑 - */ - @AutoLog(value = "项目合规评估流程关联标准-编辑") - @ApiOperation(value = "项目合规评估流程关联标准-编辑", notes = "项目合规评估流程关联标准-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessProjectAssessLink processProjectAssessLink) { - processProjectAssessLinkService.editById(processProjectAssessLink); - return Result.OK(ResultCommon.EDIT_OK); - } - - /** - * 通过id删除 - */ - @AutoLog(value = "项目合规评估流程关联标准-通过id删除") - @ApiOperation(value = "项目合规评估流程关联标准-通过id删除", notes = "项目合规评估流程关联标准-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - String id = map.getId(); - if (StringUtils.isBlank(id)) { - return Result.error(ResultCommon.PLEASE_SELECT_DATA); - } - processProjectAssessLinkService.deleteById(id); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED); - } - - /** - * 批量删除 - */ - @AutoLog(value = "项目合规评估流程关联标准-批量删除") - @ApiOperation(value = "项目合规评估流程关联标准-批量删除", notes = "项目合规评估流程关联标准-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - String ids = map.getIds(); - if (StringUtils.isBlank(ids)) { - return Result.error(ResultCommon.PLEASE_SELECT_DATA); - } - List idList = Arrays.asList(map.getIds().split(",")); - this.processProjectAssessLinkService.deleteByIds(idList); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK); - } - - /** - * 通过id查询 - */ - @AutoLog(value = "项目合规评估流程关联标准-通过id查询") - @ApiOperation(value = "项目合规评估流程关联标准-通过id查询", notes = "项目合规评估流程关联标准-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id") String id) { - ProcessProjectAssessLink processProjectAssessLink = processProjectAssessLinkService.queryById(id); - if (processProjectAssessLink == null) { - return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } - return Result.OK(processProjectAssessLink); - } - - /** - * 导出excel - */ - @ApiOperation(value = "项目合规评估流程关联标准-导出excel") - @GetMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessProjectAssessLink processProjectAssessLink) { - return super.exportXls(request, processProjectAssessLink, ProcessProjectAssessLink.class, "项目合规评估流程关联标准"); - } - - /** - * 通过excel导入数据 - */ - @ApiOperation(value = "项目合规评估流程关联标准-通过excel导入数据") - @PostMapping(value = "/importExcel") - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ProcessProjectAssessLink.class); - } - - - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessTermController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessTermController.java deleted file mode 100644 index 933c6af7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessTermController.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.controller; - -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; -import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessTermService; -import com.jero.common.api.vo.ResultCommon; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.bind.annotation.*; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import org.apache.commons.lang3.StringUtils; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; - -/** - * 项目合规评估流程关联条款(process_project_assess_term)表控制层 - * - * @author xxxxx - */ -@Slf4j -@Api(tags = "项目合规评估流程关联条款") -@RestController -@RequestMapping("ProcessProjectAssessTerm") -public class ProcessProjectAssessTermController extends JeroController { - /** - * 服务对象 - */ - @Resource - private ProcessProjectAssessTermService processProjectAssessTermService; - - /** - * 分页列表查询 - */ - @ApiOperation(value = "项目合规评估流程关联条款-分页列表查询", notes = "项目合规评估流程关联条款-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessProjectAssessTerm processProjectAssessTerm, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessTerm, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = processProjectAssessTermService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 列表查询 - */ - @ApiOperation(value = "项目合规评估流程关联条款-列表查询", notes = "项目合规评估流程关联条款-列表查询") - @GetMapping(value = "/list") - public Result> queryList(ProcessProjectAssessTerm processProjectAssessTerm, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessTerm, req.getParameterMap()); - List list = processProjectAssessTermService.list(queryWrapper); - return Result.OK(list); - } - - /** - * 添加 - */ - @AutoLog(value = "项目合规评估流程关联条款-添加") - @ApiOperation(value = "项目合规评估流程关联条款-添加", notes = "项目合规评估流程关联条款-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessProjectAssessTerm processProjectAssessTerm) { - processProjectAssessTermService.add(processProjectAssessTerm); - return Result.OK(ResultCommon.OK); - } - - /** - * 编辑 - */ - @AutoLog(value = "项目合规评估流程关联条款-编辑") - @ApiOperation(value = "项目合规评估流程关联条款-编辑", notes = "项目合规评估流程关联条款-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessProjectAssessTerm processProjectAssessTerm) { - processProjectAssessTermService.editById(processProjectAssessTerm); - return Result.OK(ResultCommon.EDIT_OK); - } - - /** - * 通过id删除 - */ - @AutoLog(value = "项目合规评估流程关联条款-通过id删除") - @ApiOperation(value = "项目合规评估流程关联条款-通过id删除", notes = "项目合规评估流程关联条款-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - String id = map.getId(); - if (StringUtils.isBlank(id)) { - return Result.error(ResultCommon.PLEASE_SELECT_DATA); - } - processProjectAssessTermService.deleteById(id); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED); - } - - /** - * 批量删除 - */ - @AutoLog(value = "项目合规评估流程关联条款-批量删除") - @ApiOperation(value = "项目合规评估流程关联条款-批量删除", notes = "项目合规评估流程关联条款-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - String ids = map.getIds(); - if (StringUtils.isBlank(ids)) { - return Result.error(ResultCommon.PLEASE_SELECT_DATA); - } - List idList = Arrays.asList(map.getIds().split(",")); - this.processProjectAssessTermService.deleteByIds(idList); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK); - } - - /** - * 通过id查询 - */ - @AutoLog(value = "项目合规评估流程关联条款-通过id查询") - @ApiOperation(value = "项目合规评估流程关联条款-通过id查询", notes = "项目合规评估流程关联条款-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id") String id) { - ProcessProjectAssessTerm processProjectAssessTerm = processProjectAssessTermService.queryById(id); - if (processProjectAssessTerm == null) { - return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } - return Result.OK(processProjectAssessTerm); - } - - /** - * 导出excel - */ - @ApiOperation(value = "项目合规评估流程关联条款-导出excel") - @GetMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessProjectAssessTerm processProjectAssessTerm) { - return super.exportXls(request, processProjectAssessTerm, ProcessProjectAssessTerm.class, "项目合规评估流程关联条款"); - } - - /** - * 通过excel导入数据 - */ - @ApiOperation(value = "项目合规评估流程关联条款-通过excel导入数据") - @PostMapping(value = "/importExcel") - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ProcessProjectAssessTerm.class); - } - - - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessTermUserController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessTermUserController.java deleted file mode 100644 index 80726cd9..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessTermUserController.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.controller; - -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTermUser; -import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessTermUserService; -import com.jero.common.api.vo.ResultCommon; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.bind.annotation.*; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import org.apache.commons.lang3.StringUtils; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; - -/** - * 项目合规评估流程关联条款关联用户(process_project_assess_term_user)表控制层 - * - * @author xxxxx - */ -@Slf4j -@Api(tags = "项目合规评估流程关联条款关联用户") -@RestController -@RequestMapping("ProcessProjectAssessTermUser") -public class ProcessProjectAssessTermUserController extends JeroController { - /** - * 服务对象 - */ - @Resource - private ProcessProjectAssessTermUserService processProjectAssessTermUserService; - - /** - * 分页列表查询 - */ - @ApiOperation(value = "项目合规评估流程关联条款关联用户-分页列表查询", notes = "项目合规评估流程关联条款关联用户-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessProjectAssessTermUser processProjectAssessTermUser, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessTermUser, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = processProjectAssessTermUserService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 列表查询 - */ - @ApiOperation(value = "项目合规评估流程关联条款关联用户-列表查询", notes = "项目合规评估流程关联条款关联用户-列表查询") - @GetMapping(value = "/list") - public Result> queryList(ProcessProjectAssessTermUser processProjectAssessTermUser, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessTermUser, req.getParameterMap()); - List list = processProjectAssessTermUserService.list(queryWrapper); - return Result.OK(list); - } - - /** - * 添加 - */ - @AutoLog(value = "项目合规评估流程关联条款关联用户-添加") - @ApiOperation(value = "项目合规评估流程关联条款关联用户-添加", notes = "项目合规评估流程关联条款关联用户-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessProjectAssessTermUser processProjectAssessTermUser) { - processProjectAssessTermUserService.add(processProjectAssessTermUser); - return Result.OK(ResultCommon.OK); - } - - /** - * 编辑 - */ - @AutoLog(value = "项目合规评估流程关联条款关联用户-编辑") - @ApiOperation(value = "项目合规评估流程关联条款关联用户-编辑", notes = "项目合规评估流程关联条款关联用户-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessProjectAssessTermUser processProjectAssessTermUser) { - processProjectAssessTermUserService.editById(processProjectAssessTermUser); - return Result.OK(ResultCommon.EDIT_OK); - } - - /** - * 通过id删除 - */ - @AutoLog(value = "项目合规评估流程关联条款关联用户-通过id删除") - @ApiOperation(value = "项目合规评估流程关联条款关联用户-通过id删除", notes = "项目合规评估流程关联条款关联用户-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - String id = map.getId(); - if (StringUtils.isBlank(id)) { - return Result.error(ResultCommon.PLEASE_SELECT_DATA); - } - processProjectAssessTermUserService.deleteById(id); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED); - } - - /** - * 批量删除 - */ - @AutoLog(value = "项目合规评估流程关联条款关联用户-批量删除") - @ApiOperation(value = "项目合规评估流程关联条款关联用户-批量删除", notes = "项目合规评估流程关联条款关联用户-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - String ids = map.getIds(); - if (StringUtils.isBlank(ids)) { - return Result.error(ResultCommon.PLEASE_SELECT_DATA); - } - List idList = Arrays.asList(map.getIds().split(",")); - this.processProjectAssessTermUserService.deleteByIds(idList); - return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK); - } - - /** - * 通过id查询 - */ - @AutoLog(value = "项目合规评估流程关联条款关联用户-通过id查询") - @ApiOperation(value = "项目合规评估流程关联条款关联用户-通过id查询", notes = "项目合规评估流程关联条款关联用户-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id") String id) { - ProcessProjectAssessTermUser processProjectAssessTermUser = processProjectAssessTermUserService.queryById(id); - if (processProjectAssessTermUser == null) { - return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } - return Result.OK(processProjectAssessTermUser); - } - - /** - * 导出excel - */ - @ApiOperation(value = "项目合规评估流程关联条款关联用户-导出excel") - @GetMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessProjectAssessTermUser processProjectAssessTermUser) { - return super.exportXls(request, processProjectAssessTermUser, ProcessProjectAssessTermUser.class, "项目合规评估流程关联条款关联用户"); - } - - /** - * 通过excel导入数据 - */ - @ApiOperation(value = "项目合规评估流程关联条款关联用户-通过excel导入数据") - @PostMapping(value = "/importExcel") - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ProcessProjectAssessTermUser.class); - } - - - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index de68e883..d3f04773 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -541,7 +541,6 @@ public class ProcessProjectAssessService extends ServiceImpl