招标代理机构修改

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseAgencyController.java

@@ -22,6 +22,7 @@ import com.ozs.plan.doman.MonthlyReconciliation;
 import com.ozs.plan.service.MonthlyReconciliationService;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.service.ISysDeptService;
+import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,10 +34,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -57,6 +55,10 @@ public class BaseAgencyController extends BaseController {
     @Autowired
     private ISysDictTypeService dictTypeService;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+
 
     @ApiOperation(value = "新增招标代理机构")
     @PostMapping("/insertBaseAgency")
@@ -145,7 +147,6 @@ public class BaseAgencyController extends BaseController {
         }
         IPage<BaseAgency> page = baseAgencyService.page(new Page<BaseAgency>(vo.getPageNum(), vo.getPageSize()), lw);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
-
             List<SysDictData> dictData = dictTypeService.selectDictDataByType(Constants.SYS_COMPANY_NATURE);
             if (!ObjectUtils.isEmpty(dictData)) {
                 List<BaseAgency> collect = page.getRecords().stream().map(o -> {
@@ -154,11 +155,20 @@ public class BaseAgencyController extends BaseController {
                     if (!ObjectUtils.isEmpty(dl)) {
                         o.setCompanyNature(dl.get(0).getDictLabel());
                     }
+                    if(!ObjectUtils.isEmpty(o.getCompanyType())){
+                        List<String> split = Arrays.asList(o.getCompanyType().split(","));
+                        StringBuilder sb = new StringBuilder();
+                        for(String sp:split){
+                           String valueName =  dictDataService.selectDictLabel(Constants.SYS_PROJECT_TYPE,sp);
+                            sb.append(valueName).append(",");
+                        }
+                        sb.deleteCharAt(sb.length()-1);
+                       o.setCompanyTypeName(sb.toString());
+                    }
                     return o;
                 }).collect(Collectors.toList());
                 page.setRecords(collect);
             }
-
         }
         return success(page);
     }