需求

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -265,7 +265,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    IPage<SettleOrderVO> settleOrderList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("websitId") String websitId);
+    IPage<SettleOrderVO> settleOrderList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("websitIds") List<String> websitId);
 
     /**
      * 汇总结算单列表
@@ -273,7 +273,7 @@ public interface CommonMapper {
      * @param zfireParamBean
      * @return
      */
-    IPage<SettlePoolVO> settlePoolList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("websitId") String websitId);
+    IPage<SettlePoolVO> settlePoolList(Page page, @Param("ex") ZfireParamBean zfireParamBean, @Param("websitIds") List<String> websitId);
 
     /**
      * 汇总结算单明细

mall-server-api/src/main/java/com/gree/mall/manager/logic/count/CountLogic.java

@@ -602,6 +602,7 @@ public class CountLogic {
         materialCount.setWebsitCheckNeverNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
                         flags.contains(item.getFlag())
+                        && item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
 
                 ).count())
         );
@@ -609,6 +610,7 @@ public class CountLogic {
         materialCount.setWebsitCheckYesNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
                         flags.contains(item.getFlag())
+                                && item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
 
                 ).count())
         );
@@ -662,7 +664,8 @@ public class CountLogic {
 
 
         materialCount.setWebsitOrderSaveNum(
-                Convert.toInt(websitPurchaseList.stream().filter(item -> item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())).count())
+                Convert.toInt(websitPurchaseList.stream().filter(item -> item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
+                        && item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())).count())
         );
 
         materialCount.setWebsitOrderSumbitNum(

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/SettleOrderLogic.java

@@ -51,9 +51,7 @@ public class SettleOrderLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         FieldUtils.supplyParam(zfireParamBean, SettleOrderVO.class, adminUser);
 
-        // 网点权限
-        String websitId = adminUser.getType() == 0 ? adminUser.getAdminWebsitIds().get(0) : null;
-        return commonMapper.settleOrderList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, websitId);
+        return commonMapper.settleOrderList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminUser.getAdminWebsitIds());
 
     }
 
@@ -370,9 +368,8 @@ public class SettleOrderLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         FieldUtils.supplyParam(zfireParamBean, WebsitPurchaseVO.class, adminUser);
 
-        // 网点权限
-        String websitId = adminUser.getType() == 0 ? adminUser.getAdminWebsitIds().get(0) : null;
-        return commonMapper.settlePoolList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, websitId);
+
+        return commonMapper.settlePoolList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminUser.getAdminWebsitIds());
 
     }
 

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -430,8 +430,13 @@
         ${ex.selected}
         FROM pg_settle_order a
         ${ex.query}
-        <if test="websitId != null and websitId != ''">
-            AND a.websit_id = #{websitId}
+        <if test="websitIds != null and websitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="websitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
         </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
@@ -444,8 +449,13 @@
         ${ex.selected}
         FROM pg_settle_pool a
         ${ex.query}
-        <if test="websitId != null and websitId != ''">
-            AND a.websit_id = #{websitId}
+        <if test="websitIds != null and websitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="websitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
         </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.pool_create_time DESC