|
|
@@ -13,6 +13,7 @@ import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.*;
|
|
|
+import com.goafanti.order.enums.ApprovalTypeEnums;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.order.service.OrderProjectService;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -31,6 +32,7 @@ import java.io.IOException;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
|
|
|
@RestController
|
|
|
@@ -121,6 +123,18 @@ 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){
|
|
|
+ String[] split = e.getType().split(",");
|
|
|
+ StringBuilder stringBuilder = new StringBuilder();
|
|
|
+ Arrays.stream(split).forEach(
|
|
|
+ s->{
|
|
|
+ stringBuilder.append(ApprovalTypeEnums.getDesc(s)).append(",");
|
|
|
+ }
|
|
|
+ );
|
|
|
+ e.setType(stringBuilder.substring(0,stringBuilder.length()-1));
|
|
|
+ }
|
|
|
+ });
|
|
|
NewExcelUtil<managerListBo> excel=new NewExcelUtil<>(managerListBo.class);
|
|
|
return excel.exportExcel(list, "企业项目查询列表", uploadPath);
|
|
|
}
|
|
|
@@ -366,6 +380,20 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
String str="项目任务列表";
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) orderProjectService.orderTaskList(ib).getList();
|
|
|
+ list.forEach(e->{
|
|
|
+ if(e.getType()!=null) {
|
|
|
+ String[] split = e.getType().split(",");
|
|
|
+ StringBuilder stringBuilder = new StringBuilder();
|
|
|
+ Arrays.stream(split).forEach(
|
|
|
+ s->{
|
|
|
+ stringBuilder.append(ApprovalTypeEnums.getDesc(s)).append(",");
|
|
|
+ }
|
|
|
+ );
|
|
|
+ e.setType(stringBuilder.substring(0,stringBuilder.length()-1));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ );
|
|
|
NewExcelUtil<TOrderTaskListBo>excel=new NewExcelUtil<>(TOrderTaskListBo.class);
|
|
|
return excel.exportExcel(list, str, response);
|
|
|
}
|