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

bug状态修改

This commit is contained in:
haozq 2025-01-20 11:11:25 +08:00
parent 32d3a5f350
commit 9a6c6ba98f
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java
View File

@ -89,7 +89,7 @@ public class CarPlanAuditServiceImpl implements CarPlanAuditService{
vo.setCreator(userId);
int nums =mapper.getAuditNumByUser(vo);
if(nums>0){
return ServerResponse.createErroe("您已审核，请等待其他用户审核");
return ServerResponse.createErroe("您已审核通过，请等待其他用户审核");
}
if(1==statusType){

7
src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java
View File

@ -55,7 +55,12 @@ public class DispatchCarServiceImpl implements DispatchCarService{
dpcNum=0;
}
String lastDay=mapper.getLastDay(vo.getProId());
vo.setLastDay(lastDay);
if(StringHelper.isNotEmpty(lastDay)){
vo.setLastDay(lastDay);
}else{
vo.setLastDay("-");
}
vo.setYpcNum(ypcNum);
vo.setDpcNum(dpcNum);
});

4
src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java
View File

@ -14,11 +14,9 @@ import com.bonus.gzcar.manager.common.util.StringHelper;
import com.bonus.gzcar.manager.common.util.UserUtil;
import com.bonus.gzcar.manager.webResult.ServerResponse;
import com.google.common.collect.Maps;
import jdk.management.resource.internal.inst.FileOutputStreamRMHooks;
import lombok.extern.slf4j.Slf4j;
import org.omg.CORBA.INTERNAL;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

2
src/main/resources/mappers/business/app/AppMapper.xml
View File

@ -8,7 +8,7 @@
if(cpa.type=1,'运输车辆','吊车') typeName,cpa.need_num needNum,
cpas.sup_id supId ,cpas.contract_id contractId ,
cpa.dispatch_num dispatchNum ,pro.name proName,
IFNULL(cs.name,'-') supName,if(cpa.dispatch_num=0,'待派车','已派车') status
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 car_plan_apply_sup cpas on cpa.id=cpas.apply_id

5
src/main/resources/mappers/business/backstage/CarPlanAuditMapper.xml
View File

@ -6,6 +6,9 @@
update car_plan_apply set status=#{status}
<if test="nextStatus!=null and nextStatus!=''">
, status_type=#{nextStatus}
<if test='nextStatus==1'>
,dispatch_status=5
</if>
</if>
where id=#{id}
</update>
@ -60,7 +63,7 @@
</select>
<select id="getAuditNumByUser" resultType="java.lang.Integer">
select count(1) from car_plan_audit_record
where apply_id=#{id} and auditor=#{creator} and audit_type=#{statusType}
where apply_id=#{id} and auditor=#{creator} and audit_type=#{statusType} and type=2
</select>
</mapper>

2
src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
View File

@ -23,7 +23,7 @@
<select id="getProStatisticsList" resultType="com.bonus.gzcar.business.backstage.entity.DispatchCarVo">
select cpa.pro_id proId,pro.`name` proName ,count(1) planNum ,
sum(cpa.need_num) needNum,sum(cpa.dispatch_num) dispatchNum,sum(cpa.need_num)-sum(cpa.dispatch_num) noDispatchNum,
if(sum(cpa.need_num)=sum(cpa.dispatch_num),'全部派车',if(sum(cpa.dispatch_num)>0,'部分派车','未派车')) planStatus,
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
from car_plan_apply cpa
left join bm_project pro on cpa.pro_id=pro.bid_id

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

@ -46,7 +46,7 @@
,#{updateCcGls},#{remark},#{carNum},#{relId})
</insert>
<update id="updatePlanInfo">
update car_plan_apply set dispatch_status=1
update car_plan_apply set dispatch_status=0
WHERE id=#{planId}
</update>
<!--修改发车数据-->
@ -97,8 +97,8 @@
if(cpa.type=1,'车辆','吊车') typeName ,cpas.sup_id supId ,cs.name supName,
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,
if(cpa.dispatch_status=1,'待审核',if(cpa.dispatch_num>0,'已派车','待派车')) statusName,
if(cpa.dispatch_status=1,'待审核', if(cpa.dispatch_status=0,'待派车',if(cpa.dispatch_status=2,'已通过','已驳回') ) ) auditStatus
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 car_plan_apply_sup cpas on cpa.id=cpas.apply_id
@ -118,8 +118,8 @@
AND (cpa.code like concat('%',#{keyWord},'%') or
pro.name like concat('%',#{keyWord},'%') or
if(cpa.type=1,'车辆','吊车') like concat('%',#{keyWord},'%') or
if(cpa.dispatch_status=0,'待审核',if(dispatch_num>0,'已派车','待派车')) like concat('%',#{keyWord},'%') or
if(cpa.dispatch_status=0,'待审核', if(cpa.dispatch_status=1,'已通过','已驳回') ) like concat('%',#{keyWord},'%')
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=2,'已通过','已驳回') ) ) like concat('%',#{keyWord},'%')
)
</if>