公告管理返回projectStatus

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

@@ -19,6 +19,8 @@ import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.framework.web.service.TokenService;
+import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.service.IPmDemandService;
 import com.ozs.system.service.ISysDeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -49,6 +51,8 @@ public class BaseNoticeController extends BaseController {
     private TokenService tokenService;
     @Autowired
     private ISysDeptService iSysDeptService;
+    @Autowired
+    private IPmDemandService pmDemandService;
 
     @ApiOperation(value = "分页查询公告信息")
     @PostMapping("/page")
@@ -171,6 +175,10 @@ public class BaseNoticeController extends BaseController {
         pagev.setSize(page.getSize());
 
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
+            //查询已发布公告的项目列表
+            List<Long> dids = page.getRecords().stream().map(BaseNotice::getDemandId).collect(Collectors.toList());
+            List<PmDemand> demandList = pmDemandService.listByIds(dids);
+
             List<BaseNoticeType> list = baseNoticeTypeService.list();
             List<Long> ids = list.stream().map(BaseNoticeType::getId).collect(Collectors.toList());
             List<BaseNoticeVo> collect = page.getRecords().stream().map(o -> {
@@ -183,6 +191,11 @@ public class BaseNoticeController extends BaseController {
                     }
 
                 }
+                for (PmDemand demand : demandList) {
+                    if (demand.getDemandId().equals(o.getDemandId())) {
+                        baseNoticeVo.setProjectStatus(demand.getProjectStatus());
+                    }
+                }
                 return baseNoticeVo;
             }).collect(Collectors.toList());
             pagev.setRecords(collect);

purchase-system/src/main/java/com/ozs/base/vo/BaseNoticeVo.java

@@ -19,14 +19,19 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel("公告管理对象vo")
-public class BaseNoticeVo extends BaseNotice
-{
+public class BaseNoticeVo extends BaseNotice {
 
-    /** 项目名称 */
+    /**
+     * 项目名称
+     */
     @Excel(name = "公告类型名称")
     @ApiModelProperty("公告类型名称")
     private String typeName;
-
+    /**
+     * 项目状态
+     */
+    @ApiModelProperty("项目状态")
+    private String projectStatus;
 
 
 }