From 1a565c19f25988bc5c2ed157dc714a6ad7064c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 11 Oct 2021 12:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCompanyManagementController.java | 519 +++++++++--------- 1 file changed, 266 insertions(+), 253 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index c3fe8f74..28d364b5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -49,7 +49,7 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - /** +/** * @Description: 企业管理 * @Author: jeecg-boot * @Date: 2021-08-25 @@ -71,7 +71,7 @@ public class PayCompanyManagementController extends JeroController queryPageListMeeting(PayCompanyManagement payCompanyManagement, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){ - return Result.error("企业名称长度不能大于50个字符！"); - } - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = payCompanyManagementService.page(page, queryWrapper); - List listPayCompanyManagement = pageList.getRecords(); - if(!CollectionUtils.isEmpty(listPayCompanyManagement)){ - try { - listPayCompanyManagement.forEach(p->{ - if (!StringUtils.isBlank(p.getCompanyPhone())){ - p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone())); - } - }); - pageList.setRecords(listPayCompanyManagement); - }catch (Exception e){ - log.error("公司电话解密异常！",e); - } - } - return Result.OK(pageList); - } + /** + * 分页列表查询 - 会议对外开放接口 + * (管理端查询dataSource = 1的数据；报名查询全部的数据) + * @param payCompanyManagement 企业管理 + * @param pageNo 页数 + * @param pageSize 条数 + * @param req + * @return + */ + @ApiOperation(value="企业管理-分页列表查询-会议对外开放接口", notes="企业管理-分页列表查询-会议对外开放接口") + @GetMapping(value = "/listMeeting") + public Result queryPageListMeeting(PayCompanyManagement payCompanyManagement, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){ + return Result.error("企业名称长度不能大于50个字符！"); + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payCompanyManagementService.page(page, queryWrapper); + List listPayCompanyManagement = pageList.getRecords(); + if(!CollectionUtils.isEmpty(listPayCompanyManagement)){ + try { + listPayCompanyManagement.forEach(p->{ + if (!StringUtils.isBlank(p.getCompanyPhone())){ + p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone())); + } + }); + pageList.setRecords(listPayCompanyManagement); + }catch (Exception e){ + log.error("公司电话解密异常！",e); + } + } + return Result.OK(pageList); + } - /** - * 添加-会议对外开放接口 - * - * @param payCompanyManagement 企业管理 - * @return - */ - @AutoLog(value = "企业管理-添加",operateType = 2) - @ApiOperation(value="企业管理-添加-会议对外开放接口", notes="企业管理-添加-会议对外开放接口") - @PostMapping(value = "/addMeeting") - public Result addMeeting(@RequestBody PayCompanyManagement payCompanyManagement) { - StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); - if(!StringUtils.isBlank(msg)){ - return Result.error(msg.toString()); - } - try { - // 新增企业前在次校验企业名称是否存在 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); - PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); - // 存在数据 - if(!Objects.isNull(payCompanyManagementNew)){ - return Result.error("该企业名称已存在！"); - } - }catch (Exception e){ - log.info("企业管理-添加异常",e); - return Result.error("该企业名称已存在！"); - } - try { - // 新增企业前在次校验信用代码是否存在 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCompanyManagement::getDutyCode,payCompanyManagement.getDutyCode()); - PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); - // 存在数据 - if(!Objects.isNull(payCompanyManagementNew)){ - return Result.error("该信用代码已存在！"); - } - }catch (Exception e){ - log.info("企业管理-添加异常",e); - return Result.error("该信用代码已存在！"); - } - if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ - try { - payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); - }catch (Exception e){ - log.error("公司电话加密异常！",e); - } - } - payCompanyManagement.setDataSource(PayCompanyManagementCommon.DATA_SOURCE2); - payCompanyManagement.setStatus(PayCompanyManagementCommon.STATUS2); - payCompanyManagementService.save(payCompanyManagement); + /** + * 添加-会议对外开放接口 + * + * @param payCompanyManagement 企业管理 + * @return + */ + @AutoLog(value = "企业管理-添加",operateType = 2) + @ApiOperation(value="企业管理-添加-会议对外开放接口", notes="企业管理-添加-会议对外开放接口") + @PostMapping(value = "/addMeeting") + public Result addMeeting(@RequestBody PayCompanyManagement payCompanyManagement) { + StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); + if(!StringUtils.isBlank(msg)){ + return Result.error(msg.toString()); + } + try { + // 新增企业前在次校验企业名称是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); + PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); + // 存在数据 + if(!Objects.isNull(payCompanyManagementNew)){ + return Result.error("该企业名称已存在！"); + } + }catch (Exception e){ + log.info("企业管理-添加异常",e); + return Result.error("该企业名称已存在！"); + } + try { + // 新增企业前在次校验信用代码是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getDutyCode,payCompanyManagement.getDutyCode()); + PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); + // 存在数据 + if(!Objects.isNull(payCompanyManagementNew)){ + return Result.error("该信用代码已存在！"); + } + }catch (Exception e){ + log.info("企业管理-添加异常",e); + return Result.error("该信用代码已存在！"); + } + if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ + try { + payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); + }catch (Exception e){ + log.error("公司电话加密异常！",e); + } + } + payCompanyManagement.setDataSource(PayCompanyManagementCommon.DATA_SOURCE2); + payCompanyManagement.setStatus(PayCompanyManagementCommon.STATUS2); + payCompanyManagementService.save(payCompanyManagement); // 获取项目负责人，发送消息 - List list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY)); - if(!CollectionUtils.isEmpty(list)){ - list.forEach(item->{ - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(item.getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail())); - } - HashMap map = new HashMap<>(); - sendMessageDTO.setFromUser("admin"); - sendMessageDTO.setToUser(item.getUsername()); - sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG9.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("M_OPEN_TYPE9"); - sendMessageService.SendMessageService(sendMessageDTO); - }); - } - return Result.OK("添加成功！",payCompanyManagement); - } - + List list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY)); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(item->{ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(item.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail())); + } + if(!StringUtils.isEmpty(item.getPhone())){ + sendMessageDTO.setPhone(PasswordUtil.decrypt(item.getPhone())); + } + HashMap map = new HashMap<>(); + sendMessageDTO.setFromUser("admin"); + sendMessageDTO.setToUser(item.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG9.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE9"); + sendMessageService.SendMessageService(sendMessageDTO); + }); + } + return Result.OK("添加成功！",payCompanyManagement); + } + /** * 添加 * @@ -238,7 +244,7 @@ public class PayCompanyManagementController extends JeroController map = new HashMap<>(); sendMessageDTO.setFromUser(sysUser.getUsername()); sendMessageDTO.setToUser(item.getUsername()); @@ -301,60 +310,60 @@ public class PayCompanyManagementController extends JeroController companyEdit(@RequestBody PayCompanyManagement payCompanyManagement) { - StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); - if(!StringUtils.isBlank(msg)){ - return Result.error(msg.toString()); - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - int status = PayCompanyManagementCommon.STATUS2; - // 只有财务人员操作不需要重新审核，其他人都需要审核 - if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){ - status = PayCompanyManagementCommon.STATUS1; - } - payCompanyManagement.setStatus(status); - PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId()); - if(Objects.isNull(payCompanyManagementOld)){ - return Result.error("企业不存在!"); - } - if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){ - return Result.error("企业名称不可修改!"); - } - payCompanyManagement.setStatus(payCompanyManagementOld.getStatus()); - payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource()); - try { - // 编辑保存企业前再次校验企业名称是否存在 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); - PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); - // 企业名称存在，并且编辑id与查询不同，则校验不通过 - if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) { - return Result.error("企业名称已存在！"); - } - }catch (Exception e){ - log.info("企业管理-编辑异常",e); - return Result.error("企业名称已存在！"); - } - if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ - try { - payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); - }catch (Exception e){ - log.error("公司电话加密异常！",e); - } - } - payCompanyManagementService.updateById(payCompanyManagement); - return Result.OK("编辑成功!"); - } - + /** + * 企业端-编辑 + * + * @param payCompanyManagement 企业管理 + * @return + */ + @AutoLog(value = "企业管理-修改",operateType = 3) + @ApiOperation(value="企业管理-企业端-编辑", notes="企业管理-企业端-编辑") + @PostMapping(value = "/companyEdit") + public Result companyEdit(@RequestBody PayCompanyManagement payCompanyManagement) { + StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); + if(!StringUtils.isBlank(msg)){ + return Result.error(msg.toString()); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + int status = PayCompanyManagementCommon.STATUS2; + // 只有财务人员操作不需要重新审核，其他人都需要审核 + if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){ + status = PayCompanyManagementCommon.STATUS1; + } + payCompanyManagement.setStatus(status); + PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId()); + if(Objects.isNull(payCompanyManagementOld)){ + return Result.error("企业不存在!"); + } + if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){ + return Result.error("企业名称不可修改!"); + } + payCompanyManagement.setStatus(payCompanyManagementOld.getStatus()); + payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource()); + try { + // 编辑保存企业前再次校验企业名称是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); + PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); + // 企业名称存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) { + return Result.error("企业名称已存在！"); + } + }catch (Exception e){ + log.info("企业管理-编辑异常",e); + return Result.error("企业名称已存在！"); + } + if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ + try { + payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); + }catch (Exception e){ + log.error("公司电话加密异常！",e); + } + } + payCompanyManagementService.updateById(payCompanyManagement); + return Result.OK("编辑成功!"); + } + /** * 编辑 * @@ -373,7 +382,7 @@ public class PayCompanyManagementController extends JeroController audit(@RequestParam(name="id") String id) { - if(StringUtils.isBlank(id)){ - return Result.error("id不能为空!"); - } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - LambdaUpdateWrapper updatePayCompanyManagement = new LambdaUpdateWrapper<>(); - updatePayCompanyManagement.eq(PayCompanyManagement::getId,id); - updatePayCompanyManagement.set(PayCompanyManagement::getStatus,PayCompanyManagementCommon.STATUS1); - updatePayCompanyManagement.set(PayCompanyManagement::getUpdateBy,sysUser.getUsername()); - updatePayCompanyManagement.set(PayCompanyManagement::getUpdateTime,new Date()); - payCompanyManagementService.update(updatePayCompanyManagement); - return Result.OK("确认成功!"); - } + /** + * 确认 + * + * @param id 企业管理id + * @return + */ + @AutoLog(value = "企业管理-确认",operateType = 3) + @RequiresPermissions("company:confirm") + @ApiOperation(value="企业管理-确认", notes="企业管理-确认") + @GetMapping(value = "/audit") + public Result audit(@RequestParam(name="id") String id) { + if(StringUtils.isBlank(id)){ + return Result.error("id不能为空!"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaUpdateWrapper updatePayCompanyManagement = new LambdaUpdateWrapper<>(); + updatePayCompanyManagement.eq(PayCompanyManagement::getId,id); + updatePayCompanyManagement.set(PayCompanyManagement::getStatus,PayCompanyManagementCommon.STATUS1); + updatePayCompanyManagement.set(PayCompanyManagement::getUpdateBy,sysUser.getUsername()); + updatePayCompanyManagement.set(PayCompanyManagement::getUpdateTime,new Date()); + payCompanyManagementService.update(updatePayCompanyManagement); + return Result.OK("确认成功!"); + } /** * 通过id删除 * @@ -442,7 +451,7 @@ public class PayCompanyManagementController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)) { + return Result.error("非财务人员不可操作!"); + } if(StringUtils.isBlank(ids)){ return Result.error("id不能为空!"); } @@ -468,42 +481,42 @@ public class PayCompanyManagementController extends JeroController queryByDutyCode(@RequestParam(name="dutyCode") String dutyCode) { - if(StringUtils.isBlank(dutyCode)){ - return Result.error("信用代码不能为空！"); - }else{ - if(dutyCode.length() > 50){ - return Result.error("信用代码长度应小于50字符！"); - } - } - try { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCompanyManagement::getDutyCode,dutyCode); - PayCompanyManagement payCompanyManagement = payCompanyManagementService.getOne(queryWrapper); - if(Objects.isNull(payCompanyManagement)) { - return Result.OK("没有该信用代码！"); - } - }catch (Exception e){ - log.info("企业管理-通过信用代码查询",e); - return Result.error("该信用代码已存在！"); - } - return Result.error("该信用代码已存在！"); - } + /** + * 通过信用代码查询 + * + * @param dutyCode 信用代码 + * @return + */ + @ApiOperation(value="企业管理-通过信用代码查询", notes="企业管理-通过信用代码查询") + @GetMapping(value = "/queryByDutyCode") + public Result queryByDutyCode(@RequestParam(name="dutyCode") String dutyCode) { + if(StringUtils.isBlank(dutyCode)){ + return Result.error("信用代码不能为空！"); + }else{ + if(dutyCode.length() > 50){ + return Result.error("信用代码长度应小于50字符！"); + } + } + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCompanyManagement::getDutyCode,dutyCode); + PayCompanyManagement payCompanyManagement = payCompanyManagementService.getOne(queryWrapper); + if(Objects.isNull(payCompanyManagement)) { + return Result.OK("没有该信用代码！"); + } + }catch (Exception e){ + log.info("企业管理-通过信用代码查询",e); + return Result.error("该信用代码已存在！"); + } + return Result.error("该信用代码已存在！"); + } /** - * 通过企业名称查询 - * - * @param companyName 企业名称 - * @return - */ + * 通过企业名称查询 + * + * @param companyName 企业名称 + * @return + */ @ApiOperation(value="企业管理-通过企业名称查询", notes="企业管理-通过企业名称查询") @GetMapping(value = "/queryByCompanyName") public Result queryByCompanyName(@RequestParam(name="companyName") String companyName) { @@ -527,7 +540,7 @@ public class PayCompanyManagementController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, request.getParameterMap()); @@ -588,36 +601,36 @@ public class PayCompanyManagementController extends JeroController importExcel(HttpServletRequest request) { + @PostMapping(value = "/importExcel") + public Result importExcel(HttpServletRequest request) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 查看角色是否为财务人员 int dataSource = PayCompanyManagementCommon.DATA_SOURCE2; int status = PayCompanyManagementCommon.STATUS2; - if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){ + if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){ dataSource = PayCompanyManagementCommon.DATA_SOURCE1; status = PayCompanyManagementCommon.STATUS1; } @@ -707,5 +720,5 @@ public class PayCompanyManagementController extends JeroController