Commit c3405769 by kangxiaoshan

取消产品主体限制

parent 52af2507
......@@ -291,7 +291,8 @@ public class ContractController {
if ("all".equals(dropall)) {
platform = dropall;
}
//要求所有产品 主体一致
platform = "all";
return ResultModel.OK(service.findBody(platform, loginAccount));
}
......@@ -516,7 +517,7 @@ public class ContractController {
if (platform.equals("dmp")) {
//展示dmp上传的收入相关数据
return ResultModel.OK(dmpIncomeService.listByDs(startDate, endDate));
}else if(platform.equals("pd")){
} else if (platform.equals("pd")) {
return ResultModel.OK(dmpIncomeService.pdListByDs(startDate, endDate));
}
......@@ -536,10 +537,10 @@ public class ContractController {
if (platform.equals("dmp")) {
//dmp 分摊报表导出
HSSFWorkbook workbook = dmpIncomeService.exportIncomeList(startDate,endDate,bodyCode,serchName);
HSSFWorkbook workbook = dmpIncomeService.exportIncomeList(startDate, endDate, bodyCode, serchName);
this.exportWrite(fileName, workbook, "分摊收入报表", response);
}else if("pd".equals(platform)){
HSSFWorkbook workbook = dmpIncomeService.exportPdIncomeList(startDate,endDate,bodyCode,serchName);
} else if ("pd".equals(platform)) {
HSSFWorkbook workbook = dmpIncomeService.exportPdIncomeList(startDate, endDate, bodyCode, serchName);
this.exportWrite(fileName, workbook, "分摊收入报表", response);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment