Merge remote-tracking branch 'origin/master'

This commit is contained in:
liyawei
2022-05-20 11:11:01 +08:00
3 changed files with 18 additions and 17 deletions
@@ -192,8 +192,9 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
* @param params
*/
@RequestMapping(value = "/exportProjectDetailsStatisticsGroupByTerritoryXls")
public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response,HttpServletRequest request, Map<String,Object> params) {
public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
projectLibraryBaseService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params);
}
}
@@ -449,7 +449,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
String[] titleArr = title.split(",");
Row firstRow = sheet.createRow(0);
for (int i = 0; i <= 2; i++){
for (int i = 0; i < 2; i++){
Cell cell = firstRow.createCell(i);
cell.setCellValue(titleArr[i]);
}