bonus
/
gz_car_manage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 修改

This commit is contained in:
jiang 2025-07-16 14:33:25 +08:00
parent dae2283de0
commit 1d3fb7e535
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/resources/mappers/business/backstage/CarNeedPlanMapper.xml
View File

@ -73,9 +73,21 @@
<if test="applyType!=null and applyType!=''"> <if test="applyType!=null and applyType!=''">
and cpa.apply_type=#{applyType} and cpa.apply_type=#{applyType}
</if> </if>
<if test="status!=null and status!=''"> <choose>
<when test="status == 1">
AND cpa.status = 1 AND cpa.status_type != 1
</when>
<when test="status == 2">
AND cpa.status = 1 AND cpa.status_type = 1
</when>
<when test="status == 3">
AND cpa.status = 3
</when>
</choose>
<!-- <if test="status!=null and status!=''">
and cpa.status=#{status} and cpa.status=#{status}
</if> </if>-->
<if test="keyWord!=null and keyWord!=''"> <if test="keyWord!=null and keyWord!=''">
and ( and (
cpa.code like concat('%',#{keyWord},'%') or cpa.code like concat('%',#{keyWord},'%') or

4
src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
View File

@ -158,7 +158,7 @@
need_num needNum, dispatch_num dispatchNum,need_num-dispatch_num-IFNULL(outData.num,0) noDispatchNum, 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, 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_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=2,'已通过','已驳回') ) ) auditStatus
from car_plan_apply cpa from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id left join bm_project pro on pro.bid_id=cpa.pro_id
LEFT JOIN bm_project_type bpt on pro.TYPE_ID=bpt.ID LEFT JOIN bm_project_type bpt on pro.TYPE_ID=bpt.ID
@ -181,7 +181,7 @@
cpa.remark like concat('%',#{keyWord},'%') or cpa.remark like concat('%',#{keyWord},'%') or
if(cpa.type=1,'车辆','吊车') like concat('%',#{keyWord},'%') or if(cpa.type=1,'车辆','吊车') like concat('%',#{keyWord},'%') or
if(cpa.dispatch_num>0,'已派车',if(cpa.dispatch_status=0,'待审核','待派车')) like concat('%',#{keyWord},'%') or if(cpa.dispatch_num>0,'已派车',if(cpa.dispatch_status=0,'待审核','待派车')) like concat('%',#{keyWord},'%') or
if(cpa.dispatch_status=0,'待审核', if(cpa.dispatch_status=5,'待派车',if(cpa.dispatch_status=1,'已通过','已驳回') ) ) like concat('%',#{keyWord},'%') if(cpa.dispatch_status=0,'待审核', if(cpa.dispatch_status=5,'待派车',if(cpa.dispatch_status=2,'已通过','已驳回') ) ) like concat('%',#{keyWord},'%')
) )
</if> </if>