打印员工名称
This commit is contained in:
parent
a4dbc5a26d
commit
0eae7dd467
|
|
@ -222,7 +222,7 @@ public class DataService {
|
||||||
HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(),
|
HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(),
|
||||||
ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null,
|
ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null,
|
||||||
DateUtils.getTime(new Date()),
|
DateUtils.getTime(new Date()),
|
||||||
ObjectUtil.isNull(shopStaff)?"":shopStaff.getAccount(),
|
ObjectUtil.isNull(shopStaff)?"":shopStaff.getName(),
|
||||||
list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(),
|
list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(),
|
||||||
"0",
|
"0",
|
||||||
shopUserDuty.getAmount().subtract(shopUserDuty.getReturnAmount()).toPlainString(),
|
shopUserDuty.getAmount().subtract(shopUserDuty.getReturnAmount()).toPlainString(),
|
||||||
|
|
@ -238,7 +238,7 @@ public class DataService {
|
||||||
|
|
||||||
if(ObjectUtil.isNotNull(shopStaff)){
|
if(ObjectUtil.isNotNull(shopStaff)){
|
||||||
tbHandover.setStaffId(shopStaff.getId());
|
tbHandover.setStaffId(shopStaff.getId());
|
||||||
tbHandover.setStaffName(shopStaff.getAccount());
|
tbHandover.setStaffName(shopStaff.getName());
|
||||||
}
|
}
|
||||||
tbHandover.setTradeDay(DateUtils.getDays());
|
tbHandover.setTradeDay(DateUtils.getDays());
|
||||||
tbHandover.setPrintNo(it.getAddress());
|
tbHandover.setPrintNo(it.getAddress());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue