|
|
|
@ -8831,16 +8831,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
//查询当前操作司机
|
|
|
|
|
BladeUser user = AuthUtil.getUser(); |
|
|
|
|
Boolean driver = distributionDeliveryListService.judgeIsDriver(user); |
|
|
|
|
log.info("username>>>>>>>>>>>>>user:{}",user.getNickName()); |
|
|
|
|
log.info("driver>>>>>>>>>>>>>user:{}",driver); |
|
|
|
|
|
|
|
|
|
if (deliveryListEntity.getKind().equals("1")) { |
|
|
|
|
|
|
|
|
|
if (!driver) { |
|
|
|
|
return Resp.scanFail("当前操作需由司机完成", "当前操作需由司机完成"); |
|
|
|
|
} |
|
|
|
|
DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user, driver); |
|
|
|
|
if (deliverySelfEntity == null) { |
|
|
|
|
log.info("driverName>>>>>>>>>>>>>:{}",deliverySelfEntity.getDriverName()); |
|
|
|
|
|
|
|
|
|
if (Objects.isNull(deliverySelfEntity)) { |
|
|
|
|
|
|
|
|
|
return Resp.scanFail("当前人无操作权限", "当前人无操作权限"); |
|
|
|
|
} |
|
|
|
|
this.getDriver(deliveryListEntity, AuthUtil.getUser(), driver); |
|
|
|
|
//针对之前该司机上传的图片进行全部删除
|
|
|
|
|
//查询该司机已有的图片信息
|
|
|
|
|
List<DistributionSignPrintEntity> list = iDistributionSignPrintService.list(Wrappers.<DistributionSignPrintEntity>query().lambda() |
|
|
|
@ -8905,6 +8910,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
signforEntity.setSjsigningTime(sdf.format(new Date())); |
|
|
|
|
signforEntity.setDriverSigning(SignforDriverSigningStatusConstant.yiqianshou.getValue()); |
|
|
|
|
signforEntity.setSigneeName(user.getNickName()); |
|
|
|
|
log.info("driverName>>>>>>>>>>>>>:{}",user.getNickName()); |
|
|
|
|
signforEntity.setSigneeId(user.getUserId()); |
|
|
|
|
return R.data(this.updateById(signforEntity)); |
|
|
|
|
} |
|
|
|
|