123

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

@@ -62,4 +62,6 @@ public class VehiclePublishFindDTO extends PageParam implements DataInter {
 
     @ApiModelProperty("0-进行中；1-已取消；2-待处理,3-已处理")
     Integer status;
+
+    Integer id;
 }

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

@@ -25,6 +25,7 @@ public class VehiclePublishReceiveDTO{
     public static final int AGREE=3;//确认
     public static final int CANCEL=4;//取消
     public static final int COLLECT=5;//收车
+    public static final int OUT=6;//出车
 
     @ApiModelProperty("需求Id")
     private Integer  publishId;

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

@@ -318,12 +318,21 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
             Long startTime = null;
             Long endTime = null;
             Integer status = 1;
+            Integer type = vehiclePublish.getType();
             if (receive.getStatus().equals(VehiclePublishReceiveDTO.PAY)){
-                companyId = receive.getReceiveCompanyId();
+                if (type == 1){
+                    companyId = receive.getReceiveCompanyId();
+                }else {
+                    companyId = receive.getPublishCompanyId();
+                }
                 startTime = System.currentTimeMillis();
                 endTime =  vehiclePublish.getStartTime();
             }else if (receive.getStatus().equals(VehiclePublishReceiveDTO.COLLECT)){
-                companyId = receive.getPublishCompanyId();
+                if (type == 1){
+                    companyId = receive.getPublishCompanyId();
+                }else {
+                    companyId = receive.getReceiveCompanyId();
+                }
                 startTime = vehiclePublish.getStartTime();
                 endTime =  vehiclePublish.getEndTime();
             }else if (receive.getStatus().equals(VehiclePublishReceiveDTO.REFUSE)){
@@ -561,6 +570,45 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
         }
     }
 
+    public void  statusReceive(String ids,Integer status){
+        List<Integer> idList = Arrays.asList(ids.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+        VehiclePublishReceive publishReceive = new VehiclePublishReceive();
+        publishReceive.setStatus(status);
+        updReceive(idList,publishReceive);
+        if (status.equals(VehiclePublishReceiveDTO.COLLECT)){
+            for (Integer id : idList){
+                VehiclePublishFindDTO publishFindDTO = new VehiclePublishFindDTO();
+                publishFindDTO.setId(id);
+                List<ReceiveVo> list = getListByReceive(publishFindDTO);
+                if (list.size() > 0){
+                    ReceiveVo receiveVo = list.get(0);
+                    String vehicleId = receiveVo.getVehicleId();
+                    Integer type = receiveVo.getType();
+                    Integer companyId;
+                    if (type == 1){
+                        companyId = receiveVo.getPublishCompanyId();
+                    }else {
+                        companyId = receiveVo.getReceiveCompanyId();
+                    }
+
+                    Vehicle vehicle = new Vehicle();
+                    vehicle.setId(vehicleId);
+                    Vehicle vehicle1 = vehicleBiz.selectById(vehicleId);
+                    if (vehicle1.getSubordinateBranch().equals(vehicle1.getManageCompanyId())){
+                        vehicle.setManageCompanyId(companyId);
+                    }
+                    vehicle.setParkBranchCompanyId(companyId);
+                    vehicleBiz.updateSelectiveById(vehicle);
+
+                }
+            }
+            VehiclePublishReceiveDTO publishReceiveDTO = new VehiclePublishReceiveDTO();
+            publishReceiveDTO.setRefuseReceiveIds(ids);
+            publishReceiveDTO.setStatus(status);
+            addVehicleUseTime(publishReceiveDTO);
+        }
+    }
+
 
 
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehiclePublishReceiveController.java

@@ -100,6 +100,14 @@ public class AppVehiclePublishReceiveController extends BaseController<VehiclePu
     }
 
 
+    @PostMapping("statusReceive")
+    @ApiModelProperty("出车或收车")
+    public  ObjectRestResponse statusReceive(@RequestBody VehiclePublishReceiveDTO publishReceiveDTO){
+        baseBiz.statusReceive(publishReceiveDTO.getReceiveIds(),publishReceiveDTO.getStatus());
+        return ObjectRestResponse.succ();
+    }
+
+
 
 
 

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

@@ -116,6 +116,9 @@
             <if test="companyId != null and companyId > 0">
                 AND  r.receive_company_id= #{companyId}
             </if>
+            <if test="id != null and id > 0">
+                AND  r.id= #{id}
+            </if>
             <if test="orderNo != null and orderNo != '' ">
                 AND  r.receive_order_no= #{orderNo}
             </if>