Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -17,12 +17,11 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-
         IFNULL(sum(gmv),0) as totalGmv
         FROM
         daily_members_order_statistics
         WHERE
-        branch_company_id =1
+        branch_company_id =#{companyId}
         and
         DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
     </select>

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -42,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -177,11 +178,26 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
+        if(vehicleBookRecordQueryVo.getStatus() == 2) {
+            removeStatus2(pageDataVO.getData());
+        }
         getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
 
-    public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos) {
+   public void removeStatus2(List<VehicleBookRecordVo> list) {
+       Iterator<VehicleBookRecordVo> iterator = list.iterator();
+       while (iterator.hasNext()) {
+           if(iterator.next().getVehicleDepartureLogVo() == null) {
+               iterator.remove();
+           }
+       }
+
+   }
+   /**
+    * 获取随身物品
+    */
+   public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos) {
         for(VehicleBookRecordVo vehicleBookRecordVo : vehicleBookRecordVos) {
             if(vehicleBookRecordVo.getBookType() == BookType.MAINTAIN.getCode()) {//获取 保养项目
                if(StringUtils.isNotBlank(vehicleBookRecordVo.getUpkeepIds())) {