修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranProcessInfo.java

@@ -240,6 +240,11 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
      */
     @TableField(exist = false)
     private String flag;
+    /**
+     * 包括已删除的车辆
+     */
+    @TableField(exist = false)
+    private Integer count;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/TranCarInfoMapper.java

@@ -3,6 +3,8 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.Map;
+
 /**
  * <p>
  * 记录车次 Mapper 接口

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/TranProcessInfoMapper.java

@@ -31,4 +31,11 @@ public interface TranProcessInfoMapper extends BaseMapper<TranProcessInfo> {
      * @return
      */
     List<TranProcessInfo> getListByCondition(Map<String, Object> pageView);
+    /**
+     * 根据条件查询车辆总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCarByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
@@ -16,6 +17,7 @@ import com.yh.saas.plugin.yiliangyiyun.service.ITranCarInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.ITranProcessInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.aggregation.ArrayOperators;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -109,6 +111,11 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         //查看车次信息
         List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
                 .eq(TranCarInfo.QueryFiles.PROCESS_ID,id).eq(TranCarInfo.QueryFiles.DELETE_FLAG,NumberConstant.CONSTANT0));
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("id", id);
+        // 查询派车总数包括已删除的
+        Integer dataCount = baseMapper.getCarByCondition(pageView);
+        tranProcessInfo.setCount(dataCount);
         tranProcessInfo.setTranCarInfoList(tranCarInfoList);
         return tranProcessInfo;
     }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranProcessInfoMapper.xml

@@ -131,5 +131,11 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
-
+    <!-- 获得汽运调度总数 -->
+    <select id="getCarByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT COUNT(c.id)
+        FROM tran_car_info c
+        WHERE
+        c.process_id= #{id}
+    </select>
 </mapper>