From 604b79b998672ba66cdfba3fa6c5acc87a4bc592 Mon Sep 17 00:00:00 2001 From: ljl <3030243464@qq.com> Date: Fri, 24 Mar 2023 17:25:03 +0800 Subject: [PATCH] 2 --- .../house/HousesReviewController.java | 13 +- .../material/MaterialModuleController.java | 113 ++++++++++++++++++ .../material/MaterialTalentsController.java | 106 ++++++++++++++++ .../controller/system/SysOssController.java | 2 +- .../src/main/resources/application.yml | 2 + .../java/com/ruoyi/test/DemoUnitTest.java | 4 +- .../com/ruoyi/system/domain/BuyHouses.java | 2 +- .../ruoyi/system/domain/vo/BuyHousesVo.java | 9 +- .../system/domain/vo/HousesReviewVo.java | 3 +- .../system/service/IHousesReviewService.java | 2 +- .../service/impl/BuyHousesServiceImpl.java | 11 +- .../service/impl/HousesReviewServiceImpl.java | 4 +- .../work/controller/ProcessController.java | 107 +++++++++++++++++ .../ruoyi/work/controller/WorkController.java | 14 ++- .../com/ruoyi/work/domain/HisProcess.java | 3 + .../ruoyi/work/domain/vo/HisProcessVo.java | 2 + .../com/ruoyi/work/utils/WorkComplyUtils.java | 27 +++-- .../mapper/work/ActProcessMapper.xml | 3 + .../mapper/work/HisProcessMapper.xml | 8 +- 19 files changed, 406 insertions(+), 29 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialModuleController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialTalentsController.java create mode 100644 ruoyi-work/src/main/java/com/ruoyi/work/controller/ProcessController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java index ebebfe4eb..5b805d7f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java @@ -52,13 +52,24 @@ public class HousesReviewController extends BaseController { private final BuyHousesMapper buyHousesMapper; + /** + * 购房登记录入 + * @param bo + * @param pageQuery + * @return + */ + @SaCheckPermission("system:review:reviewList") + @GetMapping("/review/list") + public TableDataInfo reviewList(HousesReviewBo bo, PageQuery pageQuery) { + return iHousesReviewService.queryPageList(bo, pageQuery); + } /** * 查询购房复审登记列表 */ @SaCheckPermission("system:review:list") @GetMapping("/registrationManagement/list") - public TableDataInfo list(HousesReviewBo bo, PageQuery pageQuery) { + public TableDataInfo list(HousesReviewBo bo, PageQuery pageQuery) { return iHousesReviewService.queryPageList(bo, pageQuery); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialModuleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialModuleController.java new file mode 100644 index 000000000..29d5ada9c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialModuleController.java @@ -0,0 +1,113 @@ +package com.ruoyi.web.controller.material; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.bo.MaterialModuleBo; +import com.ruoyi.system.domain.vo.MaterialModuleVo; +import com.ruoyi.system.service.IMaterialModuleService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +/** + * 材料模块 + * + * @author ruoyi + * @date 2023-03-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/material/module") +public class MaterialModuleController extends BaseController { + + private final IMaterialModuleService iMaterialModuleService; + + /** + * 查询材料模块列表 + */ + @SaCheckPermission("material:module:list") + @GetMapping("/list") + public TableDataInfo list(MaterialModuleBo bo, PageQuery pageQuery) { + return iMaterialModuleService.queryPageList(bo, pageQuery); + } + + @SaCheckPermission("material:materialList:list") + @GetMapping("/materialList") + public R materialList(MaterialModuleBo bo) { + return iMaterialModuleService.selectMaterialList(bo); + } + + /** + * 导出材料模块列表 + */ + @SaCheckPermission("material:module:export") + @Log(title = "材料模块", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(MaterialModuleBo bo, HttpServletResponse response) { + List list = iMaterialModuleService.queryList(bo); + ExcelUtil.exportExcel(list, "材料模块", MaterialModuleVo.class, response); + } + + /** + * 获取材料模块详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("material:module:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(iMaterialModuleService.queryById(id)); + } + + /** + * 新增材料模块 + */ + @SaCheckPermission("material:module:add") + @Log(title = "材料模块", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody MaterialModuleBo bo) { + return toAjax(iMaterialModuleService.insertByBo(bo)); + } + + /** + * 修改材料模块 + */ + @SaCheckPermission("material:module:edit") + @Log(title = "材料模块", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody MaterialModuleBo bo) { + return toAjax(iMaterialModuleService.updateByBo(bo)); + } + + /** + * 删除材料模块 + * + * @param ids 主键串 + */ + @SaCheckPermission("material:module:remove") + @Log(title = "材料模块", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iMaterialModuleService.deleteWithValidByIds(Arrays.asList(ids), true)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialTalentsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialTalentsController.java new file mode 100644 index 000000000..bd0563145 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialTalentsController.java @@ -0,0 +1,106 @@ +package com.ruoyi.web.controller.material; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.bo.MaterialTalentsBo; +import com.ruoyi.system.domain.vo.MaterialTalentsVo; +import com.ruoyi.system.service.IMaterialTalentsService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +/** + * 材料关系 + * + * @author ruoyi + * @date 2023-03-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/material/talents") +public class MaterialTalentsController extends BaseController { + + private final IMaterialTalentsService iMaterialTalentsService; + + /** + * 查询材料关系列表 + */ + @SaCheckPermission("material:talents:list") + @GetMapping("/list") + public R> list(MaterialTalentsBo bo) { + List list = iMaterialTalentsService.queryList(bo); + return R.ok(list); + } + + /** + * 导出材料关系列表 + */ + @SaCheckPermission("material:talents:export") + @Log(title = "材料关系", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(MaterialTalentsBo bo, HttpServletResponse response) { + List list = iMaterialTalentsService.queryList(bo); + ExcelUtil.exportExcel(list, "材料关系", MaterialTalentsVo.class, response); + } + + /** + * 获取材料关系详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("material:talents:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(iMaterialTalentsService.queryById(id)); + } + + /** + * 新增材料关系 + */ + @SaCheckPermission("material:talents:add") + @Log(title = "材料关系", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody MaterialTalentsBo bo) { + return toAjax(iMaterialTalentsService.insertByBo(bo)); + } + + /** + * 修改材料关系 + */ + @SaCheckPermission("material:talents:edit") + @Log(title = "材料关系", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody MaterialTalentsBo bo) { + return toAjax(iMaterialTalentsService.updateByBo(bo)); + } + + /** + * 删除材料关系 + * + * @param ids 主键串 + */ + @SaCheckPermission("material:talents:remove") + @Log(title = "材料关系", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iMaterialTalentsService.deleteWithValidByIds(Arrays.asList(ids), true)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java index 606895a74..89187a360 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java @@ -62,7 +62,7 @@ public class SysOssController extends BaseController { * * @param ossIds OSS对象ID串 */ - @SaCheckPermission("system:oss:list") +// @SaCheckPermission("system:oss:list") @GetMapping("/listByIds/{ossIds}") public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 77b00475d..978e4667b 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -233,6 +233,8 @@ springdoc: packages-to-scan: com.ruoyi.web - group: 3.代码生成模块 packages-to-scan: com.ruoyi.generator + - group: 4.流程模块 + packages-to-scan: com.ruoyi.work # 防止XSS攻击 xss: diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java index fbabcd682..d951b4ee3 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java @@ -151,10 +151,10 @@ public class DemoUnitTest { ProcessVo processVo = new ProcessVo(); processVo.setProcessKey("apply_house"); processVo.setStep("1"); - BuyHouses buyHouses = buyHousesMapper.selectById("2"); + BuyHouses buyHouses = buyHousesMapper.selectById("1011"); Map map = BeanUtil.beanToMap(buyHouses); processVo.setParams(map); - processVo.setBusinessId("2"); + processVo.setBusinessId("1011"); processVo.setStartUser(buyHouses.getUserName()); WorkComplyUtils.comply(processVo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuyHouses.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuyHouses.java index 0054eed3c..4c7e35a9a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuyHouses.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuyHouses.java @@ -15,7 +15,7 @@ import java.util.Date; */ @Data @TableName("buy_houses") -public class BuyHouses { +public class BuyHouses { private static final long serialVersionUID=1L; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuyHousesVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuyHousesVo.java index b414933ce..d20cec048 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuyHousesVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuyHousesVo.java @@ -2,9 +2,12 @@ package com.ruoyi.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; +import com.ruoyi.system.domain.BuyHousesMember; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -217,6 +220,10 @@ public class BuyHousesVo { @ExcelProperty(value = "") private String workAddress; - public String processKey; + private String processKey; + + @TableField(exist = false) + private List buyHousesMemberList; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/HousesReviewVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/HousesReviewVo.java index e5ccd2edf..1c069cc3f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/HousesReviewVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/HousesReviewVo.java @@ -2,6 +2,7 @@ package com.ruoyi.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.system.domain.BuyHousesReviewMember; import lombok.Data; @@ -23,7 +24,7 @@ public class HousesReviewVo { /** * id */ -// @ExcelProperty(value = "id") + @ExcelProperty(value = "id") private Long id; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IHousesReviewService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IHousesReviewService.java index 02ad4a6aa..1631f6163 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IHousesReviewService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IHousesReviewService.java @@ -26,7 +26,7 @@ public interface IHousesReviewService { /** * 查询购房复审登记列表 */ - TableDataInfo queryPageList(HousesReviewBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(HousesReviewBo bo, PageQuery pageQuery); /** * 查询购房复审登记列表 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java index 2e2f81ed8..fb3f607eb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java @@ -8,9 +8,11 @@ import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.BuyHouses; +import com.ruoyi.system.domain.BuyHousesMember; import com.ruoyi.system.domain.bo.BuyHousesBo; import com.ruoyi.system.domain.vo.BuyHousesVo; import com.ruoyi.system.mapper.BuyHousesMapper; +import com.ruoyi.system.mapper.BuyHousesMemberMapper; import com.ruoyi.system.service.IBuyHousesService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -31,12 +33,19 @@ public class BuyHousesServiceImpl implements IBuyHousesService { private final BuyHousesMapper baseMapper; + private final BuyHousesMemberMapper buyHousesMemberMapper; + /** * 查询【请填写功能名称】 */ @Override public BuyHousesVo queryById(Long id){ - return baseMapper.selectVoById(id); + BuyHousesVo buyHousesVo = baseMapper.selectVoById(id); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(BuyHousesMember::getBuyHousesId, id); + List buyHousesMembers = buyHousesMemberMapper.selectList(queryWrapper); + buyHousesVo.setBuyHousesMemberList(buyHousesMembers); + return buyHousesVo; } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java index f2a960c92..2e8b21c5e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java @@ -73,9 +73,9 @@ public class HousesReviewServiceImpl implements IHousesReviewService { * 查询购房复审登记列表 */ @Override - public TableDataInfo queryPageList(HousesReviewBo bo, PageQuery pageQuery) { + public TableDataInfo queryPageList(HousesReviewBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } diff --git a/ruoyi-work/src/main/java/com/ruoyi/work/controller/ProcessController.java b/ruoyi-work/src/main/java/com/ruoyi/work/controller/ProcessController.java new file mode 100644 index 000000000..1da4f3f01 --- /dev/null +++ b/ruoyi-work/src/main/java/com/ruoyi/work/controller/ProcessController.java @@ -0,0 +1,107 @@ +package com.ruoyi.work.controller; + +import java.util.List; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; + +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.work.domain.bo.ProcessBo; +import com.ruoyi.work.domain.vo.ProcessVo; +import com.ruoyi.work.service.IProcessService; +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; + +/** + * 流程 + * + * @author ruoyi + * @date 2023-03-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/process") +public class ProcessController extends BaseController { + + private final IProcessService iProcessService; + + /** + * 查询流程列表 + */ + @SaCheckPermission("system:process:list") + @GetMapping("/list") + public TableDataInfo list(ProcessBo bo, PageQuery pageQuery) { + return iProcessService.queryPageList(bo, pageQuery); + } + + /** + * 导出流程列表 + */ + @SaCheckPermission("system:process:export") + @Log(title = "流程", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProcessBo bo, HttpServletResponse response) { + List list = iProcessService.queryList(bo); + ExcelUtil.exportExcel(list, "流程", ProcessVo.class, response); + } + + /** + * 获取流程详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:process:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(iProcessService.queryById(id)); + } + + /** + * 新增流程 + */ + @SaCheckPermission("system:process:add") + @Log(title = "流程", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProcessBo bo) { + return toAjax(iProcessService.insertByBo(bo)); + } + + /** + * 修改流程 + */ + @SaCheckPermission("system:process:edit") + @Log(title = "流程", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProcessBo bo) { + return toAjax(iProcessService.updateByBo(bo)); + } + + /** + * 删除流程 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:process:remove") + @Log(title = "流程", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iProcessService.deleteWithValidByIds(Arrays.asList(ids), true)); + } +} diff --git a/ruoyi-work/src/main/java/com/ruoyi/work/controller/WorkController.java b/ruoyi-work/src/main/java/com/ruoyi/work/controller/WorkController.java index 826c9351b..65e49b695 100644 --- a/ruoyi-work/src/main/java/com/ruoyi/work/controller/WorkController.java +++ b/ruoyi-work/src/main/java/com/ruoyi/work/controller/WorkController.java @@ -1,6 +1,6 @@ package com.ruoyi.work.controller; - import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.Constants; @@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import java.util.List; import java.util.Map; @@ -97,6 +96,8 @@ public class WorkController extends BaseController { WorkComplyUtils.getStep(businessDTO); } + + /** * 流程办理 */ @@ -104,6 +105,15 @@ public class WorkController extends BaseController { @SaCheckPermission("work:task:batchDeleted") @PostMapping("/batchDeleted") public R batchDeleted(@RequestBody HisProcess hisProcess){ + if (ObjectUtil.isNull(hisProcess.getStatus())){ + return R.fail("状态不可为空"); + } + if (ObjectUtil.isNull(hisProcess.getProcessKey())){ + return R.fail("流程key不可为空"); + } + if (ObjectUtil.isNull(hisProcess.getBusinessId())){ + return R.fail("业务id不可为空"); + } LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .eq(TProcess::getProcessKey, hisProcess.getProcessKey()); List tProcesses = processMapper.selectList(wrapper); diff --git a/ruoyi-work/src/main/java/com/ruoyi/work/domain/HisProcess.java b/ruoyi-work/src/main/java/com/ruoyi/work/domain/HisProcess.java index 8cdca2431..57ab5773e 100644 --- a/ruoyi-work/src/main/java/com/ruoyi/work/domain/HisProcess.java +++ b/ruoyi-work/src/main/java/com/ruoyi/work/domain/HisProcess.java @@ -87,6 +87,9 @@ public class HisProcess{ @TableField(exist = false) private String name; + @TableField(exist = false) + private String bean; + } diff --git a/ruoyi-work/src/main/java/com/ruoyi/work/domain/vo/HisProcessVo.java b/ruoyi-work/src/main/java/com/ruoyi/work/domain/vo/HisProcessVo.java index 457e5e99e..63cfccef6 100644 --- a/ruoyi-work/src/main/java/com/ruoyi/work/domain/vo/HisProcessVo.java +++ b/ruoyi-work/src/main/java/com/ruoyi/work/domain/vo/HisProcessVo.java @@ -73,6 +73,8 @@ public class HisProcessVo { private String startUser; + @TableField(exist = false) + private String bean; } diff --git a/ruoyi-work/src/main/java/com/ruoyi/work/utils/WorkComplyUtils.java b/ruoyi-work/src/main/java/com/ruoyi/work/utils/WorkComplyUtils.java index cd030033e..0f10d1f83 100644 --- a/ruoyi-work/src/main/java/com/ruoyi/work/utils/WorkComplyUtils.java +++ b/ruoyi-work/src/main/java/com/ruoyi/work/utils/WorkComplyUtils.java @@ -687,18 +687,23 @@ public class WorkComplyUtils { if (auditLogs.size()>0) { List collect = auditLogs.stream().filter(a -> e.getStep().equals(a.getStep()) && e.getAudit().equals(a.getAudit())).collect(Collectors.toList()); collect.forEach(a -> { - switch (a.getStatus()) { - case "1": - a.setStatus("审核失败"); - break; - case "2": - a.setStatus("审核成功"); - break; - default: - a.setStatus("未知状态"); - break; - } }); + if (ObjectUtil.isNotNull(a.getStatus())) { + switch (a.getStatus()) { + case "1": + a.setStatus("审核失败"); + break; + case "2": + a.setStatus("审核成功"); + break; + default: + a.setStatus("未知状态"); + break; + } + } + }); e.setAuditLogList(collect); + }else { + e.setAuditLogList(new ArrayList<>()); } if("4".equals(e.getCheckType())){//企业审核 Map params = e.getParams(); diff --git a/ruoyi-work/src/main/resources/mapper/work/ActProcessMapper.xml b/ruoyi-work/src/main/resources/mapper/work/ActProcessMapper.xml index bdb1c013b..5818cab10 100644 --- a/ruoyi-work/src/main/resources/mapper/work/ActProcessMapper.xml +++ b/ruoyi-work/src/main/resources/mapper/work/ActProcessMapper.xml @@ -50,6 +50,9 @@ (SELECT id FROM `process` WHERE FIND_IN_SET(#{actProcess.userId},cc)) GROUP BY business_id ) AS a INNER JOIN process p ON p.id = a.process_id + + and a.start_user like concat('%', #{actProcess.startUser}, '%') + ORDER BY a.create_time SELECT p.`name` ,process_key AS processKey,d.audit,d.check_type AS checkType ,d.type,p.bean,d.`status`,d.create_time AS createTime,d.end_time AS endTime , d.business_id AS businessId,d.start_user AS startUser,p.cc,p.description,d.step @@ -30,7 +27,8 @@ FROM `his_process` h WHERE h.id IN (SELECT MAX(id) FROM his_process - where ((audit = #{hisProcess.userId} AND check_type= 1) + where ( + (audit = #{hisProcess.userId} AND check_type= 1) OR (check_type = 2 AND audit =#{hisProcess.deptId}) OR @@ -41,7 +39,7 @@ GROUP BY business_id) ) d INNER JOIN process p ON p.id = d.process_id - and d.start_user= #{hisProcess.startUser} + and d.start_user like concat('%', #{hisProcess.startUser}, '%') ORDER BY d.end_time DESC