diff --git a/src/main/resources/mappers/business/app/AppMapper.xml b/src/main/resources/mappers/business/app/AppMapper.xml index 34376ae..7cc9d03 100644 --- a/src/main/resources/mappers/business/app/AppMapper.xml +++ b/src/main/resources/mappers/business/app/AppMapper.xml @@ -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 @@ -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 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 + name, ID as id + from + bm_project + where + is_active=1 + + + \ No newline at end of file diff --git a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml index ef1769c..fcfbf97 100644 --- a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml @@ -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 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 diff --git a/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml b/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml index 5f7187a..38984d9 100644 --- a/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml +++ b/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml @@ -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 diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml index d032ceb..f9f2546 100644 --- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml @@ -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='到货确认单'