gaoxiong 1 anno fa
parent
commit
8f664b5ac4

+ 2 - 2
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/impl/AppCockpitServiceImpl.java

@@ -137,7 +137,7 @@ public class AppCockpitServiceImpl implements AppCockpitService {
         vo.getBankingGa38().setGa382015(baseInfoDto.getBankingGA382015());
         vo.getBankingGa38().setNotreach(baseInfoDto.getBankingCount() - baseInfoDto.getBankingGA382021() - baseInfoDto.getBankingGA382015());
 
-        vo.setOnlineGa38(new AppGa38RateVo());
+        /*vo.setOnlineGa38(new AppGa38RateVo());
         vo.getOnlineGa38().setGa382021(baseInfoDto.getOnlineGA382021());
         vo.getOnlineGa38().setGa382015(baseInfoDto.getOnlineGA382015());
         vo.getOnlineGa38().setNotreach(baseInfoDto.getOnlineATMCount() - baseInfoDto.getOnlineGA382021() - baseInfoDto.getOnlineGA382015());
@@ -145,7 +145,7 @@ public class AppCockpitServiceImpl implements AppCockpitService {
         vo.setOfflineGa38(new AppGa38RateVo());
         vo.getOfflineGa38().setGa382021(baseInfoDto.getOffATMGA382021());
         vo.getOfflineGa38().setGa382015(baseInfoDto.getOffATMGA382015());
-        vo.getOfflineGa38().setNotreach(baseInfoDto.getOffATMCount() - baseInfoDto.getOffATMGA382021() - baseInfoDto.getOffATMGA382015());
+        vo.getOfflineGa38().setNotreach(baseInfoDto.getOffATMCount() - baseInfoDto.getOffATMGA382021() - baseInfoDto.getOffATMGA382015());*/
 //        vo.setBanking2021(new AppGa38RateVo());
 //        vo.getBanking2021().setTotal(baseInfoDto.getBankingCount());
 //        vo.getBanking2021().setRate(NumberUtils.computeRate(baseInfoDto.getBankingCount(), baseInfoDto.getBankingGA382021()));

+ 3 - 2
soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -164,8 +164,9 @@
         WHERE o.deleted = 0
           and o.is_lock = 0
           and o.path like concat(#{orgPath}, '%')
-          AND (o.type = 4
-            OR o.type = 5)
+--           AND (o.type = 4
+--             OR o.type = 5)
+        and o.type = 4
     </select>
     <select id="selectSyntheticResumption" resultType="com.xunmei.core.board.dto.app.AppSyntheticTaskCategoryDto">
         SELECT p.plan_type,

+ 2 - 1
soc-modules/soc-modules-core/src/main/resources/mapper/board/CockpitMapper.xml

@@ -161,7 +161,8 @@
                             GROUP BY org_id) m on o.id = m.org_id
         WHERE o.deleted = 0
           and o.is_lock = 0
-          and (o.type = 4 OR o.type = 5)
+--           and (o.type = 4 OR o.type = 5)
+          and o.type = 4
           and o.path like concat(#{orgPath}, '%')
     </select>
     <select id="orgInfo" resultType="com.xunmei.core.board.vo.web.OrgInfoVo">