|
@@ -66,8 +66,6 @@ public class BillGenerationServiceImpl {
|
|
|
@Async(value = "zhswThreadPool")
|
|
|
public void asyncGenerateBill(List<SwWaterUsageEntryDo> swWaterUsageEntryDoList, ServletRequestAttributes attributes){
|
|
|
RequestContextHolder.setRequestAttributes(attributes);
|
|
|
- SysUserVo currentUser = ZHSWCommonUtils.getCurrentUser();
|
|
|
- log.info("当前生成账单的用户:{},所属的租户库为:{}", currentUser.getAccount(), currentUser.getTenantDo().getDskey());
|
|
|
if (swWaterUsageEntryDoList == null || swWaterUsageEntryDoList.isEmpty()) {
|
|
|
log.error("暂无需要生成账单的信息");
|
|
|
return;
|
|
@@ -78,6 +76,8 @@ public class BillGenerationServiceImpl {
|
|
|
|
|
|
public void generateBill(List<SwWaterUsageEntryDo> swWaterUsageEntryDoList) {
|
|
|
log.debug("需要生成账单的抄表记录为:{}", swWaterUsageEntryDoList);
|
|
|
+ SysUserVo currentUser = ZHSWCommonUtils.getCurrentUser();
|
|
|
+ log.error("判断上下文对象是否正常传递:{}",currentUser);
|
|
|
// 对数据按照抄表日期排序
|
|
|
List<SwWaterUsageEntryDo> collect = swWaterUsageEntryDoList.stream()
|
|
|
.sorted(Comparator.comparing(SwWaterUsageEntryDo::getCurrentreadingdate))
|