bug修改

src/main/java/com/bonus/gzcar/business/backstage/entity/CarDriverVo.java

@@ -40,7 +40,7 @@ public class CarDriverVo extends ParentVo {
     /**
      * 其他证数量
      */
-    @Excel(name = "其他证", width = 10.0, orderNum = "5")
+    @Excel(name = "其他操作证", width = 10.0, orderNum = "5")
     private  int otherNum;
     /**
      * 图片类型

src/main/java/com/bonus/gzcar/business/backstage/mapper/DispatchCarMapper.java

@@ -135,4 +135,11 @@ public interface DispatchCarMapper {
      * @return
      */
     Integer validateSltNum(@Param("planId") String id);
+
+    /**
+     * 查询
+     * @param data
+     * @return
+     */
+    int getPlanDispayNum(CarNeedPlanVo data);
 }

src/main/java/com/bonus/gzcar/business/backstage/service/CarDriverServiceImpl.java

@@ -113,25 +113,25 @@ public class CarDriverServiceImpl implements CarDriverService{
 
             int num=mapper.addDriverData(driverVo);
             if(num>0){
-                if(otherFiles.length>0){
+                if(sfz1Files.length>0){
                     List<FileUploadVo> fileList=uploadService.uploadImage(sfz1Files,driverVo.getId(),"car_driver_info","2");
                     if(fileList.size()!=sfz1Files.length){
                         return  ServerResponse.createErroe("身份证正面照片上传失败");
                     }
                 }
-                if(otherFiles.length>0){
+                if(sfz2Files.length>0){
                     List<FileUploadVo> fileList=uploadService.uploadImage(sfz2Files,driverVo.getId(),"car_driver_info","3");
                     if(fileList.size()!=sfz2Files.length){
                         return  ServerResponse.createErroe("身份证反面照片上传失败");
                     }
                 }
-                if(otherFiles.length>0){
+                if(jsz1Files.length>0){
                     List<FileUploadVo> fileList=uploadService.uploadImage(jsz1Files,driverVo.getId(),"car_driver_info","4");
                     if(fileList.size()!=jsz1Files.length){
                         return  ServerResponse.createErroe("驾驶证正面照片上传失败");
                     }
                 }
-                if(otherFiles.length>0){
+                if(jsz2Files.length>0){
                     List<FileUploadVo> fileList=uploadService.uploadImage(jsz2Files,driverVo.getId(),"car_driver_info","5");
                     if(fileList.size()!=jsz2Files.length){
                         return  ServerResponse.createErroe("驾驶证反面照片上传失败");
@@ -279,13 +279,13 @@ public class CarDriverServiceImpl implements CarDriverService{
                         return  ServerResponse.createErroe("身份证反面照片上传失败");
                     }
                 }
-                if(jsz2Files.length>0){
+                if(jsz1Files.length>0){
                     List<FileUploadVo> fileList=uploadService.uploadImage(jsz1Files,driverVo.getId(),"car_driver_info","4");
                     if(fileList.size()!=jsz1Files.length){
                         return  ServerResponse.createErroe("驾驶证正面照片上传失败");
                     }
                 }
-                if(otherFiles.length>0){
+                if(jsz2Files.length>0){
                     List<FileUploadVo> fileList=uploadService.uploadImage(jsz2Files,driverVo.getId(),"car_driver_info","5");
                     if(fileList.size()!=jsz2Files.length){
                         return  ServerResponse.createErroe("驾驶证反面照片上传失败");

src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java

@@ -195,6 +195,12 @@ public class DispatchCarServiceImpl implements DispatchCarService{
             if(jsNum!=null && jsNum>0){
                 return  ServerResponse.createErroe("该计划已被结算,不允许修改");
             }
+            int dispatNum=mapper.getPlanDispayNum(data);
+            if( dispatNum>0){
+                return  ServerResponse.createErroe("该计划已派车、不允许重新分配");
+            }
+
+
             //吊车需要验证 供应商合同型号
             if(2==data.getType()){
                 List<CarNeedPlanDetailVo> detailVos=mapper.getContractSupInfo(data);

src/main/resources/mappers/business/backstage/DispatchCarMapper.xml

@@ -119,7 +119,7 @@
         select  cpa.id,	cpa.code,cpas.sup_id supId,cpas.contract_id  contractId,cpa.type
         from car_plan_apply cpa
         left join car_plan_apply_sup cpas on cpa.id=cpas.apply_id
-        where   cpa.status_type=1  and dispatch_status!=2  and  cpas.apply_id is not null
+        where   cpa.status_type=1  and dispatch_status!=2  and  cpas.apply_id is not null  and cpa.dispatch_num=0
         <if test="proId!=null and proId!=''">
             and  cpa.pro_id =#{proId}
         </if>
@@ -212,5 +212,10 @@
         from  car_slt_plan
         where plan_id=#{planId}
     </select>
+    <select id="getPlanDispayNum" resultType="java.lang.Integer">
+        select  dispatch_num dispatchNum
+        FROM car_plan_apply
+        where id=#{id}
+    </select>
 
 </mapper>