Merge branch 'lb_dev' into base-modify

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -3,11 +3,13 @@ package com.xxfc.platform.uccn.biz;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.uccn.dto.SummitActivityFindDTO;
 import com.xxfc.platform.uccn.dto.SummitActivitySaveDTO;
+import com.xxfc.platform.uccn.entity.SummitActivity;
+import com.xxfc.platform.uccn.mapper.SummitActivityMapper;
 import com.xxfc.platform.uccn.vo.SummitActivityAdminVo;
 import com.xxfc.platform.uccn.vo.SummitActivityDetailVo;
 import com.xxfc.platform.uccn.vo.SummitActivityVo;
@@ -15,10 +17,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
-import com.xxfc.platform.uccn.entity.SummitActivity;
-import com.xxfc.platform.uccn.mapper.SummitActivityMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
@@ -75,9 +73,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
             criteria.andLike("title", String.format("%%%s%%", summitActivityFindDTO.getTitle()));
         }
         criteria.andEqualTo("isDel", 0);
-       /* if (Objects.nonNull(summitActivityFindDTO.getStartTime()) && Objects.nonNull(summitActivityFindDTO.getEndTime())){
-            criteria.andBetween("")
-        }*/
+
         PageDataVO<SummitActivity> pageDataVO = PageDataVO.pageInfo(summitActivityFindDTO.getPage(), summitActivityFindDTO.getLimit(), () -> mapper.selectByExample(example));
         List<SummitActivity> data = pageDataVO.getData();
         if (CollectionUtils.isEmpty(data)) {

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

@@ -172,10 +172,14 @@ public class VehicleActiveService {
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
         if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-            stringBuilder.append("中，使用人：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
-            stringBuilder.append(" 使用人电话：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+            if(vehicleBookRecordVos.get(0).getVehicleDepartureLogVo() != null &&  vehicleBookRecordVos.get(0).getVehicleDepartureLogVo().getState() != 1) {
+                stringBuilder.append("中，使用人：");
+                stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
+                stringBuilder.append(" 使用人电话：");
+                stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+            } else { //没有出车记录
+                stringBuilder.append(" 请联系管理员修改车辆状态为正常运行！");
+            }
         }
         return stringBuilder.toString();
     }