Browse Source

fix:

1.修改自提导出数据
2.修改自提的页面呈现签收数据
pre-production
pref_mail@163.com 6 months ago
parent
commit
aae7510d13
  1. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
  2. 10
      blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@ -49,7 +49,7 @@
dbl.total_cost totalCost,
dbl.pick_up_plate pickUpPlate,dbl.pickup_batch pickupBatch,
(
select COUNT(id)
select COUNT(quantity)
from logpm_distribution_bill_lading_scan
where bill_lading_id = dbl.id
) stopNum,

10
blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

@ -189,8 +189,14 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
exportIndicatorsVO.setCreateDeptName(deptName);
Long createUser = exportIndicatorsVO.getCreateUser();
R<User> userR = userClient.userInfoById(createUser);
String userName = userR.getData().getName();
exportIndicatorsVO.setCreateUserName(userName);
if(userR.isSuccess()){
if(!Objects.isNull(userR.getData())){
String userName = userR.getData().getName();
exportIndicatorsVO.setCreateUserName(userName);
}
}
}
return list;

Loading…
Cancel
Save