diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java
index 1af67db..5d50235 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java
@@ -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){
diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java
index 7f2f072..c724df2 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java
@@ -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);
});
diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java
index c1d0ef1..39e5783 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java
@@ -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;
diff --git a/src/main/resources/mappers/business/app/AppMapper.xml b/src/main/resources/mappers/business/app/AppMapper.xml
index 825be5a..a6532e2 100644
--- a/src/main/resources/mappers/business/app/AppMapper.xml
+++ b/src/main/resources/mappers/business/app/AppMapper.xml
@@ -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
diff --git a/src/main/resources/mappers/business/backstage/CarPlanAuditMapper.xml b/src/main/resources/mappers/business/backstage/CarPlanAuditMapper.xml
index dd3c832..fcae416 100644
--- a/src/main/resources/mappers/business/backstage/CarPlanAuditMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarPlanAuditMapper.xml
@@ -6,6 +6,9 @@
update car_plan_apply set status=#{status}
, status_type=#{nextStatus}
+
+ ,dispatch_status=5
+
where id=#{id}
@@ -60,7 +63,7 @@
\ 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 d5f68e3..268e035 100644
--- a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
+++ b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
@@ -23,7 +23,7 @@