【数据资产】

1、数据需求-修改上架状态

@@ -71,6 +71,14 @@ public class DemandController {
         return CommonRes.success(pageVO);
         return CommonRes.success(pageVO);
      }
      }
 
 
+    @PostMapping("/portal/page-list")
+    @SystemLog(value = "数据需求-门户分页")
+    @Operation(summary = "数据需求-门户分页")
+    public CommonRes<PageListVO<DemandPortalRSVO>> portalPageList(@RequestBody @Valid DemandPortalQueryVO queryVO) {
+        PageListVO<DemandPortalRSVO> pageVO = demandService.portalPageList(queryVO);
+        return CommonRes.success(pageVO);
+    }
+     
     @GetMapping("/detail")
     @GetMapping("/detail")
     @SystemLog(value = "数据需求-详情")
     @SystemLog(value = "数据需求-详情")
     @Operation(summary = "数据需求-详情",parameters = {
     @Operation(summary = "数据需求-详情",parameters = {

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.mybatis.annotations.LikeQuery;
+import com.csbr.cloud.mybatis.enums.LikeQueryEnum;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowBizGuidQueryDTO;
+import csbr.cloud.entity.domain.base.dto.BasePageDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求查询参数
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(title = "数据需求查询参数")
+public class DemandPortalQueryVO extends BasePageDTO {
+
+    @Schema(description = "数据需求名称")
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    private String dataDemandName;
+
+    @Schema(description = "需求类型")
+    private String requirementType;
+
+    @Schema(description = "交付标的")
+    private String updateCycle;
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.workflow.domain.vo.appove.BizApproveVO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import csbr.cloud.entity.domain.base.vo.BaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求门户返回参数
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@Data
+@Schema(title = "数据需求门户返回参数")
+public class DemandPortalRSVO extends BaseVO {
+    
+    /**
+     * 系统唯一标识
+     */
+    @Schema(description = "系统唯一标识")
+    private String guid;
+    
+    /**
+     * 数据需求名称
+     */
+    @Schema(description = "数据需求名称")
+    private String dataDemandName;
+    
+    /**
+     * 需求类型
+     */
+    @Schema(description = "需求类型")
+    private String requirementType;
+
+    /**
+     * 需求开始时间
+     */
+    @Schema(description = "需求开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermSdate;
+    
+    /**
+     * 需求结束时间
+     */
+    @Schema(description = "需求结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermEdate;
+    
+    /**
+     * 需求内容
+     */
+    @Schema(description = "需求内容")
+    private String requirementContent;
+
+    /**
+     * 交付标的
+     */
+    @Schema(description = "交付标的")
+    private String updateCycle;
+    
+}

@@ -25,6 +25,13 @@ public interface DemandService {
     PageListVO<DemandRSVO> pageList(DemandQueryVO queryVO);
     PageListVO<DemandRSVO> pageList(DemandQueryVO queryVO);
 
 
     /**
     /**
+     * 数据需求-门户分页
+     * @param queryVO
+     * @return
+     */
+    PageListVO<DemandPortalRSVO> portalPageList(DemandPortalQueryVO queryVO);
+
+    /**
      * 数据需求获取详情数据
      * 数据需求获取详情数据
      * @author xcq
      * @author xcq
      * @date 2024-12-31 18:46
      * @date 2024-12-31 18:46

@@ -117,7 +117,20 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
             afterQuery(pageList, rsPageList);
             afterQuery(pageList, rsPageList);
             return rsPageList;
             return rsPageList;
         }
         }
-        return new PageListVO<>(0L,0L);
+        return new PageListVO<>(queryVO.getPageSize(), queryVO.getPageIndex());
+    }
+
+    @Override
+    public PageListVO<DemandPortalRSVO> portalPageList(DemandPortalQueryVO queryVO) {
+        LambdaQueryWrapper<MfDemand> queryWrapper = mfDemandService.csbrQueryWrapper(queryVO, MfDemand.class);
+        queryWrapper.orderByDesc(MfDemand::getCreateTime);
+        mfDemandService.csbrExcludeShardingLambdaQueryWrapper(queryWrapper);
+        PageListVO<MfDemand> pageList = mfDemandService.csbrPageList(queryVO, queryWrapper);
+        PageListVO<DemandPortalRSVO> rsPageList = csbrBeanUtil.convert(pageList, PageListVO.class);
+        if(CollectionUtils.isNotEmpty(pageList.getRecords())){
+            rsPageList.setRecords(csbrBeanUtil.convert(pageList.getRecords(), DemandPortalRSVO.class));
+        }
+        return rsPageList;
     }
     }
 
 
     /**
     /**