工程关联修改

This commit is contained in:
syruan 2026-01-06 13:23:36 +08:00
parent 7ef5a82adb
commit 3c1e23edef
9 changed files with 66 additions and 55 deletions

View File

@ -10,7 +10,7 @@
cpa.dispatch_num dispatchNum ,pro.name proName,
IFNULL(cs.name,'-') supName,if(cpa.dispatch_num>0,'已派车',if(cpa.`status`=0,'待审核','待派车')) status
from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
left join car_plan_apply_sup cpas on cpa.id=cpas.apply_id
left join car_supplier cs on cs.id=cpas.sup_id
where cpa.status_type=1
@ -32,7 +32,7 @@
END statusName
from car_plan_out cpo
left join car_plan_apply cpa on cpa.id=cpo.apply_id
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
left join car_supplier cs on cs.id=cpo.sup_id
where 1=1
<if test="keyWord!=null and keyWord!=''">
@ -56,7 +56,7 @@
cpa.need_time needDay,cpa.need_num needNum,cpa.dispatch_num dispatchNum,cpa.remark,pro.name proName,
IF( cpa.type=1,'车辆','吊车') typeName
from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
WHERE cpa.id=#{planId}
</select>
<select id="getPlanDetailsList" resultType="com.bonus.gzcar.business.app.entity.AppDetails">

View File

@ -78,7 +78,7 @@
left join car_plan_out cpo on cpa.id=cpo.apply_id AND cpo.status=1
left join car_plan_apply_sup cpas on cpas.apply_id=cpa.id
left join car_supplier cs on cpas.sup_id=cs.id
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
where cpa.dispatch_num>0 and cpas.sup_id=#{supId} and csp.id is null
<if test="code!=null and code!=''">
and cpa.`code` like concat('%',#{code},'%')
@ -127,7 +127,7 @@
)csp ON csp.out_id=cpo.id
left join car_plan_apply cpa on cpo.apply_id=cpa.id
LEFT JOIN car_supplier cs on cpo.sup_id=cs.id
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
where cpo.sup_id=#{supId} and cpo.status=1
<if test="keyWord!=null and keyWord!=''">
and (
@ -161,7 +161,7 @@
from car_plan_apply cpa
left join car_plan_apply_sup cpas on cpa.id = cpas.apply_id
left join car_supplier cs on cs.id = cpas.sup_id
left join bm_project pro on pro.bid_id = cpa.pro_id
left join bm_project pro on pro.id = cpa.pro_id
left join (select sum(money) money, apply_id
from car_plan_out
GROUP BY apply_id) my on my.apply_id = cpa.id

View File

@ -68,7 +68,7 @@
if(cpa.type=1,'车辆','吊车') typeName ,
cpa.apply_type applyType, cpa.status_type statusType,cpa.user_name userName
from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id = cpa.pro_id
where 1=1
<if test="applyType!=null and applyType!=''">
and cpa.apply_type=#{applyType}
@ -135,7 +135,7 @@
cpa.route_point as routePoint
from car_plan_apply cpa
LEFT JOIN car_plan_out cpo ON cpo.apply_id = cpa.id
left join bm_project pro on pro.bid_id = cpa.pro_id
left join bm_project pro on pro.id = cpa.pro_id
where cpa.id = #{id}
</select>
<select id="getNeedDetailInfo" resultType="com.bonus.gzcar.business.backstage.entity.CarNeedPlanDetailVo">

View File

@ -32,7 +32,7 @@
if(cpa.type=1,'车辆','吊车') typeName ,
cpa.apply_type applyType, cpa.status_type statusType,cpa.user_name userName
from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
where 1=1 and cpa.apply_type=0
<if test="auditStatus == 1">
and status = 1 and status_type != 1
@ -74,7 +74,7 @@
if(cpa.type=1,'车辆','吊车') typeName ,
cpa.apply_type applyType, cpa.status_type statusType,cpa.user_name userName
from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
where cpa.apply_type=0 and cpa.id = #{id}
</select>
<select id="getCarAuditDetails" resultType="com.bonus.gzcar.business.backstage.entity.CarNeedPlanVo">
@ -85,7 +85,7 @@
if(cpa.type=1,'车辆','吊车') typeName ,
cpa.apply_type applyType, cpa.status_type statusType,cpa.user_name userName
from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
where cpa.id=#{id}
</select>
<select id="getNeedDetailInfo" resultType="com.bonus.gzcar.business.backstage.entity.CarNeedPlanDetailVo">

View File

@ -16,7 +16,7 @@
left join car_slt_apply csa on csa.id=csp.slt_id
left join car_plan_apply cpa on cpo.apply_id=cpa.id
LEFT JOIN car_supplier cs on cpo.sup_id=cs.id
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
where 1=1 and cpo.status=2 and cpo.file_status=1
<if test="supName!=null and supName!=''">
and cs.name like concat('%',#{supName},'%')
@ -80,7 +80,7 @@
GROUP BY cpo.apply_id
) cpo on cpo.apply_id=cpas.apply_id
left join car_slt_plan csp on csp.plan_id=cpas.apply_id
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
where cpa.status_type=1
<if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
and DATE_FORMAT(cpa.create_time,'%Y-%m-%d')
@ -119,7 +119,7 @@
from car_slt_details csd
GROUP BY csd.plan_id
) csp on csp.id=cpa.id
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
WHERE pro.bmname=#{bmname} and cpa.status_type=1
<if test="proName!=null and proName!=''">
and pro.name like concat('%',#{proName},'%')
@ -144,7 +144,7 @@
GROUP BY csd.out_id
) csp on csp.id=cpo.id
LEFT JOIN car_supplier cs on cpo.sup_id=cs.id
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
where cpa.pro_id=#{proId} and cpa.status_type=1
<if test="code!=null and code!=''">
and cpa.`code` like concat('%',#{code},'%')
@ -159,7 +159,7 @@
<select id="getComNum" resultType="java.lang.Integer">
select count(distinct pro.bmname)
from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
where cpa.status_type=1
</select>
<select id="getProNumById" resultType="java.lang.Integer">

View File

@ -57,16 +57,17 @@
order by cmt.create_time desc
</select>
<select id="getNumByName" resultType="java.lang.Integer">
select count(1)
from car_ma_type
where name=#{name} and level=#{level}
<if test="parentId!=null and parentId!=''">
and parent_id=#{parentId}
</if>
<if test="id!=null and id!=''">
and id!=#{id}
</if>
select count(1)
from car_ma_type
where name=#{name} and level=#{level}
<if test="parentId!=null and parentId!=''">
and parent_id=#{parentId}
</if>
<if test="id!=null and id!=''">
and id!=#{id}
</if>
</select>
<select id="getCarTypeById" resultType="com.bonus.gzcar.business.backstage.entity.CarTypeVo">
select if(cmt.id=1,0, cmt.id) id ,cmt.parent_id parentId,cmt.`name` title,cmt.is_active isActive,
cmt.storage_num num,cmt.unit_name unit,cmt.remark,cmt1.name ,cmt2.name type,cmt.`level`
@ -75,11 +76,13 @@
left join car_ma_type cmt2 on cmt1.parent_id=cmt2.id
where cmt.id=#{id}
</select>
<select id="getChildNum" resultType="java.lang.Integer">
select count(1)
from car_ma_type
where parent_id=#{id}
</select>
<select id="getCarSelected" resultType="com.bonus.gzcar.business.backstage.entity.CarTypeVo">
select cmt.id ,cmt.parent_id parentId,cmt.`name` model ,cmt.is_active isActive,
cmt.unit_name unit,cmt1.name ,cmt2.name type,cmt.`level`
@ -104,29 +107,37 @@
</if>
and cmt.is_active=1
</select>
<select id="getProListSelected" resultType="com.bonus.gzcar.business.backstage.entity.CarProVo">
select name,bid_id id
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 id="getProListSelected" resultType="com.bonus.gzcar.business.backstage.entity.CarProVo">
select
name, ID as id
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>
<select id="getExist" resultType="com.bonus.gzcar.business.backstage.entity.CarTypeVo">
select cmt.id ,cmt.parent_id parentId,cmt.`name` model ,cmt.is_active isActive,
cmt.unit_name unit,cmt1.name ,cmt2.name type,cmt.`level`
from car_ma_type cmt
left join car_ma_type cmt1 on cmt.parent_id=cmt1.id
left join car_ma_type cmt2 on cmt1.parent_id=cmt2.id
where cmt.`level`=4
AND cmt2.name = #{param.type}
AND cmt1.name = #{param.name}
AND cmt.`name` = #{param.model}
and cmt.is_active=1
select
cmt.id, cmt.parent_id parentId, cmt.`name` model, cmt.is_active isActive,
cmt.unit_name unit, cmt1.name, cmt2.name type, cmt.`level`
from
car_ma_type cmt
left join car_ma_type cmt1 on cmt.parent_id = cmt1.id
left join car_ma_type cmt2 on cmt1.parent_id = cmt2.id
where
cmt.`level` = 4
and cmt2.name = #{param.type} and cmt1.name = #{param.name}
and cmt.`name` = #{param.model} and cmt.is_active=1
</select>
</mapper>

View File

@ -47,7 +47,7 @@
if(sum(cpa.need_num)=sum(cpa.dispatch_num),'全部派车',if(sum(cpa.dispatch_num)>0,'部分派车','待派车')) planStatus,
ROUND(sum(cpa.dispatch_num)/sum(cpa.need_num)*100,0) process,pro.bmname AS bmname
from car_plan_apply cpa
left join bm_project pro on cpa.pro_id=pro.bid_id
left join bm_project pro on cpa.pro_id=pro.id
where cpa.status_type=1
<if test="proName!=null and proName!=''">
and pro.`name` like concat('%',#{proName},'%')
@ -117,7 +117,7 @@
cpa.apply_type applyType, cpa.status_type statusType,cpa.user_name userName,
if(cpa.dispatch_status=0,'待审核',if(dispatch_num>0,'已派车','待派车')) statusName
from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
left join car_plan_apply_sup cpas on cpa.id=cpas.apply_id
left join car_supplier cs on cs.id=cpas.sup_id
where cpa.status_type=1 and cpa.pro_id=#{proId}
@ -164,7 +164,7 @@
cpa.user_name userName,
if(cpa.dispatch_status = 0, '待审核', if(dispatch_num > 0, '已派车', '待派车')) statusName
from car_plan_apply cpa
left join bm_project pro on pro.bid_id = cpa.pro_id
left join bm_project pro on pro.id = cpa.pro_id
left join car_plan_apply_sup cpas on cpa.id = cpas.apply_id
left join car_supplier cs on cs.id = cpas.sup_id
where cpa.status_type = 1

View File

@ -77,7 +77,7 @@
cpa.need_num AS applyNum,
IFNULL(a.dispatchNum,0) AS dispatchNum
FROM car_plan_apply cpa
LEFT JOIN bm_project bp ON cpa.pro_id = bp.bid_id
LEFT JOIN bm_project bp ON cpa.pro_id = bp.id
LEFT JOIN (
SELECT cpo.apply_id AS apply_id,
SUM(ANY_VALUE(cpo.dispatch_num)) AS dispatchNum
@ -133,7 +133,7 @@
ELSE '1' END AS dispatchStatus
FROM car_plan_apply cpa
LEFT JOIN car_plan_apply_sup cpas on cpas.apply_id=cpa.id
LEFT JOIN bm_project bp ON cpa.pro_id = bp.bid_id
LEFT JOIN bm_project bp ON cpa.pro_id = bp.id
left join(
SELECT sum(dispatch_num) dispatch_num,sum(money) money,cpo.apply_id
FROM car_plan_out cpo
@ -187,7 +187,7 @@
cpa.type AS typeName,
IFNULL( cpo.dispatch_num,0) dispatch_num,IFNULL(cpo.money,0) money
FROM car_plan_apply cpa
LEFT JOIN bm_project bp ON cpa.pro_id = bp.bid_id
LEFT JOIN bm_project bp ON cpa.pro_id = bp.id
left join(
SELECT sum(dispatch_num) dispatch_num,sum(money) money,cpo.apply_id
FROM car_plan_out cpo
@ -225,7 +225,7 @@
if(csp.id is null,'待付款','已付款') payStatus
FROM car_plan_apply cpa
LEFT JOIN car_slt_plan csp on csp.plan_id=cpa.id
LEFT JOIN bm_project bp ON cpa.pro_id = bp.bid_id
LEFT JOIN bm_project bp ON cpa.pro_id = bp.id
LEFT JOIN car_plan_apply_sup cpas ON cpa.id = cpas.apply_id
LEFT JOIN car_supplier cs ON cpas.sup_id = cs.id
left join(
@ -312,7 +312,7 @@
left join car_plan_details cpd on cpd.apply_id=cpod.apply_id and cpd.model_id=cpod.model_id
LEFT JOIN car_ma_type_info cmti on cmti.id=cpod.model_id
left join car_plan_apply cpa on cpa.id =cpod.apply_id
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
left join car_supplier_info csi on csi.id= cpod.car_id
left join car_plan_apply_sup cpas on cpd.apply_id=cpas.apply_id
LEFT JOIN car_supplier cs on cs.id=cpas.sup_id

View File

@ -160,7 +160,7 @@
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=2,'已通过','已驳回') ) ) auditStatus
from car_plan_apply cpa
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
LEFT JOIN bm_project_type bpt on pro.TYPE_ID=bpt.ID
left join car_plan_apply_sup cpas on cpa.id=cpas.apply_id
left join car_supplier_user csu on csu.sup_id=cpas.sup_id
@ -334,7 +334,7 @@
END AS fileStatus
FROM car_plan_out cpo
left join car_plan_apply cpa on cpo.apply_id=cpa.id
left join bm_project pro on pro.bid_id=cpa.pro_id
left join bm_project pro on pro.id=cpa.pro_id
left join(
SELECT count(1) num ,own_id id,type from bm_file_upload
where model_table='car_plan_out' AND type='到货确认单'