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-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 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();