|
|
|
@@ -43,12 +43,7 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); |
|
|
|
if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); |
|
|
|
TenantEntity tenantEntity = ifParentUpdateTenantInfo(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); |
|
|
|
}else{ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getTenantId()); |
|
|
|
} |
|
|
|
wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); |
|
|
|
final PageInfo<WxCreditHistoryVo> page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
@@ -119,12 +114,13 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
@SystemControllerLog(description = "积分历史-导出数据") |
|
|
|
public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
// wxCreditHistory.updateTenantInfo(getTenantInfo()); |
|
|
|
TenantEntity tenantEntity = ifParentUpdateTenantInfo(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); |
|
|
|
}else{ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getTenantId()); |
|
|
|
} |
|
|
|
// TenantEntity tenantEntity = ifParentUpdateTenantInfo(); |
|
|
|
// if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
// wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); |
|
|
|
// }else{ |
|
|
|
// wxCreditHistory.setTenantId(tenantEntity.getTenantId()); |
|
|
|
// } |
|
|
|
wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); |
|
|
|
wxCreditHistoryService.exportData(request, response, wxCreditHistory); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -134,12 +130,13 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); |
|
|
|
// wxCreditHistory.updateTenantInfo(getTenantInfo()); |
|
|
|
TenantEntity tenantEntity = ifParentUpdateTenantInfo(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); |
|
|
|
}else{ |
|
|
|
wxCreditHistory.setTenantId(tenantEntity.getTenantId()); |
|
|
|
} |
|
|
|
// TenantEntity tenantEntity = ifParentUpdateTenantInfo(); |
|
|
|
// if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
// wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); |
|
|
|
// }else{ |
|
|
|
// wxCreditHistory.setTenantId(tenantEntity.getTenantId()); |
|
|
|
// } |
|
|
|
wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); |
|
|
|
return wxCreditHistoryService.getCreditSummary(wxCreditHistory); |
|
|
|
} |
|
|
|
|
|
|
|
|