Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -41,7 +41,7 @@
     <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo">
         SELECT bo.sid                                 as saleOrderSid,
                bo.billNo                              as saleOrderId,
-               bo.customerClass                       as customerType,
+               bo.customerClassKey                    as customerType,
                bo.customerSid,
                bo.customerName,
                bo.customerPhoto                       as customerImage,
@@ -104,7 +104,7 @@
     <select id="selectCountByOrgSid" resultType="int">
         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}, '%')
     </select>

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;
 }

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;
 }

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<PagerVo<BusOrderSalesVo>> getSaleOrders(PagerQuery<BusOrderSalesQuery> pagerQuery) {
@@ -152,7 +152,7 @@ public class AppBusSalesOrderService {
         PagerQuery<AppBusSalesOrderQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
         ResultBean<PagerVo<AppBusSalesOrderVo>> resultBean = busSalesOrderFeign.getSaleOrders(pq);
         PagerVo<BusOrderSalesVo> 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();