BackstageTaskServiceImpl(update)

src/main/java/com/mmc/pms/feign/UserAppApi.java

@@ -81,6 +81,6 @@ public interface UserAppApi {
     @GetMapping("/userapp/company/getCompanyInfoById")
     String getCompanyInfoById(@ApiParam(value = "单位", required = true)  @RequestParam Integer id, @RequestHeader("token") String token);
 
-    @PostMapping("/userapp/company/listCompanyPage")
-    String listCompanyPage(@ApiParam(value = "单位查询QO", required = true) @RequestBody CompanyInfoQO companyInfoQO, @RequestHeader("token") String token);
+    @PostMapping("/userapp/company/listCompanyPageBack")
+    List<CompanyInfoVO> listCompanyPage(@ApiParam(value = "单位查询QO", required = true) @RequestBody CompanyInfoQO companyInfoQO, @RequestHeader("token") String token);
 }

src/main/java/com/mmc/pms/feign/hystrix/UserAppApiHystrix.java

@@ -48,7 +48,7 @@ public class UserAppApiHystrix implements UserAppApi {
     }
 
     @Override
-    public String listCompanyPage(CompanyInfoQO companyInfoQO, String token) {
+    public List<CompanyInfoVO> listCompanyPage(CompanyInfoQO companyInfoQO, String token) {
         log.error("熔断：feignListAppUserAccount：{}", companyInfoQO);
         return null;
     }

src/main/java/com/mmc/pms/service/impl/BackstageTaskServiceImpl.java

@@ -207,39 +207,31 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
     return ResultBody.success(backstageTaskServiceDao.queryByIdCount(companyId));
   }
 
-  private List<WorkServiceDTO> getWorkServiceDTOS(
-      List<ServiceDO> pageList, HttpServletRequest request) {
-    String companyInfoVOS =
-        userAppApi.listCompanyPage(new CompanyInfoQO(1, 100000), request.getHeader("token"));
-    JSONObject jsonObject = JSON.parseObject(companyInfoVOS);
-    JSONObject jsonObject1 = JSON.parseObject(String.valueOf(jsonObject.get("result")));
-    List<CompanyInfoVO> companyInfoList =
-        new Gson()
-            .fromJson(
-                new Gson().toJson(jsonObject1.get("list")),
-                new TypeToken<List<CompanyInfoVO>>() {}.getType());
+  private List<WorkServiceDTO> getWorkServiceDTOS(List<ServiceDO> pageList,HttpServletRequest request) {
+    List<CompanyInfoVO> companyInfoList = userAppApi.listCompanyPage(new CompanyInfoQO(1, 100000), request.getHeader("token"));
     String companyName = "";
     List<WorkServiceDTO> workServiceDTOList = new ArrayList<>();
     for (ServiceDO item : pageList) {
       for (CompanyInfoVO companyInfoVO : companyInfoList) {
-        if (item.getCompanyId().equals(companyInfoVO.getId())) {
-          companyName = companyInfoVO.getCompanyName();
+        if (item.getCompanyId().equals(companyInfoVO.getId())){
+          companyName=companyInfoVO.getCompanyName();
+          break;
         }
       }
       List<InspComtDO> inspComtDOS = generateComments(item);
       WorkServiceDTO workServiceDTO =
-          WorkServiceDTO.builder()
-              .id(item.getId())
-              .serviceName(item.getServiceName())
-              .companyId(item.getCompanyId())
-              .companyName(companyName)
-              .coverPlan(item.getCoverPlan())
-              .serviceIntroduction(item.getServiceIntroduction())
-              .video(item.getVideo())
-              .shareCard(item.getShareCard())
-              .inspComtList(inspComtDOS)
-              .inspComtAmount(inspComtDOS.size())
-              .build();
+              WorkServiceDTO.builder()
+                      .id(item.getId())
+                      .serviceName(item.getServiceName())
+                      .companyId(item.getCompanyId())
+                      .companyName(companyName)
+                      .coverPlan(item.getCoverPlan())
+                      .serviceIntroduction(item.getServiceIntroduction())
+                      .video(item.getVideo())
+                      .shareCard(item.getShareCard())
+                      .inspComtList(inspComtDOS)
+                      .inspComtAmount(inspComtDOS.size())
+                      .build();
       workServiceDTOList.add(workServiceDTO);
     }
     return workServiceDTOList;