|
|
@ -192,6 +192,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
BeanUtil.copyProperties(entity, vo); |
|
|
|
String format = DateUtil.format(entity.getApplyDate(), "yyyy-MM-dd"); |
|
|
|
vo.setApplyDate(format); |
|
|
|
//根据出库申请单的sid查询需要出库的车辆信息
|
|
|
|
List<BusDeliveredApplyDetailsVo> voList = busDeliveredApplyDetailsService.detailsList(sid); |
|
|
|
for (int i = 0; i < voList.size(); i++) { |
|
|
@ -306,7 +308,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
orgSid = stringResultBean.getData(); |
|
|
|
} |
|
|
|
qw.eq("bd.orgSid", orgSid); |
|
|
|
qw.ne("bd.state",1); |
|
|
|
qw.ne("bd.state", 1); |
|
|
|
} |
|
|
|
return qw; |
|
|
|
} |
|
|
@ -335,6 +337,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
} else { |
|
|
|
baseMapper.updateState(busDeExamineQuery.getSid(), state); |
|
|
|
} |
|
|
|
return rb.setMsg("审核操作成功"); |
|
|
|
return rb.success().setMsg("审核操作成功"); |
|
|
|
} |
|
|
|
} |