离线包状态

src/main/java/com/fdkankan/manage_jp/controller/LaserController.java

@@ -133,7 +133,7 @@ public class LaserController extends BaseController{
         SceneParam sceneParam = new SceneParam();
         sceneParam.setPageNum(1);
         sceneParam.setPageSize(99999);
-        sceneParam.setType(2);
+        sceneParam.setIsLaser(1);
         List<String> numList = new ArrayList<>();
         if(!roleIds.contains(5L)){      //平台管理员
             sceneParam.setCompanyId(user.getCompanyId());
@@ -149,11 +149,7 @@ public class LaserController extends BaseController{
         }
 
         Page<SceneVo> page = sceneProMapper.pageList(new Page<>(sceneParam.getPageNum(),sceneParam.getPageSize()),sceneParam);
-        sceneParam.setType(5);
-        Page<SceneVo> page2 = sceneProMapper.pageList(new Page<>(sceneParam.getPageNum(),sceneParam.getPageSize()),sceneParam);
         List<String> numList2 = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
-        List<String> numList3 = page2.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
-        numList2.addAll(numList3);
         jsonObject.put("list",numList2);
         return Result.success(jsonObject);
     }

src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -165,15 +165,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
 
-        if(param.getType() == null){
-            ssSceneMap = laserService.list(sceneNumList,4);
-            ssSceneMap.putAll(laserService.list(sceneNumList,5));
-        }else  if(param.getType() == 2 ){
-            ssSceneMap = laserService.list(sceneNumList,4);
-        }else  if(param.getType() == 5){
-            ssSceneMap = laserService.list(sceneNumList,5);
-        }else  if(param.getType() == 57){
-            ssSceneMap = laserService.list(sceneNumList,57);
+        if(param.getType() == null || param.getType() == 2 || param.getType() == 5 || param.getType() == 57){
+            ssSceneMap = laserService.list(sceneNumList,null);
+//          ssSceneMap.putAll(laserService.list(sceneNumList,5));
+//        }else  if(param.getType() == 2 ){
+//            ssSceneMap = laserService.list(sceneNumList,4);
+//        }else  if(param.getType() == 5){
+//            ssSceneMap = laserService.list(sceneNumList,5);
+//        }else  if(param.getType() == 57){
+//            ssSceneMap = laserService.list(sceneNumList,57);
         }
 
         HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);

src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -48,7 +48,7 @@
             and s.pay_status !=#{param.neStatus}
         </if>
         <if test="param.isLaser !=null and param.isLaser == 1">
-            and s.scene_source in (4,5)
+            and s.scene_source in (4,5,57)
         </if>
         <if test="param.isLaser !=null and param.isLaser == 0">
             and s.scene_source not in (4,5)