From d2253a52bbfa257921a49a5a04ba4c2da2309276 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 26 Jun 2023 16:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDiscountpackageGetVehQuery.java | 13 +++++ .../BaseBrandletpricepowimitService.java | 7 ++- .../biz/basevehicle/BaseVehicleService.java | 12 +++++ .../FinBillApplicationQuery.java | 1 + ...inUncollectedReceivablesDetailedQuery.java | 7 +-- .../FinBillApplicationService.java | 3 +- ...UncollectedReceivablesDetailedService.java | 50 ++++++++++++++++++- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../api/sysmenurole/SysMenuRoleDataDto.java | 30 +++++++++++ .../api/sysmenurole/SysMenuRoleDataQuery.java | 32 ++++++++++++ .../api/sysmenurole/SysMenuRoleDataVo.java | 32 ++++++++++++ .../api/sysmenurole/SysMenuRoleDto.java | 1 - .../api/sysmenurole/SysMenuRoleFeign.java | 8 +++ .../sysmenurole/SysMenuRoleFeignFallback.java | 10 ++++ .../biz/sysfunction/SysFunctionService.java | 14 +++--- .../biz/sysmenurole/SysMenuRoleMapper.java | 11 ++-- .../biz/sysmenurole/SysMenuRoleMapper.xml | 48 ++++++++++++------ .../biz/sysmenurole/SysMenuRoleRest.java | 10 ++++ .../biz/sysmenurole/SysMenuRoleService.java | 22 ++++++++ .../invoiced/BillApplicationPageQuery.java | 2 + ...nUncollectedReceivablesDetailedsQuery.java | 6 ++- .../autoservice/invoiced/InvoicedService.java | 1 + 22 files changed, 286 insertions(+), 36 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataDto.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataQuery.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java index 5538929703..fc42999f7f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java @@ -66,4 +66,17 @@ public class BaseDiscountpackageGetVehQuery implements Query { @ApiModelProperty(value = "orgSid") private String orgSid; + + @ApiModelProperty(value = "厂家入库开始日期") + private String priceStartDate; + @ApiModelProperty(value = "厂家入库结束日期") + private String priceEndDate; + @ApiModelProperty(value = "公司入库开始日期") + private String orgPriceStartDate; + @ApiModelProperty(value = "公司入库结束日期") + private String orgPriceEndDate; + @ApiModelProperty(value = "买断开始日期") + private String solidStartDate; + @ApiModelProperty(value = "买断结束日期") + private String solidEndDate; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java index 9f1b717a77..215ea7be82 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java @@ -123,7 +123,12 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService= date_format('" + params.getPriceStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(params.getPriceEndDate()), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + params.getPriceEndDate() + "','%Y-%m-%d')" + ); + //公司入库日期 + qw.apply(StringUtils.isNotBlank(params.getOrgPriceStartDate()), "date_format (bv.orgPriceDate,'%Y-%m-%d') >= date_format('" + params.getOrgPriceStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(params.getOrgPriceEndDate()), "date_format (bv.orgPriceDate,'%Y-%m-%d') <= date_format('" + params.getOrgPriceEndDate() + "','%Y-%m-%d')" + ); + //买断日期 + qw.apply(StringUtils.isNotBlank(params.getSolidStartDate()), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + params.getSolidStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(params.getSolidEndDate()), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + params.getSolidEndDate() + "','%Y-%m-%d')" + ); qw.eq("bv.isDelete", 0); qw.eq("bv.createOrgSid", params.getOrgSid()); qw.like("bvb.useOrg", params.getOrgSid()); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java index 82d1ed1e97..f81b976811 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java @@ -88,4 +88,5 @@ public class FinBillApplicationQuery implements Query { private String name; private String menuUrl; + private String menuSid; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedQuery.java index 81bfc7fcca..f11a5efade 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedQuery.java @@ -9,11 +9,12 @@ public class AppFinUncollectedReceivablesDetailedQuery implements Query { @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("客户名称") private String name; - @ApiModelProperty("分公司sid") private String useOrgSid; - + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index fc8ea17d0b..9af7d8050c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -261,11 +261,12 @@ public class FinBillApplicationService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); if(StringUtils.isNotBlank(defaultIdReltBean.getData())){ diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 53eec9d055..7a06468ead 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -539,7 +539,55 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService if (StringUtils.isNotBlank(useOrgSid)) { pq.getParams().setUseOrgSid(useOrgSid); } - QueryWrapper qw = appCreateQueryWrapper(pq.getParams()); + QueryWrapper qw = new QueryWrapper<>(); + AppFinUncollectedReceivablesDetailedQuery query = pq.getParams(); + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(query.getMenuSid())){ + //授权 + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + orgPath = orgPath + "/"; + int i1 = orgPath.indexOf("/"); + int i2 = orgPath.indexOf("/", i1 + 1); + int i3 = orgPath.indexOf("/", i2 + 1); + int i4 = orgPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i1); + qw.like("orgSidPath", orgPath); + } else if ("2".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i2); + qw.like("orgSidPath", orgPath); + } else if ("3".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i3); + qw.like("orgSidPath", orgPath); + } else if ("4".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i4); + qw.like("orgSidPath", orgPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + }else { + qw.eq("useOrgSid", query.getUseOrgSid()); + } + if (StringUtils.isNotBlank(query.getName())) { + qw.like("contractName", query.getName()); + } + if (StringUtils.isNotBlank(query.getName())) { + qw.like("contractNo", query.getName()); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.getCustomerBillList(page, qw); for (AppCustomerBillSummaryDetailsVo record : pagging.getRecords()) { diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 0ce5b43c53..cf20e862b3 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -29,7 +29,7 @@ public enum ProcDefEnum { FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"), //RECORDAPPLICATION("入库申请", "process_xbwq2c7p:4:1232504"), RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"), - SCMVEHICLERETURN("采购退库", "process_入库申请md8aeoap:2:722508"), + SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"), SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), SALESORDER("销售订单审批流程", "process_p5ils2rn:10:1250008"), BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"), diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataDto.java new file mode 100644 index 0000000000..d416effb7c --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataDto.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.portal.api.sysmenurole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleDto.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto
+ * Description: 菜单与角色关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象") +@Data +public class SysMenuRoleDataDto implements Dto { + + @ApiModelProperty("菜单与角色关联表sid") + private String sid; + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataQuery.java new file mode 100644 index 0000000000..b3b6035d53 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataQuery.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.sysmenurole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery
+ * Description: 菜单与角色关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件") +@Data +public class SysMenuRoleDataQuery implements Query { + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("菜单名称") + private String menuName; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataVo.java new file mode 100644 index 0000000000..cad7efc671 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDataVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.sysmenurole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo
+ * Description: 菜单与角色关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象") +@Data +public class SysMenuRoleDataVo implements Vo { + + @ApiModelProperty("菜单与角色关联表sid") + private String sid; + @ApiModelProperty("菜单名称") + private String name; + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java index e5be54b5a2..a334394c1a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java @@ -26,7 +26,6 @@ public class SysMenuRoleDto implements Dto { @ApiModelProperty("菜单sid") private String menuSid; - @ApiModelProperty("角色sid") private String roleSid; } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java index 3604ee1fc6..a0cce20f6d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java @@ -39,6 +39,14 @@ public interface SysMenuRoleFeign { @PostMapping("/listAll") public ResultBean> listAll(@RequestBody SysMenuRoleQuery query); + @ApiOperation("根据角色查询授权的菜单列表") + @PostMapping("/selMenuByRole") + public ResultBean> selMenuByRole(@RequestBody SysMenuRoleDataQuery query); + + @ApiOperation("修改角色菜单的数据权限") + @PostMapping("/updateDataByRoleMenu") + public ResultBean updateDataByRoleMenu(@RequestBody List dtos); + @ApiOperation("所有数据列表") @GetMapping("/list") public ResultBean> list(); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java index f7751fb43e..af26e062c0 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java @@ -35,6 +35,16 @@ public class SysMenuRoleFeignFallback implements SysMenuRoleFeign { return rb.setMsg("接口anrui_portal/sysmenurole/listAll无法访问"); } + @Override + public ResultBean> selMenuByRole(SysMenuRoleDataQuery query) { + return null; + } + + @Override + public ResultBean updateDataByRoleMenu(List dtos) { + return null; + } + @Override public ResultBean> list(){ ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java index 61a4366e24..44e41ea656 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java @@ -272,16 +272,16 @@ public class SysFunctionService extends MybatisBaseService> lmenus = baseMapper.getMenuAuthorization(sid); lmenus.forEach(ff -> { Map map = new HashMap<>(); - map.put("name", ff.get("name")); - String sids = ff.get("sid").toString(); - map.put("sid", sids); - map.put("checked", "1"); - map.put("children", new ArrayList<>()); if (ff.get("pageUrl") != null && com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())) { String pageUrl = ff.get("pageUrl").toString(); List> lfuncs = baseMapper.getFunctionAuthorization(pageUrl); List> functionByRoleSid = baseMapper.getFunctionByRoleSid(pageUrl, roleSid); if (lfuncs.size() > 0){ + map.put("name", ff.get("name")); + String sids = ff.get("sid").toString(); + map.put("sid", sids); + map.put("checked", "1"); + map.put("children", new ArrayList<>()); for (Map lfunc : lfuncs) { for (Map funByRole : functionByRoleSid) { if (lfunc.get("sid").equals(funByRole.get("sid"))) { @@ -290,10 +290,10 @@ public class SysFunctionService extends MybatisBaseService()); } + map.put("children", lfuncs); + list2.add(map); } - map.put("children", lfuncs); } - list2.add(map); }); f.put("children", list2); }); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.java index 740e914edd..00fac27641 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.java @@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.portal.api.sysmenurole.MenuRoleVo; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDataVo; +import org.apache.ibatis.annotations.*; import com.yxt.anrui.portal.api.sysmenurole.SysMenuRole; import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo; @@ -47,4 +45,9 @@ public interface SysMenuRoleMapper extends BaseMapper { List list(@Param(Constants.WRAPPER) QueryWrapper qw); List selectByRoleSid(String roleSid); + + List selMenuByRole(@Param(Constants.WRAPPER) QueryWrapper qw); + + @Update("update sys_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}") + void updateDataByRoleMenu(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml index 2fd332f953..5fda000c5b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml @@ -1,19 +1,25 @@ - - - - - - + SELECT * FROM sys_menu_role + + ${ew.sqlSegment} + + + + + - + select menuSid, dataRuleId + from sys_menu_role + where roleSid = #{roleSid} + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleRest.java index ac2b9ce385..d2541a838e 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleRest.java @@ -53,6 +53,16 @@ public class SysMenuRoleRest implements SysMenuRoleFeign { return rb.success().setData(list); } + @Override + public ResultBean> selMenuByRole(SysMenuRoleDataQuery query) { + return sysMenuRoleService.selMenuByRole(query); + } + + @Override + public ResultBean updateDataByRoleMenu(List dtos) { + return sysMenuRoleService.updateDataByRoleMenu(dtos); + } + @Override public ResultBean> list(){ ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java index b487952be1..beb688f30e 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java @@ -8,6 +8,7 @@ import com.yxt.anrui.portal.biz.sysmenu.SysMenuService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -163,6 +164,27 @@ public class SysMenuRoleService extends MybatisBaseService selectByRoleSid(String roleSid) { return baseMapper.selectByRoleSid(roleSid); } + + public ResultBean> selMenuByRole(SysMenuRoleDataQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("smr.roleSid",query.getRoleSid()); + if (StringUtils.isNotBlank(query.getMenuName())){ + qw.like("sm.name",query.getMenuName()); + } + List sysMenuRoleDataVos = baseMapper.selMenuByRole(qw); + return rb.success().setData(sysMenuRoleDataVos); + } + + public ResultBean updateDataByRoleMenu(List dtos) { + ResultBean rb = ResultBean.fireFail(); + for (SysMenuRoleDataDto dto : dtos) { + if (StringUtils.isNotBlank(dto.getDataRuleId())){ + baseMapper.updateDataByRoleMenu(dto.getSid(),dto.getDataRuleId()); + } + } + return rb.success(); + } ///----获平台角色s的某个资源的菜单树形列表（内存操作） 开始---- diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java index e44ce5154d..0dd0dd4e65 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java @@ -18,4 +18,6 @@ public class BillApplicationPageQuery implements Query { private String orgPath; @ApiModelProperty("1待办2已办") private String type; + @ApiModelProperty("菜单sid") + private String menuSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinUncollectedReceivablesDetailedsQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinUncollectedReceivablesDetailedsQuery.java index c6c377e6d4..949792bcdc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinUncollectedReceivablesDetailedsQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinUncollectedReceivablesDetailedsQuery.java @@ -14,10 +14,12 @@ public class AppFinUncollectedReceivablesDetailedsQuery implements Query { @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("客户名称") private String name; - @ApiModelProperty("分公司sid") private String useOrgSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index be183b107b..2e857a47ce 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -56,6 +56,7 @@ public class InvoicedService { finBillApplicationQuery.setName(params.getName()); finBillApplicationQuery.setOrgPath(params.getOrgPath()); finBillApplicationQuery.setType(params.getType()); + finBillApplicationQuery.setMenuSid(params.getMenuSid()); PagerQuery pcq = new PagerQuery<>(); pcq.setParams(finBillApplicationQuery); ResultBean> resultBean = finBillApplicationFeign.listPage(pcq);