From c310e85a79c69e711076c7a246205d8cfe45ac75 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 27 Dec 2022 09:23:04 +0800
Subject: [PATCH] 添加车辆变更审核流程
---
src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml b/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml
index 7221387..f0cfe6a 100644
--- a/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml
+++ b/src/main/java/org/springblade/modules/application/mapper/ApplicationMapper.xml
@@ -6,18 +6,12 @@
<resultMap id="applicationResultMap" type="org.springblade.modules.application.vo.ApplicationVO">
<result column="id" property="id"/>
<result column="no" property="no"/>
- <result column="basic_info_id" property="basicInfoId"/>
- <result column="scheme_id" property="schemeId"/>
- <result column="plan_id" property="planId"/>
- <result column="goods_id" property="goodsId"/>
- <result column="car_id" property="carId"/>
<result column="road_license_url" property="roadLicenseUrl"/>
<result column="id_license_url" property="idLicenseUrl"/>
<result column="license_url" property="licenseUrl"/>
<result column="skeleton_url" property="skeletonUrl"/>
<result column="attorney_url" property="attorneyUrl"/>
<result column="suggestion" property="suggestion"/>
- <result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
@@ -40,10 +34,39 @@
enterprise.enterprise_name,
enterprise.legal_person
from sys_application app
- LEFT JOIN sys_application_car car ON car.application_id = app.id
+ LEFT JOIN sys_application_car car ON car.application_id = app.id AND car.status = 1
LEFT JOIN sys_application_goods goods ON goods.application_id = app.id
LEFT JOIN sys_enterprise enterprise ON enterprise.user_id = app.user_id AND enterprise.is_deleted = 0
where app.is_deleted = 0
+ <if test="application.userId != null and application.userId !='' ">
+ AND app.user_id = #{application.userId}
+ </if>
+ ORDER BY app.no DESC
+ </select>
+ <select id="getMaxNoEntity" resultType="org.springblade.modules.application.entity.ApplicationEntity">
+ SELECT * from sys_application where is_deleted = 0 ORDER BY create_time DESC LIMIT 1
+ </select>
+ <select id="getByNo" resultType="org.springblade.modules.application.entity.ApplicationEntity">
+ SELECT * FROM sys_application WHERE is_deleted = 0 AND no = #{no}
+ </select>
+ <select id="getAll" resultType="org.springblade.modules.application.vo.ApplicationVO">
+ SELECT app.*,basic.end_pass_time,
+ (
+ CASE
+ WHEN car.trailer_license IS NOT NULL
+ THEN CONCAT( car.car_license, car.trailer_license )
+ ELSE car.car_license
+ END) licensePlate
+ FROM sys_application app
+ LEFT JOIN sys_application_basic_info basic ON basic.application_id = app.id
+ LEFT JOIN sys_application_car car ON car.application_id = app.id AND car.status = 1
+ WHERE app.is_deleted = 0
+ <if test="application.userId !=null and application.userId !=''">
+ AND app.user_id = #{application.userId}
+ </if>
+ <if test="application.status !=null and application.status !=''">
+ AND app.status = #{application.status}
+ </if>
</select>
--
Gitblit v1.9.3