浏览代码

财务结算-快手结算单条件查询

yangzian 3 年之前
父节点
当前提交
9c1987f58a

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/ReportSettlementMapper.xml

@@ -54,7 +54,7 @@
         <if test="mediaId !=null and mediaId != ''">
             AND media_id = #{mediaId}
         </if>
-        <if test="sales !=null and sales != ''">
+        <if test='sales !=null and sales.size() >0'>
             AND create_user_id in
             <foreach collection="sales" item="item" separator=","
                      open="(" close=")">
@@ -76,7 +76,7 @@
     <if test="uploadYears !=null and uploadYears != ''">
         AND DATE_FORMAT( date, '%Y-%m' ) =  #{uploadYears}
     </if>
-    <if test="accountIds !=null and accountIds != ''">
+    <if test='accountIds !=null and accountIds.size() >0'>
         AND advertiser_id in
         <foreach collection="accountIds" item="item" separator=","
                  open="(" close=")">

+ 8 - 8
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementFileInfoServiceImpl.java

@@ -199,15 +199,15 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
     public Result getAccountNumAndImgNum(SettlementFileParamsVo paramsVo, SysUser user) {
         Map<String,String> map =  settlementFileInfoMapper.getAccountNumAndImgNum(paramsVo);
         List<String>accountIds = reportSettlementService.getAccountId(paramsVo,user);
-        //过滤消耗为0 的账户 1-头条 2-快手
-        if (paramsVo.getMediaId().equals(1)){
-            accountIds = reportSettlementMapper.getAccountIdBytedanceRepeat(accountIds,paramsVo.getUploadYears());
-        }else if (paramsVo.getMediaId().equals(2)){
-            accountIds = reportSettlementMapper.getAccountIdKuaiShouRepeat(accountIds,paramsVo.getUploadYears());
-        }
-        if(null == accountIds||accountIds.isEmpty()){
+        if (Check.isNull(accountIds)){
             map.put("accountNum","0");
-        }else{
+        }else {
+            //过滤消耗为0 的账户 1-头条 2-快手
+            if (paramsVo.getMediaId().equals(1)){
+                accountIds = reportSettlementMapper.getAccountIdBytedanceRepeat(accountIds,paramsVo.getUploadYears());
+            }else if (paramsVo.getMediaId().equals(2)){
+                accountIds = reportSettlementMapper.getAccountIdKuaiShouRepeat(accountIds,paramsVo.getUploadYears());
+            }
             map.put("accountNum",accountIds.size()+"");
         }
         return Result.successMsg("查询账户数量以及图片数量成功",map);

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml

@@ -290,7 +290,7 @@ ORDER BY
         <if test="productId!=null and productId!= '' ">
             and cp.product_id = #{productId}
         </if>
-        <if test="sales !=null and sales != ''">
+        <if test="sales !=null and sales.size() > 0">
             AND cp.sale_id in
             <foreach collection="sales" item="item" separator=","
                      open="(" close=")">