Commit 8c0c6c2b authored by 田涛's avatar 田涛

Bug-768 电力设备添加配套设备分页

parent bf2b428d
...@@ -84,7 +84,7 @@ public class EquipmentSpecificServiceImpl implements EquipmentSpecificService { ...@@ -84,7 +84,7 @@ public class EquipmentSpecificServiceImpl implements EquipmentSpecificService {
allChildren.forEach(cate -> finalEquipmentIdList.add(cate.getId())); allChildren.forEach(cate -> finalEquipmentIdList.add(cate.getId()));
} }
} }
List<EquipmentSpecificVo> equipmentBySpe = equipmentSpecificMapper.getEquipmentBySpe(pageNumber, pageSize, name, null,null, equipmentIdList); List<EquipmentSpecificVo> equipmentBySpe = equipmentSpecificMapper.getEquipmentBySpe(pageNumber * pageSize, pageSize, name, null,null, equipmentIdList);
int equipmentBySpeCount = equipmentSpecificMapper.getEquipmentBySpeCount(name, null,null, equipmentIdList); int equipmentBySpeCount = equipmentSpecificMapper.getEquipmentBySpeCount(name, null,null, equipmentIdList);
map.put("content",equipmentBySpe); map.put("content",equipmentBySpe);
map.put("totalElements",equipmentBySpeCount); map.put("totalElements",equipmentBySpeCount);
......
spring.application.name = AMOS-AUTOSYS spring.application.name = AMOS-AUTOSYS-TT
server.servlet.context-path=/fireAutoSys server.servlet.context-path=/fireAutoSys
server.port = 8085 server.port = 11024
spring.profiles.active=dev spring.profiles.active=dev
#应用product appkey #应用product appkey
security.productWeb=STUDIO_APP_WEB security.productWeb=STUDIO_APP_WEB
...@@ -50,7 +50,7 @@ visual.fegin.name=maas-visual ...@@ -50,7 +50,7 @@ visual.fegin.name=maas-visual
#值班系统 #值班系统
dutyMode.fegin.name=AMOS-DUTYMODE dutyMode.fegin.name=AMOS-DUTYMODE
#队站装备管理名称,主要用于风险区域同步至仓库货位和订阅装备信息系统 #队站装备管理名称,主要用于风险区域同步至仓库货位和订阅装备信息系统
equipManage.fegin.name=AMOS-EQUIPMANAGE equipManage.fegin.name=AMOS-EQUIPMANAGE-TT
#feginName #feginName
number.plan.projectName=换流站消防专项预案 number.plan.projectName=换流站消防专项预案
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment