|
@@ -120,11 +120,11 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
public Result exportManagerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
|
|
public Result exportManagerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
|
|
|
String depId,String techDepId ,Integer declarationBatch ,String commodityPrice,String startTime,
|
|
String depId,String techDepId ,Integer declarationBatch ,String commodityPrice,String startTime,
|
|
|
String endTime,String type,Integer pageNo,Integer pageSize){
|
|
String endTime,String type,Integer pageNo,Integer pageSize){
|
|
|
- @SuppressWarnings("unchecked")
|
|
|
|
|
|
|
+
|
|
|
List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
|
|
List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
|
|
|
cid, projectType,thchId,depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime ,type, pageNo, pageSize).getList();
|
|
cid, projectType,thchId,depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime ,type, pageNo, pageSize).getList();
|
|
|
for (managerListBo e : list) {
|
|
for (managerListBo e : list) {
|
|
|
- if (e!=null&&e.getType()!=null){
|
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(e.getType())){
|
|
|
String[] split = e.getType().split(",");
|
|
String[] split = e.getType().split(",");
|
|
|
StringBuilder stringBuilder = new StringBuilder();
|
|
StringBuilder stringBuilder = new StringBuilder();
|
|
|
Arrays.stream(split).forEach(
|
|
Arrays.stream(split).forEach(
|