修改代码

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleDepartureLog.java

@@ -87,7 +87,7 @@ public class VehicleDepartureLog {
      */
     Integer bookRecordId;
 
-    private String illegalPic;
+     String illegalPic;
 
-    private Integer illegalAmount;
+     Integer illegalAmount;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureLogVo.java

@@ -26,4 +26,9 @@ public class VehicleDepartureLogVo {
     String departureDay;
     String departureName;
     String arrivalName;
+    Integer bookRecordId;
+
+    String illegalPic;
+
+    Integer illegalAmount;
 }

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

 package com.xxfc.platform.vehicle.biz;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -418,21 +419,12 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         VehicleBookRecord vehicleBookRecord = null;
         if(bookVehicleVo.getVehicleBookRecordId() == null) {
             vehicleBookRecord = new VehicleBookRecord();
-            vehicleBookRecord.setVehicleId(bookVehicleVo.getVehicleId());
-            vehicleBookRecord.setBookType(bookVehicleVo.getBookType());
+            BeanUtil.copyProperties(bookVehicleVo, vehicleBookRecord, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            vehicleBookRecord.setBookStartDate(startDay.toDate());
+            vehicleBookRecord.setBookEndDate(endDay.toDate());
             vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPLY.getCode());
             vehicleBookRecord.setBookUser(userId);
             vehicleBookRecord.setBookUserName(userName);
-            vehicleBookRecord.setBookStartDate(startDay.toDate());
-            vehicleBookRecord.setBookEndDate(endDay.toDate());
-            vehicleBookRecord.setLiftAddr(bookVehicleVo.getLiftAddr());
-            vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
-            vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
-            vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
-            vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
-            vehicleBookRecord.setVehicleUsername(bookVehicleVo.getVehicleUsername());
-            vehicleBookRecord.setVehicleUserPhone(bookVehicleVo.getVehicleUserPhone());
-            vehicleBookRecord.setUpkeepIds(bookVehicleVo.getUpkeepIds());
             vehicleBookRecordBiz.save(vehicleBookRecord);
         } else {
             vehicleBookRecord = vehicleBookRecordBiz.selectById(bookVehicleVo.getVehicleBookRecordId());
@@ -511,21 +503,12 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         VehicleBookRecord vehicleBookRecord = null;
         if(bookVehicleVo.getVehicleBookRecordId() == null) {
             vehicleBookRecord = new VehicleBookRecord();
-            vehicleBookRecord.setVehicleId(bookVehicleVo.getVehicleId());
-            vehicleBookRecord.setBookType(bookVehicleVo.getBookType());
+            BeanUtil.copyProperties(bookVehicleVo, vehicleBookRecord, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            vehicleBookRecord.setBookStartDate(startDay.toDate());
+            vehicleBookRecord.setBookEndDate(endDay.toDate());
             vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
             vehicleBookRecord.setBookUser(userId);
             vehicleBookRecord.setBookUserName(userName);
-            vehicleBookRecord.setBookStartDate(startDay.toDate());
-            vehicleBookRecord.setBookEndDate(endDay.toDate());
-            vehicleBookRecord.setLiftAddr(bookVehicleVo.getLiftAddr());
-            vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
-            vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
-            vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
-            vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
-            vehicleBookRecord.setVehicleUsername(bookVehicleVo.getVehicleUsername());
-            vehicleBookRecord.setVehicleUserPhone(bookVehicleVo.getVehicleUserPhone());
-            vehicleBookRecord.setUpkeepIds(bookVehicleVo.getUpkeepIds());
             vehicleBookRecordBiz.save(vehicleBookRecord);
         } else {
             vehicleBookRecord = vehicleBookRecordBiz.selectById(bookVehicleVo.getVehicleBookRecordId());
@@ -1291,22 +1274,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
                 String zoneId = null;
                 if(StringUtils.isNotBlank(userDTO.getDataZone())) {
-                    if(userDTO.getDataZone().contains(",")) {
                         zoneId = userDTO.getDataZone();
-                    } else {
-                        zoneId = userDTO.getDataZone() + ",";
-                    }
                 } else {
                     zoneId = userDTO.getZoneId() + ",";
                 }
                 vehiclePlanDto.setZoneIds(zoneId.split(","));
                 String companyId = null;
                 if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
-                    if(userDTO.getDataCompany().contains(",")) {
                         companyId = userDTO.getDataCompany();
-                    } else {
-                        companyId = userDTO.getDataCompany() + ",";
-                    }
                 } else {
                     companyId = userDTO.getCompanyId() + ",";
                 }

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

@@ -14,6 +14,7 @@ import com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureStatisticDataVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,7 @@ import java.util.Date;
 import java.util.List;
 
 @Service
+@Slf4j
 public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper, VehicleDepartureLog> {
 
     @Autowired
@@ -71,21 +73,30 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Transactional
     public ObjectRestResponse save(VehicleDepartureLog vehicleDepartureLog) {
         Integer id = vehicleDepartureLog.getId();
+        log.info("添加出行记录参数： vehicleDepartureLog = {}", vehicleDepartureLog);
         if (id == null || id == 0) {
             vehicleDepartureLog.setCreateTime(new Date());
             vehicleDepartureLog.setState(0);
             insertSelective(vehicleDepartureLog);
+            return ObjectRestResponse.succ();
         } else {
             vehicleDepartureLog.setUpdateTime(new Date());
             VehicleDepartureLog oldValue = mapper.selectByPrimaryKey(vehicleDepartureLog);
             if(oldValue != null) {
-                BeanUtil.copyProperties(oldValue, vehicleDepartureLog, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                log.info("更新出行记录： vehicleDepartureLog = {}", oldValue);
+                BeanUtil.copyProperties(vehicleDepartureLog, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
                 oldValue.setUpdateTime(new Date());
                 updateSelectiveById(oldValue);
+                return ObjectRestResponse.succ();
+            } else {
+                vehicleDepartureLog.setCreateTime(new Date());
+                vehicleDepartureLog.setState(0);
+                insertSelective(vehicleDepartureLog);
+                return ObjectRestResponse.succ();
             }
 
         }
-        return ObjectRestResponse.succ();
+
     }