diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java
index e6c1d874..563626b7 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.cyf.api.tankinformation.TankInformation;
 import com.yxt.supervise.cyf.api.tankinformation.TankInformationVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -19,6 +20,7 @@ import java.util.List;
 @Mapper
 public interface TankInformationMapper extends BaseMapper<TankInformation> {
     IPage<TankInformationVo> selectPageVo(IPage<TankInformation> page, @Param(Constants.WRAPPER) Wrapper<TankInformation> qw);
+
     @Select("SELECT\n" +
             "\tt.*,\n" +
             "\tc.NAME AS crudeName,\n" +
@@ -30,9 +32,20 @@ public interface TankInformationMapper extends BaseMapper<TankInformation> {
             "\tLEFT JOIN crude_oil_type_information c ON c.sid = t.crudeSid\n" +
             "\tleft join flowmeter_information f on f.sid =t.flowmeterSid ")
     List<TankInformationVo> tankList();
+
     @Select("select * from tank_information where sid=#{sid}")
     TankInformation getTankBySid(@Param("sid")String sid);
 
     @Select("select *,f.name as flowmeterName,f.number as flowmeterNumber from tank_information t left join flowmeter_information f on f.sid=t.flowmeterSid where crudeSid=#{crudeSid} ")
     List<TankInformationVo> listByType(@Param("crudeSid") String crudeSid);
+
+    @Select("SELECT\n" +
+            "        *,c.name as crudeName,c.number as crudeNumber,\n" +
+            "        f.name as flowmeterName,\n" +
+            "        f.number as flowmeterNumber\n" +
+            "        FROM\n" +
+            "        tank_information t\n" +
+            "        left join crude_oil_type_information c on c.sid=t.crudeSid\n" +
+            "        left join flowmeter_information f on f.sid =t.flowmeterSid")
+    List<TankInformationVo> selectTankInformation();
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationRest.java
index fc7653c8..8a8bf99c 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationRest.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationRest.java
@@ -65,4 +65,10 @@ public class TankInformationRest {
         List<TankInformationVo> pv = tankInformationService.listByType(crudeSid);
         return rb.success().setData(pv);
     }
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/selectTankInformation")
+    public ResultBean selectTankInformation() {
+        return tankInformationService.selectTankInformation();
+    }
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java
index 286c99a6..a849e5e1 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java
@@ -21,7 +21,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author wangpengfei
@@ -85,4 +87,23 @@ public class TankInformationService extends MybatisBaseService<TankInformationMa
         baseMapper.delete(new QueryWrapper<TankInformation>().eq("sid",sid));
         return rb.success().setMsg("删除成功");
     }
+
+    public ResultBean selectTankInformation() {
+        ResultBean rb = ResultBean.fireFail();
+        List<TankInformationVo> tankInformations = baseMapper.selectTankInformation();
+//        Double inventoryTotal = 0.0;
+//        Double existingInventoryTotal = 0.0;
+//        Double totalValueTotal = 0.0;
+//        for (TankInformationVo tankInformation : tankInformations) {
+//            inventoryTotal+=tankInformation.getInventory();
+//            existingInventoryTotal+=tankInformation.getExistingInventory();
+//            totalValueTotal+=tankInformation.getTotalValue();
+//        }
+//        TankInformationVo tankInformation = new TankInformationVo();
+//        tankInformation.setInventory(inventoryTotal);
+//        tankInformation.setExistingInventory(existingInventoryTotal);
+//        tankInformation.setTotalValue(totalValueTotal);
+//        tankInformations.add(tankInformation);
+        return rb.success().setData(tankInformations);
+    }
 }