管乐迷商城改造

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -1736,6 +1736,7 @@ public class ExportServiceImpl implements ExportService {
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
         params.put("notGroupType","MALL_SELL");
+        params.put("notType","SCHOOL_GOODS_PURCHASE");
         int count = studentPaymentOrderService.getDao().queryCount(params);
         if (count <= 0) {
             return BaseController.failed("没有可导出的数据");
@@ -1792,6 +1793,7 @@ public class ExportServiceImpl implements ExportService {
         }
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
+        params.put("notType","SCHOOL_GOODS_PURCHASE");
         int count = studentPaymentOrderService.getDao().queryCount(params);
         if (count <= 0) {
             return BaseController.failed("没有可导出的数据");

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

@@ -417,13 +417,16 @@
     </sql>
     <sql id="queryPaymentOrder">
         <where>
-        	spo.tenant_id_ = #{tenantId} AND spo.type_ != 'SCHOOL_GOODS_PURCHASE'
+        	spo.tenant_id_ = #{tenantId}
             <if test="userIds != null">
                 AND spo.user_id_ IN
                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                     #{userId}
                 </foreach>
             </if>
+            <if test="notType != null and notType != ''">
+                AND spo.type_ != #{notType}
+            </if>
             <if test="organId != null">
                 AND FIND_IN_SET(spo.organ_id_,#{organId})
             </if>