From de63b9627ef0d87778e977c5c02f70e2b84b4723 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 20 Jun 2022 15:36:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java | 5 +++++ .../java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java index 9eb34dd640..83b718f78a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java @@ -40,4 +40,9 @@ public class SysRole extends BaseEntity { @ApiModelProperty("岗位sid") private String postSid; + + @ApiModelProperty(value = "角色组织层级key") + private String roleType; + @ApiModelProperty(value = "角色组织层级value") + private String roleTypeValue; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java index 778b8fc1ce..5409e6c114 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java @@ -43,4 +43,9 @@ public class SysRoleDto implements Dto { @ApiModelProperty("岗位名称") private String postName; + + @ApiModelProperty(value = "角色组织层级key") + private String roleType; + @ApiModelProperty(value = "角色组织层级value") + private String roleTypeValue; } \ No newline at end of file From 37b2173acd3805cf16d45765ff4a2ab7397700e0 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 20 Jun 2022 15:36:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java | 5 +++++ .../java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java index 9eb34dd640..83b718f78a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java @@ -40,4 +40,9 @@ public class SysRole extends BaseEntity { @ApiModelProperty("岗位sid") private String postSid; + + @ApiModelProperty(value = "角色组织层级key") + private String roleType; + @ApiModelProperty(value = "角色组织层级value") + private String roleTypeValue; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java index 778b8fc1ce..5409e6c114 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java @@ -43,4 +43,9 @@ public class SysRoleDto implements Dto { @ApiModelProperty("岗位名称") private String postName; + + @ApiModelProperty(value = "角色组织层级key") + private String roleType; + @ApiModelProperty(value = "角色组织层级value") + private String roleTypeValue; } \ No newline at end of file From bdf7894436de17b5cab0c020b50476e31ffe38e7 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 20 Jun 2022 16:32:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 4 ++-- .../biz/autoservice/saleOrders/AppBusSalesOrderService.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 42375f227b..0bc105b352 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -41,7 +41,7 @@ SELECT count(*) FROM bus_sales_order - WHERE convert(createDate,DATETIME) LIKE concat(#{date}, '%') + WHERE convert(createDate, DATETIME) LIKE concat(#{date}, '%') AND orgSid = #{orgSid} AND billNo LIKE concat(#{billsType}, '%') diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 482da66e87..909d077c11 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -144,7 +144,7 @@ public class AppBusSalesOrderService { /** * App销售订单分页列表 * - * @param pq + * @param pagerQuery * @return */ public ResultBean> getSaleOrders(PagerQuery pagerQuery) { @@ -152,7 +152,7 @@ public class AppBusSalesOrderService { PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); ResultBean> resultBean = busSalesOrderFeign.getSaleOrders(pq); PagerVo vo = CoverUtils.selectPagerVo(resultBean.getData()); - return rb.success().setMsg("").setData(vo); + return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo); } /** @@ -262,7 +262,7 @@ public class AppBusSalesOrderService { public ResultBean saveModelInfo(ModelDto dto) { ResultBean rb = ResultBean.fireFail(); - if(StringUtils.isBlank(dto.getState())){ + if (StringUtils.isBlank(dto.getState())) { return rb.setMsg("请选择类型"); } AppBusSalesOrderModelDto appBusSalesOrderModelDto = new AppBusSalesOrderModelDto();