From 49bfdcf8d94250b869aa44dbc7e69dbb4b977f6a Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Wed, 22 Jan 2025 09:38:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E5=92=8C?=
 =?UTF-8?q?=E8=BF=9B=E5=87=BA=E5=9C=BA=E9=87=91=E9=A2=9D=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gzcar/business/backstage/mapper/CarTypeMapper.java    | 7 +++++++
 .../business/backstage/service/CarTypeServiceImpl.java    | 8 ++++++++
 .../mappers/business/backstage/CarTypeMapper.xml          | 7 +++++++
 .../mappers/business/backstage/SupDispatchCarMapper.xml   | 4 ++--
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarTypeMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarTypeMapper.java
index 62f6f1d..fbc78c4 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarTypeMapper.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/CarTypeMapper.java
@@ -75,4 +75,11 @@ public interface CarTypeMapper {
      * @return
      */
     List<CarProVo> getProListSelected(CarProVo data);
+
+    /**
+     * 查询合同下
+     * @param data
+     * @return
+     */
+    int getNumByContract(CarTypeVo data);
 }
diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarTypeServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarTypeServiceImpl.java
index 459d9c4..d728c56 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarTypeServiceImpl.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarTypeServiceImpl.java
@@ -74,6 +74,10 @@ public class CarTypeServiceImpl implements CarTypeService{
     @Override
     public ServerResponse updateTypeData(CarTypeVo data) {
         try{
+            int htNun=mapper.getNumByContract(data);
+            if(htNun>0){
+                return ServerResponse.createErroe("该类型存在合同不允许修改");
+            }
             String userId= UserUtil.getLoginUser().getUserId()+"";
             data.setUpdater(userId);
             String level=data.getLevel();
@@ -109,6 +113,10 @@ public class CarTypeServiceImpl implements CarTypeService{
     @Override
     public ServerResponse deleteType(CarTypeVo data) {
      try{
+         int htNun=mapper.getNumByContract(data);
+         if(htNun>0){
+             return ServerResponse.createErroe("改类型存在合同不允许删除");
+         }
          int childNum=mapper.getChildNum(data);
          if(childNum>0){
              return ServerResponse.createSuccess("改节点下存在子节点不允许删除",data);
diff --git a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
index 4d1c208..73fbcde 100644
--- a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
@@ -112,4 +112,11 @@
             from bm_project
             where is_active=1
     </select>
+    <select id="getNumByContract" resultType="java.lang.Integer">
+        SELECT count(1)
+        from car_contract_type cct
+                 left join car_contract cc on cc.id=cct.contract_id
+        where cc.is_active=1 and  cct.model_id=#{id}
+
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
index f57efbb..d21fa3a 100644
--- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
+++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
@@ -29,7 +29,7 @@
         dc_unit,es_cost,car_out_id,day_or_m,remark,car_num
         )values (#{outId},#{planId},#{modelId},#{planType},#{contractId},#{supId},#{carId},#{goodsName},
                  #{gls},#{startAddress},#{endAddress},#{priceId},#{glsPrice},#{glsMoney},#{useAddress},
-                 #{planDay},#{driverUserId},#{operaUserId},#{dayPrice},#{monthPrice},#{jcGls},#{jcGlsPrice},#{dcMoney},#{dcUnit}
+                 #{planDay},#{driverUserId},#{operaUserId},#{dayPrice},#{monthPrice},#{jcGls},#{jcMoney},#{dcMoney},#{dcUnit}
             ,#{cost},#{carOutId},#{isDayOrMonth},#{remark},#{carNum})
     </insert>
     <insert id="addDispatchCarDetailsDataRecord"  keyProperty="detailsId" useGeneratedKeys="true">
@@ -98,7 +98,7 @@
         need_num needNum,   dispatch_num dispatchNum,need_num-dispatch_num-IFNULL(outData.num,0) noDispatchNum,
         cpa.apply_type applyType,	cpa.status_type statusType,cpa.user_name userName,
         if(cpa.dispatch_num>0,'已派车',if(cpa.dispatch_status=0,'待审核','待派车')) statusName,
-        if(cpa.dispatch_status=0,'待审核', if(cpa.dispatch_status=5,'待派车',if(cpa.dispatch_status=1,'已驳回','已驳回') ) ) auditStatus
+        if(cpa.dispatch_status=0,'待审核', if(cpa.dispatch_status=5,'待派车',if(cpa.dispatch_status=1,'已通过','已驳回') ) ) auditStatus
         from car_plan_apply cpa
         left join bm_project pro on pro.bid_id=cpa.pro_id
         left join car_plan_apply_sup cpas on cpa.id=cpas.apply_id