lyhzzz 2 месяцев назад
Родитель
Сommit
50af3c5758

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/FeedbackOptionServiceImpl.java

@@ -44,7 +44,7 @@ public class FeedbackOptionServiceImpl extends ServiceImpl<IFeedbackOptionMapper
     public Object pageList(FeedbackOptionParam param) {
         LambdaQueryWrapper<FeedbackOption> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(FeedbackOption::getTypeId,param.getTypeId());
-        wrapper.orderByAsc(FeedbackOption::getId);
+        wrapper.orderByDesc(FeedbackOption::getId);
         Page<FeedbackOption> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> sysIds = page.getRecords().stream().map(FeedbackOption::getSysUserId).collect(Collectors.toSet());
         HashMap<Long, SysUser> byIds = sysUserService.getByIds(sysIds);

+ 2 - 2
src/main/resources/mapper/manage/SceneProMapper.xml

@@ -25,7 +25,7 @@
         select s.scene_name ,s.num,s.create_time,s.space as sceneSize
         ,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site , s.thumb
         ,null as algorithmTime,data_source,s.shoot_count,s.gps,s.user_id,s.camera_id,s.compute_time,null as location,null as mixture,s.laser_title,null as slamCount,
-         null as meshComputeTime,s.scene_source,s.feedback_option_id
+         null as meshComputeTime,s.scene_source,s.feedback_option_id,s.is_obj
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <if test="param.isLaser ==0 and param.sceneName != null and param.sceneName!='' ">
@@ -48,7 +48,7 @@
         select s.title as sceneName ,s.num,s.create_time,e.space as sceneSize
         ,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site,e.thumb
         ,algorithm_time,data_source,e.shoot_count,e.gps,s.user_id,s.camera_id,e.compute_time,e.location,e.mixture,s.laser_title,e.slam_count,
-        e.mesh_compute_time,s.scene_source,s.feedback_option_id
+        e.mesh_compute_time,s.scene_source,s.feedback_option_id,e.is_obj
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>