From fa456034d0c57bf3aefc926fb80c3e21112fde42 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 21 Jan 2025 10:37:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/app/controller/AppController.java      |  2 +-
 .../gzcar/business/app/service/AppServiceImpl.java  |  2 +-
 .../resources/mappers/business/app/AppMapper.xml    | 13 +++++++++++--
 .../mappers/business/backstage/CarCarMapper.xml     |  1 +
 .../business/backstage/CarContractMapper.xml        |  1 +
 .../mappers/business/backstage/CarDriverMapper.xml  |  1 +
 .../mappers/business/backstage/CarSupMapper.xml     |  1 +
 .../mappers/business/backstage/CarTypeMapper.xml    |  1 +
 8 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java b/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java
index 9fef2cb..02809f5 100644
--- a/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java
+++ b/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java
@@ -54,7 +54,7 @@ public class AppController{
     @DecryptAndVerify(decryptedClass = AppPlanVo.class)
     public PageInfo<AppPlanVo> getPlanList(EncryptedReq<AppPlanVo> dto) {
         PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
-        List<AppPlanVo> list = service.getPlanList(dto.getData());;
+        List<AppPlanVo> list = service.getPlanList(dto.getData());
         return new PageInfo<>(list);
     }
 
diff --git a/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java b/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java
index bd6eee3..5135c9c 100644
--- a/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java
+++ b/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java
@@ -120,7 +120,7 @@ public class AppServiceImpl implements AppService{
             }
             return ServerResponse.createSuccess(outIds);
             }catch (Exception e){
-        log.error(e.toString(),e);
+                 log.error(e.toString(),e);
         }
         return ServerResponse.createSuccess(new ArrayList<>());
 
diff --git a/src/main/resources/mappers/business/app/AppMapper.xml b/src/main/resources/mappers/business/app/AppMapper.xml
index a6532e2..fc80c8c 100644
--- a/src/main/resources/mappers/business/app/AppMapper.xml
+++ b/src/main/resources/mappers/business/app/AppMapper.xml
@@ -20,6 +20,7 @@
                       cpa.code like concat('%',#{keyWord},'%')
             )
         </if>
+        order by  cpa.create_time DESC
     </select>
     <select id="getAuditList" resultType="com.bonus.gzcar.business.app.entity.AppPlanVo">
         select cpo.id outId ,cpo.apply_id planId ,pro.name proName ,cs.name  supName ,cpa.type,cpo.status,cpa.code,
@@ -48,11 +49,12 @@
                         and cpo.status !='0'
                     </if>
             </if>
+        order by cpo.create_time desc
     </select>
     <select id="getPlanDetails" resultType="com.bonus.gzcar.business.app.entity.AppPlanVo">
         SELECT cpa.id planId,code,cpa.type,cpa.pro_id proId ,cpa.project_content projectContent,cpa.project_part projectPart,
                cpa.need_time needDay,cpa.need_num needNum,cpa.dispatch_num dispatchNum,cpa.remark,pro.name proName,
-        	IF( cpa.type=1,'运输车辆','吊车')   typeName
+        	IF( cpa.type=1,'车辆','吊车')   typeName
         from car_plan_apply cpa
          left join bm_project pro on pro.bid_id=cpa.pro_id
         WHERE cpa.id=#{planId}
@@ -93,7 +95,14 @@
     <select id="getAuditDetails" resultType="com.bonus.gzcar.business.app.entity.AppPlanVo">
             select  id outId,status
                 FROM car_plan_out
-                WHERE apply_id=#{planId}
+            WHERE 1=1
+                <if test="planId!=null and planId!=''">
+                     and  apply_id=#{planId}
+                </if>
+                <if test="outId!=null and outId!=''">
+                    and  id=#{outId}
+                </if>
+
     </select>
 
 
diff --git a/src/main/resources/mappers/business/backstage/CarCarMapper.xml b/src/main/resources/mappers/business/backstage/CarCarMapper.xml
index d75f09f..f9f383d 100644
--- a/src/main/resources/mappers/business/backstage/CarCarMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarCarMapper.xml
@@ -52,6 +52,7 @@
         <if test="supName!=null and supName!=''">
             and  cs.name like concat('%',#{supName},'%')
         </if>
+            order by csi.create_time desc
     </select>
     <select id="getCarSupDetails" resultType="com.bonus.gzcar.business.backstage.entity.CarCarVo">
         select csi.id,csi.car_num carNum,csi.brand,csi.type,csi.ton,IFNULL(file1.num,0) xyNum,
diff --git a/src/main/resources/mappers/business/backstage/CarContractMapper.xml b/src/main/resources/mappers/business/backstage/CarContractMapper.xml
index e961133..daf547e 100644
--- a/src/main/resources/mappers/business/backstage/CarContractMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarContractMapper.xml
@@ -167,6 +167,7 @@
             <if test="type!=null and type!=''">
                 and   cc.type=#{type}
             </if>
+        order by cc.create_time desc
     </select>
     <select id="getSupList" resultType="com.bonus.gzcar.business.backstage.entity.CarContractSupVo">
         select ccr.sup_id supId,csp.name supName,ccr.ratio ,ccr.ratio_money ratioMoney,
diff --git a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml
index 648d704..755f954 100644
--- a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml
@@ -43,6 +43,7 @@
         <if test="supName!=null and supName!=''">
             and   cs.name like concat('%',#{supName},'%')
         </if>
+            ORDER BY   cdi.create_time desc
     </select>
     <select id="getDriverDetails" resultType="com.bonus.gzcar.business.backstage.entity.CarDriverVo">
         select cdi.id, cdi.name, cdi.phone, cdi.sup_id supId,cs.name supName
diff --git a/src/main/resources/mappers/business/backstage/CarSupMapper.xml b/src/main/resources/mappers/business/backstage/CarSupMapper.xml
index a9fe7bd..fef0519 100644
--- a/src/main/resources/mappers/business/backstage/CarSupMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarSupMapper.xml
@@ -37,6 +37,7 @@
                     and name like concat('%',#{name},'%')
             </if>
         </where>
+            order by  create_time desc
     </select>
     <select id="getCarSupByName" resultType="java.lang.Integer">
         select  count(1)
diff --git a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
index 3924029..da0f1b4 100644
--- a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
@@ -57,6 +57,7 @@
                 and    cmt.is_active=#{isActive}
             </if>
         </where>
+            order by  cmt.create_time desc
     </select>
     <select id="getNumByName" resultType="java.lang.Integer">
                 select count(1)