添加交班时间
This commit is contained in:
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -197,7 +198,7 @@ public class DataService {
|
||||
|
||||
HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(),
|
||||
ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null,
|
||||
ObjectUtil.isNotEmpty(shopUserDuty.getLoginOutTime()) ? DateUtils.getTime(shopUserDuty.getLoginOutTime()) : "",
|
||||
DateUtils.getTime(new Date()),
|
||||
"",
|
||||
list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(),
|
||||
"0",
|
||||
|
||||
@@ -362,7 +362,7 @@ public class DutyService {
|
||||
Integer shopId = tokenJson.getInteger("shopId");
|
||||
Integer staffId = tokenJson.getInteger("staffId");
|
||||
ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndStatus(shopId, "0");
|
||||
cloudPrinterService.handoverprintData(token, shopUserDuty.getId(), "",true);
|
||||
// cloudPrinterService.handoverprintData(token, shopUserDuty.getId(), "",true);
|
||||
// shopUserDutyMapper.updateStatusByTokenId(day, shopId, staffId);
|
||||
shopUserDutyMapper.updateStatusById(shopUserDuty.getId(), staffId);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user