|
|
@@ -123,8 +123,8 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
|
|
|
cid, projectType,thchId,depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime ,type, pageNo, pageSize).getList();
|
|
|
- list.forEach(e->{
|
|
|
- if (e.getType()!=null){
|
|
|
+ for (managerListBo e : list) {
|
|
|
+ if (e!=null&&e.getType()!=null){
|
|
|
String[] split = e.getType().split(",");
|
|
|
StringBuilder stringBuilder = new StringBuilder();
|
|
|
Arrays.stream(split).forEach(
|
|
|
@@ -134,7 +134,7 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
);
|
|
|
e.setType(stringBuilder.substring(0,stringBuilder.length()-1));
|
|
|
}
|
|
|
- });
|
|
|
+ }
|
|
|
NewExcelUtil<managerListBo> excel=new NewExcelUtil<>(managerListBo.class);
|
|
|
return excel.exportExcel(list, "企业项目查询列表", uploadPath);
|
|
|
}
|