修改交班数据
This commit is contained in:
parent
5ed9c3abef
commit
736389aa65
|
|
@ -169,7 +169,7 @@ public class DataService {
|
||||||
return Result.success(CodeEnum.SUCCESS,handoverInfo);
|
return Result.success(CodeEnum.SUCCESS,handoverInfo);
|
||||||
}else{
|
}else{
|
||||||
HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),
|
HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),
|
||||||
ObjectUtil.isNotEmpty(tbToken.getCreateTime())? DateUtils.getTime(tbToken.getCreateTime()):null,
|
ObjectUtil.isNotEmpty(tbToken.getCreateTime())? DateUtils.getTime(tbToken.getCreateTime()):DateUtils.getTime(new Date()),
|
||||||
DateUtils.getTime(new Date()),
|
DateUtils.getTime(new Date()),
|
||||||
ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(),
|
ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(),
|
||||||
null,null,"0",
|
null,null,"0",
|
||||||
|
|
@ -193,7 +193,7 @@ public class DataService {
|
||||||
}
|
}
|
||||||
tbHandover.setTradeDay(DateUtils.getDays());
|
tbHandover.setTradeDay(DateUtils.getDays());
|
||||||
tbHandover.setPrintNo("usb");
|
tbHandover.setPrintNo("usb");
|
||||||
tbHandover.setDutyId(shopUserDuty.getId());
|
tbHandover.setDutyId(0);
|
||||||
tbHandover.setShopId(shopInfo.getId());
|
tbHandover.setShopId(shopInfo.getId());
|
||||||
tbHandover.setMerchantName(handoverInfo.getMerchantName());
|
tbHandover.setMerchantName(handoverInfo.getMerchantName());
|
||||||
tbHandover.setStartTime(handoverInfo.getStartTime());
|
tbHandover.setStartTime(handoverInfo.getStartTime());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue