修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerCompInfoController.java

@@ -3,10 +3,13 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerCompInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 货主企业信息 前端控制器
@@ -66,5 +69,15 @@ public class CargoOwnerCompInfoController {
     public String examine(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
         return cargoOwnerCompInfoService.examine(cargoOwnerCompInfo);
     }
+
+    /**
+     * 发布任务货主列表
+     * @param commonId
+     * @return
+    **/
+    @GetMapping("/cargoOwnerList")
+    public GoodsSourceView cargoOwnerList (String commonId) {
+        return cargoOwnerCompInfoService.cargoOwnerList(commonId);
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/GoodsSourceView.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity.view;
-import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
 import lombok.Data;
 
 import java.util.List;
@@ -7,11 +8,11 @@ import java.util.List;
 @Data
 public class GoodsSourceView {
     /**
-     * 货源列表
+     * 货主所属公司列表
      */
-    private List<PublishTaskInfo> publishTaskInfoList;
+    private List<CargoOwnerCompInfo> cargoOwnerCompInfoList;
     /**
-     * 周边信息列表
+     * 认证公司列表
      */
-    private List<PublishTaskInfo> publishTaskInfoLists;
+    private List<CompanyInfo> companyInfoList;
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerCompInfoService.java

@@ -3,6 +3,9 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
+
+import java.util.List;
 
 /**
  * <p>
@@ -47,4 +50,11 @@ public interface ICargoOwnerCompInfoService extends IService<CargoOwnerCompInfo>
      * @return
      */
     String examine(CargoOwnerCompInfo cargoOwnerCompInfo);
+
+    /**
+     * 发布任务货主列表
+     * @param commonId
+     * @return
+     */
+    GoodsSourceView cargoOwnerList (String commonId);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerCompInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CargoOwnerCompInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IAgentCargoOwnerInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerCompInfoService;
@@ -18,7 +19,9 @@ import com.yh.saas.plugin.yiliangyiyun.service.ICompanyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -188,4 +191,27 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         }
         return "NG";
     }
+
+    /**
+     * 发布任务货主列表
+     * @param commonId
+     * @return
+     */
+    @Override
+    public GoodsSourceView cargoOwnerList (String commonId){
+    //查询货主所属公司
+    List<CargoOwnerCompInfo> cargoOwnerCompInfos = this.selectList(new EntityWrapper<CargoOwnerCompInfo>()
+    .eq("common_id",commonId).eq("status_key","9").eq("delete_flag","0"));
+    //查询认证企业
+    List<CompanyInfo> companyInfos = companyInfoService.selectList(new EntityWrapper<CompanyInfo>().eq("common_id",commonId)
+    .eq("status_key","5").eq("delete_flag","0"));
+    GoodsSourceView goodsSourceView1 = new GoodsSourceView();
+    if (!CollectionUtils.isEmpty(cargoOwnerCompInfos)){
+        goodsSourceView1.setCargoOwnerCompInfoList(cargoOwnerCompInfos);
+    }
+    if (!CollectionUtils.isEmpty(companyInfos)){
+        goodsSourceView1.setCompanyInfoList(companyInfos);
+    }
+    return goodsSourceView1;
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -967,6 +967,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     public String editTask(PublishTaskInfo publishTaskInfo) {
         //除审核中状态其余可编辑
         if (publishTaskInfo != null) {
+            publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
+            publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
             this.updateById(publishTaskInfo);
         }
         return "OK";