|
@@ -11,7 +11,7 @@ import com.management.platform.entity.ContractBonusSummary;
|
|
import com.management.platform.entity.User;
|
|
import com.management.platform.entity.User;
|
|
import com.management.platform.entity.WxCorpInfo;
|
|
import com.management.platform.entity.WxCorpInfo;
|
|
import com.management.platform.entity.bo.BonusDataBO;
|
|
import com.management.platform.entity.bo.BonusDataBO;
|
|
-import com.management.platform.entity.excel.ProjectContractBonusExlceHead;
|
|
|
|
|
|
+import com.management.platform.entity.excel.ProjectContractBonusExcelHead;
|
|
import com.management.platform.entity.vo.ImportBonusTemplateVO;
|
|
import com.management.platform.entity.vo.ImportBonusTemplateVO;
|
|
import com.management.platform.entity.vo.ProjectBonusTimeVO;
|
|
import com.management.platform.entity.vo.ProjectBonusTimeVO;
|
|
import com.management.platform.entity.vo.ProjectBonusTotalTimeVO;
|
|
import com.management.platform.entity.vo.ProjectBonusTotalTimeVO;
|
|
@@ -440,7 +440,7 @@ public class ContractBonusDetailServiceImpl extends ServiceImpl<ContractBonusDet
|
|
if(null ==user){
|
|
if(null ==user){
|
|
httpRespMsg.setError("登录凭证有误,请联系管理员");
|
|
httpRespMsg.setError("登录凭证有误,请联系管理员");
|
|
}
|
|
}
|
|
- List<ProjectContractBonusExlceHead> contractProjectBonusList=contractBonusDetailMapper.getExportContractProjectBonus(year,user.getCompanyId());
|
|
|
|
|
|
+ List<ProjectContractBonusExcelHead> contractProjectBonusList=contractBonusDetailMapper.getExportContractProjectBonus(year,user.getCompanyId());
|
|
httpRespMsg.setData(contractProjectBonusList);
|
|
httpRespMsg.setData(contractProjectBonusList);
|
|
return httpRespMsg;
|
|
return httpRespMsg;
|
|
}
|
|
}
|
|
@@ -456,7 +456,7 @@ public class ContractBonusDetailServiceImpl extends ServiceImpl<ContractBonusDet
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- List<ProjectContractBonusExlceHead> dataList=contractBonusDetailMapper.getExportContractProjectBonus(year,user.getCompanyId());
|
|
|
|
|
|
+ List<ProjectContractBonusExcelHead> dataList=contractBonusDetailMapper.getExportContractProjectBonus(year,user.getCompanyId());
|
|
|
|
|
|
String fileName = null;
|
|
String fileName = null;
|
|
try {
|
|
try {
|
|
@@ -469,11 +469,11 @@ public class ContractBonusDetailServiceImpl extends ServiceImpl<ContractBonusDet
|
|
response.setHeader("Content-Disposition", "attachment;filename=" + null==fileName?"file":fileName);
|
|
response.setHeader("Content-Disposition", "attachment;filename=" + null==fileName?"file":fileName);
|
|
|
|
|
|
try (ServletOutputStream outputStream = response.getOutputStream()){
|
|
try (ServletOutputStream outputStream = response.getOutputStream()){
|
|
- EasyExcel.write(outputStream, ProjectContractBonusExlceHead.class)
|
|
|
|
|
|
+ EasyExcel.write(outputStream, ProjectContractBonusExcelHead.class)
|
|
.excelType(ExcelTypeEnum.XLSX)
|
|
.excelType(ExcelTypeEnum.XLSX)
|
|
.autoCloseStream(true)
|
|
.autoCloseStream(true)
|
|
.registerWriteHandler(new ExcelMergeStrategy(
|
|
.registerWriteHandler(new ExcelMergeStrategy(
|
|
- dataList.stream().map(ProjectContractBonusExlceHead::getContract)
|
|
|
|
|
|
+ dataList.stream().map(ProjectContractBonusExcelHead::getContract)
|
|
.collect(Collectors.toList()), 0
|
|
.collect(Collectors.toList()), 0
|
|
))
|
|
))
|
|
// .registerWriteHandler(new WidthStyleStrategy())
|
|
// .registerWriteHandler(new WidthStyleStrategy())
|