From 3712da98c8ec22274a49bd40e3039f370d9efdbb Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 15 Jul 2025 20:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SupDispatchCarController.java  | 23 +++++++++++++
 .../backstage/entity/CarNeedPlanVo.java       |  2 ++
 .../mapper/SupDispatchCarMapper.java          | 14 ++++++++
 .../service/SupDispatchCarService.java        | 14 ++++++++
 .../service/SupDispatchCarServiceImpl.java    | 32 +++++++++++++++++++
 .../business/system/entity/FileUploadVo.java  |  2 ++
 .../backstage/SupDispatchCarMapper.xml        | 20 ++++++++++--
 .../business/system/FileUploadMapper.xml      |  2 +-
 8 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java
index 0984724..9b4b08a 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java
@@ -499,4 +499,27 @@ public class SupDispatchCarController {
         return  service.deleteFile(dto.getData());
     }
 
+
+    /**
+     *  审核附件
+     * @param dto
+     * @return
+     */
+    @PostMapping("examine")
+    @DecryptAndVerify(decryptedClass = CarPlanOutVo.class)
+    public ServerResponse examine(EncryptedReq<CarPlanOutVo> dto) {
+        return  service.examine(dto.getData());
+    }
+
+    /**
+     *  提交审核
+     * @param dto
+     * @return
+     */
+    @PostMapping("toCheck")
+    @DecryptAndVerify(decryptedClass = CarPlanOutVo.class)
+    public ServerResponse toCheck(EncryptedReq<CarPlanOutVo> dto) {
+        return  service.toCheck(dto.getData());
+    }
+
 }
diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java
index 966c2b5..cf9be7c 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java
@@ -191,4 +191,6 @@ public class CarNeedPlanVo extends ParentVo {
      */
     private String licensePlate;
 
+    private String fileStatus;
+
 }
diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java
index ebad440..9355b96 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java
@@ -205,4 +205,18 @@ public interface SupDispatchCarMapper {
      * @return
      */
     int deleteFile(CarPlanOutVo data);
+
+    /**
+     * 审核
+     * @param data
+     * @return
+     */
+    int examine(CarPlanOutVo data);
+
+    /**
+     * 提交审核
+     * @param data
+     * @return
+     */
+    int toCheck(CarPlanOutVo data);
 }
diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarService.java b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarService.java
index 79e8543..aa013da 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarService.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarService.java
@@ -100,4 +100,18 @@ public interface SupDispatchCarService {
      * @return
      */
     ServerResponse deleteFile(CarPlanOutVo data);
+
+    /**
+     * 审核
+     * @param data
+     * @return
+     */
+    ServerResponse examine(CarPlanOutVo data);
+
+    /**
+     * 派车审核
+     * @param data
+     * @return
+     */
+    ServerResponse toCheck(CarPlanOutVo data);
 }
diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java
index e3ae12d..df81d92 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java
@@ -642,5 +642,37 @@ public class SupDispatchCarServiceImpl implements SupDispatchCarService {
         }
     }
 
+    @Override
+    public ServerResponse examine(CarPlanOutVo data) {
+        try {
+            data.setId(data.getId()+"-dh");
+            int res = mapper.examine(data);
+            if (res > 0){
+                return ServerResponse.createSuccess("审核成功", "审核成功");
+            } else {
+                return ServerResponse.createErroe("审核失败");
+            }
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            return ServerResponse.createErroe("审核失败");
+        }
+    }
+
+    @Override
+    public ServerResponse toCheck(CarPlanOutVo data) {
+        try {
+            data.setId(data.getId()+"-dh");
+            int res = mapper.toCheck(data);
+            if (res > 0){
+                return ServerResponse.createSuccess("提交成功", "提交成功");
+            } else {
+                return ServerResponse.createErroe("提交失败");
+            }
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            return ServerResponse.createErroe("提交失败");
+        }
+    }
+
 
 }
diff --git a/src/main/java/com/bonus/gzcar/business/system/entity/FileUploadVo.java b/src/main/java/com/bonus/gzcar/business/system/entity/FileUploadVo.java
index f689db7..938912c 100644
--- a/src/main/java/com/bonus/gzcar/business/system/entity/FileUploadVo.java
+++ b/src/main/java/com/bonus/gzcar/business/system/entity/FileUploadVo.java
@@ -54,5 +54,7 @@ public class FileUploadVo {
      */
     private String type;
 
+    private String status;
+
 
 }
diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
index cfe3987..3b46afb 100644
--- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
+++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
@@ -95,6 +95,15 @@
         WHERE id= #{planId}
     </update>
 
+    <update id="examine">
+        update bm_file_upload set  status=#{status}
+        WHERE own_id= #{id} and model_table='car_plan_out' and type='到货确认单'
+    </update>
+    <update id="toCheck">
+        update bm_file_upload set  status=0
+        WHERE own_id= #{id} and model_table='car_plan_out' and type='到货确认单'
+    </update>
+
     <delete id="delCarPlanOutData">
         delete
         from car_plan_out
@@ -307,12 +316,19 @@
     <select id="getOutPageList" resultType="com.bonus.gzcar.business.backstage.entity.CarNeedPlanVo">
         select cpo.id,cpo.type,cpo.apply_id planId,cpa.code ,cpa.user_name userName ,
         cpa.create_time applyTime ,cpa.remark,cpo.out_time outTime ,cpo.dispatch_num dispatchNum,cpo.status,
-        IFNULL(file.num ,0) fileNum,pro.name proName
+        IFNULL(file.num ,0) fileNum,pro.name proName,
+        CASE
+        WHEN file.status IS NULL THEN '待上传'
+        WHEN file.status = 0 THEN '待审核'
+        WHEN file.status = 1 THEN '审核通过'
+        WHEN file.status = 2 THEN '审核驳回'
+        ELSE ''
+        END AS fileStatus
         FROM car_plan_out cpo
         left join car_plan_apply cpa on cpo.apply_id=cpa.id
         left join bm_project pro on pro.bid_id=cpa.pro_id
         left join(
-        SELECT count(1) num ,own_id id,type  from bm_file_upload
+        SELECT count(1) num ,`status`,own_id id,type  from bm_file_upload
         where model_table='car_plan_out'   AND type='到货确认单'
         GROUP BY  own_id
         )file on file.id=concat(cpo.id,'-dh')
diff --git a/src/main/resources/mappers/business/system/FileUploadMapper.xml b/src/main/resources/mappers/business/system/FileUploadMapper.xml
index ac0525d..cc126b1 100644
--- a/src/main/resources/mappers/business/system/FileUploadMapper.xml
+++ b/src/main/resources/mappers/business/system/FileUploadMapper.xml
@@ -31,7 +31,7 @@
         model_table,
         own_id  ownId ,
         suffix,type,
-        file_type fileType,create_name  createName
+        file_type fileType,create_name  createName,`status`
         from bm_file_upload
         where own_id=#{ownId} and model_table=#{modelTable}
         <if test="type!=null and type!=''">