From a508ea94371670d9584d255ec3852d21bd082199 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 8 Jul 2025 11:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backstage/entity/CarNeedPlanVo.java         |  2 ++
 .../security/UserAuthenticationProvider.java    |  4 ++--
 .../business/backstage/DispatchCarMapper.xml    |  1 +
 .../business/backstage/SupDispatchCarMapper.xml | 17 ++++++++++++++---
 4 files changed, 19 insertions(+), 5 deletions(-)

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 65df8fb..6388c9a 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
@@ -184,5 +184,7 @@ public class CarNeedPlanVo extends ParentVo {
      */
     private String delFile;
 
+    private String outId;
+
 
 }
diff --git a/src/main/java/com/bonus/gzcar/manager/security/UserAuthenticationProvider.java b/src/main/java/com/bonus/gzcar/manager/security/UserAuthenticationProvider.java
index 0d86443..7e3b976 100644
--- a/src/main/java/com/bonus/gzcar/manager/security/UserAuthenticationProvider.java
+++ b/src/main/java/com/bonus/gzcar/manager/security/UserAuthenticationProvider.java
@@ -41,11 +41,11 @@ public class UserAuthenticationProvider implements AuthenticationProvider {
         if (userInfo == null) {
             throw new UsernameNotFoundException("用户名不存在");
         }
-       /* //密码加密
+        //密码加密
         String daya=  Md5Utils.createPwdEncrypt(userName,password.toUpperCase(),userInfo.getSalt());
         if(!Md5Utils.validatePasswordBast64(daya, userInfo.getPassword())){
             throw new BadCredentialsException("密码不正确");
-        }*/
+        }
 
 
         // 我们还要判断密码是否正确，这里我们的密码使用BCryptPasswordEncoder进行加密的
diff --git a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
index d155333..e45e84d 100644
--- a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
+++ b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
@@ -137,6 +137,7 @@
         </if>
             order by  cpa.create_time desc
     </select>
+
     <!--计划-->
     <select id="getPlanList" resultType="com.bonus.gzcar.business.backstage.entity.CarNeedPlanVo">
         select  cpa.id,	cpa.code,cpas.sup_id supId,cpas.contract_id  contractId,cpa.type
diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
index 57f57f1..bcabe11 100644
--- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
+++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
@@ -149,7 +149,7 @@
         left join(
         SELECT sum(dispatch_num) num ,apply_id
         from  car_plan_out
-        WHERE `status`=0
+        WHERE (`status` = 0 OR `status` = 1 )
         GROUP BY apply_id
         ) outData on outData.apply_id=cpa.id
         where   cpa.status_type=1
@@ -180,16 +180,27 @@
         ORDER BY  cpa.create_time desc
     </select>
     <select id="getDetailsList" resultType="com.bonus.gzcar.business.backstage.entity.CarNeedPlanDetailVo">
-        select cpd.id,  cpd.apply_id planId ,cpd.model_id modelId,cpd.need_day needDay,cpd.need_num needNum,
+        select cpd.id,  cpd.apply_id planId ,cpd.model_id modelId,cpd.need_day needDay,cpd.need_num - IFNULL( outData.num, 0 ) needNum,
                cpd.remark,cpd.plan_type planType,cmti.type,cmti.name,cmti.model ,cmti.unit,cpas.sup_id supId,
                cct.is_out_set isOutSet,cct.is_driver_set isDriverSet,cpas.contract_id contractId,cpd.model_id modelId
         from car_plan_details cpd
+                 LEFT JOIN car_plan_apply cpa on cpa.id=cpd.apply_id
                  left join car_plan_out cpo on cpo.apply_id=cpd.apply_id
                  left join car_plan_out_details cpod on cpod.apply_id=cpo.apply_id and cpd.model_id=cpod.model_id
                  left join car_plan_apply_sup cpas on cpd.apply_id=cpas.apply_id
                  LEFT JOIN car_ma_type_info cmti  on cpd.model_id=cmti.id
                  LEFT JOIN car_contract_type cct on cct.model_id=cpd.model_id and  cct.sup_id=cpas.sup_id and cpas.contract_id=cct.contract_id
-        where    cpd.apply_id=#{id}  and cpod.id is null
+                 LEFT JOIN ( SELECT
+                                 sum( cpo.dispatch_num ) num,
+                                 cpod.model_id as modelId,
+                                 cpo.apply_id
+                             FROM
+                                 car_plan_out cpo
+                                     LEFT JOIN car_plan_out_details cpod on cpod.out_id=cpo.id and cpod.apply_id=cpo.apply_id
+                             GROUP BY
+                                 cpo.apply_id,cpod.model_id ) outData ON outData.apply_id = cpa.id and outData.modelId=cpd.model_id
+        where    cpd.apply_id=#{id}  and cpa.need_num>IFNULL(cpa.dispatch_num,0)
+        GROUP BY cpd.id
     </select>
     <select id="getContractPriceList" resultType="com.bonus.gzcar.business.backstage.entity.PriceVo">
         select cct.id , cct.gls_ks glsStart,cct.gls_js glsEnd,cct.gl_sj_price price,