1.统计条件修改

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenDouble11StaticsController.java

@@ -181,13 +181,11 @@ public class OpenDouble11StaticsController extends BaseController {
                 JSON.parseObject(config.getParanValue(), Double11StaticWrapper.SaleStaticConfigParam.class);
         temp.setSaleStaticsType(query.getSaleStaticsType());
         setQueryParam(temp, configParam);
-        Map<String, Object> tempMap = new HashMap<>();
-        MapUtil.populateMap(tempMap, temp);
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, temp);
 
         query.setOrderBy("t.pay_time_");
-        Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, query);
-        params.putAll(tempMap);
         PageInfo<Double11StaticWrapper.SaleStaticsStudent> pageInfo = new PageInfo<>(query.getPage(), query.getRows());
         List<Double11StaticWrapper.SaleStaticsStudent> dataList = new ArrayList<>();
         Integer count = studentPaymentOrderDao.queryPaymentStudentCount(params);

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/Double11StaticWrapper.java

@@ -66,6 +66,12 @@ public class Double11StaticWrapper {
     @Data
     public static class SaleStaticsStudentQuery implements QueryInfo {
 
+        @ApiModelProperty("当前页")
+        private Integer page;
+
+        @ApiModelProperty("分页行数")
+        private Integer rows;
+
         @ApiModelProperty("分部")
         private Long organId;
 

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -1322,10 +1322,10 @@
                 AND t.tenant_id_ =#{tenantId}
             </if>
             <if test="organId != null">
-                t.organ_id_ = #{organId}
+                AND t.organ_id_ = #{organId}
             </if>
             <if test="userName != null and userName.trim() !=''">
-                su.username_ like concat('%',#{userName},'%')
+                AND su.username_ like concat('%',#{userName},'%')
             </if>
             <if test="groupType != null">
                 AND group_type_ =#{groupType}