sczx_group/sczx_web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

手动结束订单；车辆报损审核

Browse Source
This commit is contained in:
19173159168
2025-08-25 22:24:05 +08:00
parent 2af3951b94
commit c946f7a344
15 changed files with 421 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-admin/src/main/resources/mapper/operation/ZcCarDamageMapper.xml
View File

@ -54,7 +54,6 @@
<if test="damageType != null and damageType != ''"> and a.damage_type = #{damageType}</if>
<if test="damageReason != null and damageReason != ''"> and a.damage_reason = #{damageReason}</if>
<if test="submitterName != null and submitterName != ''"> and a.submitter_name like concat('%', #{submitterName}, '%')</if>
<if test="submitTime != null "> and a.submit_time = #{submitTime}</if>
<if test="damageStatus != null "> and a.damage_status = #{damageStatus}</if>
<if test="auditorName != null and auditorName != ''"> and a.auditor_name like concat('%', #{auditorName}, '%')</if>
<if test="auditTime != null "> and a.audit_time = #{auditTime}</if>
@ -64,7 +63,13 @@
<if test="extend2 != null and extend2 != ''"> and a.extend2 = #{extend2}</if>
<if test="extend3 != null and extend3 != ''"> and a.extend3 = #{extend3}</if>
<if test="operatorId != null "> and c.operator_id = #{operatorId}</if>
<if test="storeName != null "> and c.store_name = #{storeName}</if>
<if test="storeName != null and storeName != ''"> and c.store_name = #{storeName}</if>
<if test="params.beginSubmitTime != null and params.beginSubmitTime != ''"><!-- 开始时间检索 -->
and date_format(a.submit_time,'%y%m%d') &gt;= date_format(#{beginSubmitTime},'%y%m%d')
</if>
<if test="params.endSubmitTime != null and params.endSubmitTime != ''"><!-- 结束时间检索 -->
and date_format(a.submit_time,'%y%m%d') &lt;= date_format(#{endSubmitTime},'%y%m%d')
</if>
</where>
</select>

2
ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml
View File

@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.beginFirstOrderTime != null and params.beginFirstOrderTime != ''"><!-- 开始时间检索 -->
and date_format(a.first_order_time,'%y%m%d') &gt;= date_format(#{params.beginFirstOrderTime},'%y%m%d')
</if>
<if test="params.enstoreNamedFirstOrderTime != null and params.endFirstOrderTime != ''"><!-- 结束时间检索 -->
<if test="params.endFirstOrderTime != null and params.endFirstOrderTime != ''"><!-- 结束时间检索 -->
and date_format(a.first_order_time,'%y%m%d') &lt;= date_format(#{params.endFirstOrderTime},'%y%m%d')
</if>
</where>

6
ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml
View File

@ -55,7 +55,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectZcOrderSubVo"/>
where suborder_id = #{suborderId}
</select>
<select id="selectZcOrderSub" parameterType="ZcOrderSub" resultMap="ZcOrderSubResult" >
<include refid="selectZcOrderSubVo"/>
WHERE order_id = #{orderId} and suborder_type = #{suborderType}
</select>
<insert id="insertZcOrderSub" parameterType="ZcOrderSub" useGeneratedKeys="true" keyProperty="suborderId">
insert into zc_order_sub
<trim prefix="(" suffix=")" suffixOverrides=",">