Merge branch 'master-chw' into dev-chw

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java

@@ -70,7 +70,7 @@ public interface VehicleMapper extends Mapper<Vehicle> {
     @Select("SELECT COUNT(*) FROM vehicle WHERE is_del=0 and subordinate_branch = #{commpanyId}")
     Long countByCompamyId(@Param("commpanyId") Integer commpanyId);
 
-    @Select("SELECT COUNT(*) FROM vehicle WHERE is_del=0 and manage_company_id = #{commpanyId}")
+    @Select("SELECT COUNT(*) FROM vehicle WHERE is_del=0 and manage_company_id = #{commpanyId} and state = 1")
     Long countByManageCompamyId(@Param("commpanyId") Integer commpanyId);
 
     List<VehicleVO> appSelectList(VehicleFindAppDTO vehicleFindAppDTO);

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishReceiveMapper.xml

@@ -92,7 +92,7 @@
 
 
 
-    <select id="selectListByReceive"  resultType="com.xxfc.platform.vehicle.pojo.vo.ReceiveVo" parameterType="com.xxfc.platform.vehicle.pojo.dto.VehiclePublishReceiveDTO">
+    <select id="selectListByReceive"  resultType="com.xxfc.platform.vehicle.pojo.vo.ReceiveVo" parameterType="com.xxfc.platform.vehicle.pojo.dto.VehiclePublishFindDTO">
         SELECT
         r.receive_order_no as receiveOrderNo,
         COUNT(r.id) as number,
@@ -119,6 +119,17 @@
             <if test="orderNo != null and orderNo != '' ">
                 AND  r.receive_order_no= #{orderNo}
             </if>
+            <if test="status != null  ' ">
+                <choose>
+                    <when test=" status == 2">
+                        AND  r.status not in (0,1,4)
+                    </when>
+                    <otherwise>
+                        AND  r.status= #{status}
+                    </otherwise>
+                </choose>
+
+            </if>
         </where>
         GROUP BY r.receive_order_no
         ORDER BY r.crt_time DESC