Просмотр исходного кода

地面磁感应器 - 检测表 分页,只显示已确认的数据

Eric 4 лет назад
Родитель
Сommit
f9086cdbc0

+ 6 - 1
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbDmcgyqServiceImpl.java

@@ -11,6 +11,8 @@ import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbDmcgyqMapper;
 import com.railway.business.catenary.service.IBusJcbDmcgyqService;
+import com.railway.common.core.page.PageDomain;
+import com.railway.common.core.page.TableSupport;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.bean.BeanUtils;
@@ -172,7 +174,10 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
                transDataForList(x, resultList);
               }
       );
-      return resultList;
+      PageDomain pageDomain = TableSupport.buildPageRequest();
+      Integer pageNum = pageDomain.getPageNum();
+      Integer pageSize = pageDomain.getPageSize();
+      return resultList.stream().limit(pageSize * pageNum).collect(Collectors.toList());
   }
 
   /**

+ 1 - 1
railway-business/src/main/resources/mapper/catenary/BusJcbDmcgyqMapper.xml

@@ -491,7 +491,7 @@
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     LEFT JOIN base_dmcgyq base ON t.gyq_id = base.id
     <where>
-      t.del_flag='0'
+      t.del_flag='0' and t.submit_state = '9'
       <if test="submitState!=null and submitState!=''">
         and t.submit_state <![CDATA[ >= ]]> #{submitState}
       </if>