diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java index 5932d35c..113cbada 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.espermissionapply.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -9,6 +10,8 @@ import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPer import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -25,7 +28,7 @@ import java.util.List; import java.util.Map; - /** +/** * @Description: 权限申请流程业务表 * @Author: jero-boot * @Date: 2023-11-29 @@ -36,28 +39,32 @@ import java.util.Map; @RequestMapping("/espermissionapply/processEsPermissionApply") @Slf4j public class ProcessEsPermissionApplyController extends JeroController { - @Autowired - private IProcessEsPermissionApplyService processEsPermissionApplyService; + @Autowired + private IProcessEsPermissionApplyService processEsPermissionApplyService; + @Autowired + private EnterpriseStandardAuthUserService enterpriseStandardAuthUserService; + @Autowired + private ILawsEnterpriseStandardService lawsEnterpriseStandardService; - /** - * 分页列表查询 - * - * @param processEsPermissionApply - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "权限申请流程业务表-分页列表查询") - @ApiOperation(value="权限申请流程业务表-分页列表查询", notes="权限申请流程业务表-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessEsPermissionApply processEsPermissionApply, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = processEsPermissionApplyService.queryPage(processEsPermissionApply, pageNo, pageSize, req); - return Result.OK(pageList); - } + /** + * 分页列表查询 + * + * @param processEsPermissionApply + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "权限申请流程业务表-分页列表查询") + @ApiOperation(value="权限申请流程业务表-分页列表查询", notes="权限申请流程业务表-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(ProcessEsPermissionApply processEsPermissionApply, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = processEsPermissionApplyService.queryPage(processEsPermissionApply, pageNo, pageSize, req); + return Result.OK(pageList); + } /** * 企标分页列表查询 @@ -91,84 +98,97 @@ public class ProcessEsPermissionApplyController extends JeroController add(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) { - processEsPermissionApplyService.add(processEsPermissionApply); - return Result.OK("操作成功!"); - } + /** + * 添加 + * + * @param jsonObject + * @return + */ + @AutoLog(value = "权限申请流程业务表-权限校验") + @ApiOperation(value="权限申请流程业务表-权限校验", notes="权限申请流程业务表-权限校验") + @PostMapping(value = "/permissionCheck") + public Result permissionCheck(@Validated @RequestBody JSONObject jsonObject) { + return processEsPermissionApplyService.permissionCheck(jsonObject); + } - /** - * 编辑 - * - * @param processEsPermissionApply - * @return - */ - @AutoLog(value = "权限申请流程业务表-编辑") - @ApiOperation(value="权限申请流程业务表-编辑", notes="权限申请流程业务表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) { - processEsPermissionApplyService.editById(processEsPermissionApply); - return Result.OK("操作成功!"); - } + /** + * 添加 + * + * @param processEsPermissionApply + * @return + */ + @AutoLog(value = "权限申请流程业务表-添加") + @ApiOperation(value="权限申请流程业务表-添加", notes="权限申请流程业务表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) { + processEsPermissionApplyService.add(processEsPermissionApply); + return Result.OK("操作成功!"); + } - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "权限申请流程业务表-通过id删除") - @ApiOperation(value="权限申请流程业务表-通过id删除", notes="权限申请流程业务表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + /** + * 编辑 + * + * @param processEsPermissionApply + * @return + */ + @AutoLog(value = "权限申请流程业务表-编辑") + @ApiOperation(value="权限申请流程业务表-编辑", notes="权限申请流程业务表-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) { + processEsPermissionApplyService.editById(processEsPermissionApply); + return Result.OK("操作成功!"); + } + + /** + * 通过id删除 + * + * @param map + * @return + */ + @AutoLog(value = "权限申请流程业务表-通过id删除") + @ApiOperation(value="权限申请流程业务表-通过id删除", notes="权限申请流程业务表-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ return Result.error("请选择数据!"); } - processEsPermissionApplyService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } + processEsPermissionApplyService.deleteById(map.get("id")); + return Result.OK("删除成功!"); + } - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "权限申请流程业务表-批量删除") - @ApiOperation(value="权限申请流程业务表-批量删除", notes="权限申请流程业务表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { + /** + * 批量删除 + * + * @param map + * @return + */ + @AutoLog(value = "权限申请流程业务表-批量删除") + @ApiOperation(value="权限申请流程业务表-批量删除", notes="权限申请流程业务表-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ return Result.error("请选择数据!"); } - this.processEsPermissionApplyService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } + this.processEsPermissionApplyService.deleteByIds(Arrays.asList(map.get("ids").split(","))); + return Result.OK("批量删除成功!"); + } - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "权限申请流程业务表-通过id查询") - @ApiOperation(value="权限申请流程业务表-通过id查询", notes="权限申请流程业务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ProcessEsPermissionApply processEsPermissionApply = processEsPermissionApplyService.queryById(id); - if(processEsPermissionApply==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processEsPermissionApply); - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "权限申请流程业务表-通过id查询") + @ApiOperation(value="权限申请流程业务表-通过id查询", notes="权限申请流程业务表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProcessEsPermissionApply processEsPermissionApply = processEsPermissionApplyService.queryById(id); + if(processEsPermissionApply==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(processEsPermissionApply); + } /** * 通过项目id查询 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java index 08fd0c92..d96f9c5e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java @@ -1,11 +1,14 @@ package com.jero.modules.activiti.process.espermissionapply.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.common.api.vo.Result; import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; +import org.apache.poi.ss.formula.functions.T; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -93,4 +96,11 @@ public interface IProcessEsPermissionApplyService extends IService queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize); + + /** + * 权限申请流程业务表-权限校验 + * @param jsonObject + * @return + */ + Result permissionCheck(JSONObject jsonObject); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java index 3e27afdc..f657e50c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java @@ -1,13 +1,17 @@ package com.jero.modules.activiti.process.espermissionapply.service.impl; +import com.alibaba.fastjson.JSONObject; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.MessageUtils; import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; import com.jero.modules.activiti.process.espermissionapply.mapper.ProcessEsPermissionApplyMapper; import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; @@ -19,6 +23,7 @@ import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -203,4 +208,23 @@ public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl permissionCheck(JSONObject jsonObject) { + String ids = String.valueOf(jsonObject.get("ids")); + List list = Arrays.asList(ids.split(",")); + List lawsEnterpriseStandardList = lawsEnterpriseStandardService.listByIds(list); + List standardNameList = new ArrayList<>(); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + for (LawsEnterpriseStandard lawsEnterpriseStandard : lawsEnterpriseStandardList) { + boolean b = enterpriseStandardAuthUserService.hasESAuth(loginUser.getId(), Collections.singletonList(lawsEnterpriseStandard.getId())); + if (b){ + standardNameList.add(lawsEnterpriseStandard.getStandardName()); + } + } + if (!standardNameList.isEmpty()){ + return Result.error("企标编号为：" + String.join(",", standardNameList) + "已拥有权限，请重新选择没有权限的企标!"); + } + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } }