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

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -769,6 +769,18 @@ public class KwfTruckService {
         }
         return Global.MINUS_ONE;
     }
+    public int truckEntEdit1(KwfTruck params, Long entId) {
+        KwfTruckEnt truckEnt = new KwfTruckEnt();
+        truckEnt.setTruckId(params.getId());
+        truckEnt.setEntId(entId);
+        KwfTruckEnt ent = truckEntDao.findByTruckEnt(truckEnt);
+        if (ent == null) {
+            int count = truckEntDao.insert(truckEnt);
+            return count;
+        }
+        return Global.MINUS_ONE;
+    }
+
 
     /**
      * @param truckId 车辆档案主键id fleetId 车队班组主键id
@@ -798,6 +810,48 @@ public class KwfTruckService {
         }
     }
 
+    public HttpResult truckFleetEdit1(Long truckId, Long fleetId) {
+        /**数据校验**/
+        if (fleetId == null) {
+            return HttpResult.ok("未选择车队班组！");
+        }
+        KwfFleetTruck queryFleetTruck = new KwfFleetTruck();
+        queryFleetTruck.setEntId(LoginUserHolder.getEntId());
+        queryFleetTruck.setTruckId(truckId);
+        KwfFleetTruck fleetTruck = fleetTruckDao.findByTruckFleet(queryFleetTruck);
+
+        /**数据更新**/
+        queryFleetTruck.setFleetId(fleetId);
+        if (fleetTruck == null) {
+            int count = fleetTruckDao.insert(queryFleetTruck);
+            return count > 0 ? HttpResult.ok("车队班组绑定成功！") : HttpResult.error("车队班组绑定失败！");
+        } else {
+            queryFleetTruck.setId(fleetTruck.getId());
+            int count = fleetTruckDao.updateById(queryFleetTruck);
+            return count > 0 ? HttpResult.ok("车队班组绑定成功！") : HttpResult.error("车队班组绑定失败！");
+        }
+    }
+    public HttpResult truckFleetEdit1(Long truckId, Long fleetId, Long entId) {
+        /**数据校验**/
+        if (fleetId == null) {
+            return HttpResult.ok("未选择车队班组！");
+        }
+        KwfFleetTruck queryFleetTruck = new KwfFleetTruck();
+        queryFleetTruck.setEntId(entId);
+        queryFleetTruck.setTruckId(truckId);
+        KwfFleetTruck fleetTruck = fleetTruckDao.findByTruckFleet(queryFleetTruck);
+
+        /**数据更新**/
+        queryFleetTruck.setFleetId(fleetId);
+        if (fleetTruck == null) {
+            int count = fleetTruckDao.insert(queryFleetTruck);
+            return count > 0 ? HttpResult.ok("车队班组绑定成功！") : HttpResult.error("车队班组绑定失败！");
+        } else {
+            queryFleetTruck.setId(fleetTruck.getId());
+            int count = fleetTruckDao.updateById(queryFleetTruck);
+            return count > 0 ? HttpResult.ok("车队班组绑定成功！") : HttpResult.error("车队班组绑定失败！");
+        }
+    }
     /**
      * @param truckId 车辆id
      * @param entId   企业id
@@ -2393,7 +2447,6 @@ public class KwfTruckService {
                     .eq(KwfTruck::getTruckNo, param.getTruckNo()));
             KwfTruck truck = new KwfTruck();
             truck.setTruckNo(param.getTruckNo());
-            truck.setEntId(param.getEntId());
             truck.setType(param.getType());
             truck.setEnergyType(param.getEnergyType());
             truck.setEev(param.getEev());
@@ -2414,10 +2467,10 @@ public class KwfTruckService {
             kwfTruckRepository.save(truck);
 
             // 车队班组绑定
-            truckFleetEdit(truck.getId(), param.getFleetId());
+            truckFleetEdit1(truck.getId(), param.getFleetId(),param.getEntId());
 
             // 车辆信息与企业关联信息
-            truckEntEdit(truck);
+            truckEntEdit1(truck,param.getEntId());
         } else {
             // 更新车辆
             KwfTruck truck = kwfTruckRepository.getById(param.getId());
@@ -2442,7 +2495,7 @@ public class KwfTruckService {
             kwfTruckRepository.updateById(truck);
 
             // 车队班组绑定
-            truckFleetEdit(truck.getId(), param.getFleetId());
+            truckFleetEdit1(truck.getId(), param.getFleetId(),param.getEntId());
         }
 
     }