copyScene -mq

src/main/java/com/fdkankan/manage_jp/mapper/IProjectSceneGpsMapper.java

@@ -25,5 +25,5 @@ public interface IProjectSceneGpsMapper extends BaseMapper<ProjectSceneGps> {
     List<SceneGpsDb> getNotGpsScene();
 
     List<SceneGpsDbVp> listGps( SceneGpsParam param);
-    List<SceneGpsDbVp> listGps(Page<Object> page,SceneGpsParam param);
+    Page<SceneGpsDbVp> listGps(Page<Object> page,SceneGpsParam param);
 }

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.manage_jp.common.PageInfo;
 import com.fdkankan.manage_jp.entity.*;
 import com.fdkankan.manage_jp.httpClient.service.LaserService;
 import com.fdkankan.manage_jp.mapper.IProjectSceneGpsMapper;
@@ -179,12 +180,10 @@ public class ProjectSceneGpsServiceImpl extends ServiceImpl<IProjectSceneGpsMapp
             List<String> numList = tmContractorNumService.getNumListByCompanyId(param.getCompanyId());
             param.setCooperateSceneCodes(numList);
         }
-        List<SceneGpsDbVp> sceneGpsDbVps = new ArrayList<>();
-        if(!param.getNeedPage()){
-            sceneGpsDbVps = this.getBaseMapper().listGps(param);
-        }else {
-            sceneGpsDbVps = this.getBaseMapper().listGps(new Page<>(param.getPageNum(),param.getPageSize()) ,param);
+        if(param.getNeedPage()){
+            return PageInfo.PageInfo(this.getBaseMapper().listGps(new Page<>(param.getPageNum(),param.getPageSize()) ,param));
         }
+        List<SceneGpsDbVp> sceneGpsDbVps  = this.getBaseMapper().listGps(param);
         if(param.getType() == 1){
             return sceneGpsDbVps;
         }