项目归集 新版 保存

pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java

@@ -1,16 +1,17 @@
 package com.ningdatech.pmapi.gov.controller;
 
+import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.pmapi.gov.manage.GovProjectCollectionManage;
+import com.ningdatech.pmapi.gov.model.vo.GovBizProjectApplyVO;
 import com.ningdatech.pmapi.gov.model.vo.GovProjectDictionaryVO;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**
@@ -25,7 +26,7 @@ import java.util.List;
 @Validated
 @RestController
 @RequiredArgsConstructor
-@Api(value = "GovProjectCollectionController", tags = "电子政务规范项目归集控制器")
+@Api(value = "GovProjectCollectionController", tags = "新项目归集")
 @RequestMapping("/api/v1/gov-project-collection")
 public class GovProjectCollectionController {
 
@@ -36,4 +37,16 @@ public class GovProjectCollectionController {
     public List<GovProjectDictionaryVO> dictionary(@RequestParam(value = "type", required = false) String type) {
         return collectionManage.dictionary(type);
     }
+
+    @GetMapping("/list")
+    @ApiOperation("项目归集列表")
+    public PageVo<GovBizProjectApplyVO> list(ProjectListReq req) {
+        return collectionManage.list(req);
+    }
+
+    @GetMapping("/detail/{id}")
+    @ApiOperation("项目归集详情")
+    public GovBizProjectApplyVO detail(@PathVariable Long id) {
+        return collectionManage.detail(id);
+    }
 }

pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java

@@ -3,9 +3,13 @@ package com.ningdatech.pmapi.gov.manage;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.pmapi.gov.model.entity.GovProjectDictionary;
+import com.ningdatech.pmapi.gov.model.vo.GovBizProjectApplyVO;
 import com.ningdatech.pmapi.gov.model.vo.GovProjectDictionaryVO;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectApplyService;
 import com.ningdatech.pmapi.gov.service.IGovProjectDictionaryService;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -25,6 +29,8 @@ public class GovProjectCollectionManage {
 
     private final IGovProjectDictionaryService dictionaryService;
 
+    private final IGovBizProjectApplyService projectApplyService;
+
     public List<GovProjectDictionaryVO> dictionary(String type) {
 
         List<GovProjectDictionary> dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class)
@@ -37,4 +43,22 @@ public class GovProjectCollectionManage {
         return dictionaries.stream().map(d -> BeanUtil.copyProperties(d,GovProjectDictionaryVO.class))
                 .collect(Collectors.toList());
     }
+
+    /**
+     * 分页查 项目归集
+     * @param req
+     * @return
+     */
+    public PageVo<GovBizProjectApplyVO> list(ProjectListReq req) {
+        return PageVo.empty();
+    }
+
+    /**
+     * 项目归集详情
+     * @param id
+     * @return
+     */
+    public GovBizProjectApplyVO detail(Long id) {
+        return null;
+    }
 }

pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApplyMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApply;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectApplyMapper extends BaseMapper<GovBizProjectApply> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java

@@ -0,0 +1,135 @@
+package com.ningdatech.pmapi.gov.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目申报信息表
+ * </p>
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectApply对象", description = "项目申报表")
+public class GovBizProjectApplyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("项目编号")
+    private String baseProjId;
+
+    @ApiModelProperty("基本项目名称")
+    private String baseProjName;
+
+    @ApiModelProperty("发改委项目代码")
+    private String baseDevelopCode;
+
+    @ApiModelProperty("财政项目代码")
+    private String setProjCodeFinan;
+
+    @ApiModelProperty("历年项目名称")
+    private String baseHistorProjName;
+
+    @ApiModelProperty("'历年项目编码'")
+    private String baseHistorProjId;
+
+    @ApiModelProperty("关联IRS应用名称")
+    private String baseProjSys;
+
+    @ApiModelProperty("关联IRS应用编号")
+    private String baseProjSysCpde;
+
+    @ApiModelProperty("一本账重大应用名称")
+    private String baseAccountAppName;
+
+    @ApiModelProperty("领域大脑 一本账名称")
+    private String baseBrainName;
+
+    @ApiModelProperty("单位核心业务名称")
+    private String baseCoreBusiness;
+
+    @ApiModelProperty("单位核心业务编号")
+    private String baseCoreBusinessCode;
+
+    @ApiModelProperty("项目开始时间")
+    private LocalDateTime baseProjStartTime;
+
+    @ApiModelProperty("项目结束时间")
+    private LocalDateTime baseProjEndTime;
+
+    @ApiModelProperty("项目期限")
+    private LocalDateTime baseProjDuration;
+
+    @ApiModelProperty("项目年度")
+    private String baseProjSetYear;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
+    @ApiModelProperty("预算来源说明")
+    private String baseBasisAmountOri;
+
+    @ApiModelProperty("项目总投资")
+    private BigDecimal baseProjTotalAmount;
+
+    @ApiModelProperty("申报年度预算")
+    private BigDecimal baseProjDeclAmount;
+
+    @ApiModelProperty("建设层级")
+    private String baseProjConsClass;
+
+    @ApiModelProperty("贯通层级")
+    private String baseLowestLevel;
+
+    @ApiModelProperty("立项依据")
+    private String baseProjBasis;
+
+    @ApiModelProperty("立项依据说明")
+    private String baseBasisEstablish;
+
+    @ApiModelProperty("立项依据证明材料")
+    private String baseProjBasisFile;
+
+    @ApiModelProperty("项目概述")
+    private String baseProjIntro;
+
+    @ApiModelProperty("项目内容与预期成效")
+    private String beseExpectedResults;
+
+    @ApiModelProperty("可研报告")
+    private String baseResearchReportFile;
+
+    @ApiModelProperty("项目申报书")
+    private String baseProjApplyFile;
+
+    @ApiModelProperty("运维方案")
+    private String baseOperatMaintenFile;
+
+    @ApiModelProperty("其他附件")
+    private String baseProjOtherFile;
+
+    @ApiModelProperty("备注")
+    private String baseProjRemark;
+
+    @ApiModelProperty("数据来源 区域code")
+    private String areaCode;
+
+    @ApiModelProperty("生产时间")
+    private LocalDateTime bizTime;
+
+    @ApiModelProperty("操作标记")
+    private String op;
+
+    @ApiModelProperty("入库时间")
+    private LocalDateTime tongTime;
+}

pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApply.java

@@ -0,0 +1,140 @@
+package com.ningdatech.pmapi.gov.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目申报信息表
+ * </p>
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@TableName("gov_biz_project_apply")
+@ApiModel(value = "GovBizProjectApply对象", description = "项目申报信息表")
+public class GovBizProjectApply implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("项目编号")
+    private String baseProjId;
+
+    @ApiModelProperty("基本项目名称")
+    private String baseProjName;
+
+    @ApiModelProperty("发改委项目代码")
+    private String baseDevelopCode;
+
+    @ApiModelProperty("财政项目代码")
+    private String setProjCodeFinan;
+
+    @ApiModelProperty("历年项目名称")
+    private String baseHistorProjName;
+
+    @ApiModelProperty("'历年项目编码'")
+    private String baseHistorProjId;
+
+    @ApiModelProperty("关联IRS应用名称")
+    private String baseProjSys;
+
+    @ApiModelProperty("关联IRS应用编号")
+    private String baseProjSysCpde;
+
+    @ApiModelProperty("一本账重大应用名称")
+    private String baseAccountAppName;
+
+    @ApiModelProperty("领域大脑 一本账名称")
+    private String baseBrainName;
+
+    @ApiModelProperty("单位核心业务名称")
+    private String baseCoreBusiness;
+
+    @ApiModelProperty("单位核心业务编号")
+    private String baseCoreBusinessCode;
+
+    @ApiModelProperty("项目开始时间")
+    private LocalDateTime baseProjStartTime;
+
+    @ApiModelProperty("项目结束时间")
+    private LocalDateTime baseProjEndTime;
+
+    @ApiModelProperty("项目期限")
+    private LocalDateTime baseProjDuration;
+
+    @ApiModelProperty("项目年度")
+    private String baseProjSetYear;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
+    @ApiModelProperty("预算来源说明")
+    private String baseBasisAmountOri;
+
+    @ApiModelProperty("项目总投资")
+    private BigDecimal baseProjTotalAmount;
+
+    @ApiModelProperty("申报年度预算")
+    private BigDecimal baseProjDeclAmount;
+
+    @ApiModelProperty("建设层级")
+    private String baseProjConsClass;
+
+    @ApiModelProperty("贯通层级")
+    private String baseLowestLevel;
+
+    @ApiModelProperty("立项依据")
+    private String baseProjBasis;
+
+    @ApiModelProperty("立项依据说明")
+    private String baseBasisEstablish;
+
+    @ApiModelProperty("立项依据证明材料")
+    private String baseProjBasisFile;
+
+    @ApiModelProperty("项目概述")
+    private String baseProjIntro;
+
+    @ApiModelProperty("项目内容与预期成效")
+    private String beseExpectedResults;
+
+    @ApiModelProperty("可研报告")
+    private String baseResearchReportFile;
+
+    @ApiModelProperty("项目申报书")
+    private String baseProjApplyFile;
+
+    @ApiModelProperty("运维方案")
+    private String baseOperatMaintenFile;
+
+    @ApiModelProperty("其他附件")
+    private String baseProjOtherFile;
+
+    @ApiModelProperty("备注")
+    private String baseProjRemark;
+
+    @ApiModelProperty("数据来源 区域code")
+    private String areaCode;
+
+    @ApiModelProperty("生产时间")
+    private LocalDateTime bizTime;
+
+    @ApiModelProperty("操作标记")
+    private String op;
+
+    @ApiModelProperty("入库时间")
+    private LocalDateTime tongTime;
+}

pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApplyVO.java

@@ -0,0 +1,135 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目申报信息表
+ * </p>
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectApply对象", description = "项目申报表")
+public class GovBizProjectApplyVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("项目编号")
+    private String baseProjId;
+
+    @ApiModelProperty("基本项目名称")
+    private String baseProjName;
+
+    @ApiModelProperty("发改委项目代码")
+    private String baseDevelopCode;
+
+    @ApiModelProperty("财政项目代码")
+    private String setProjCodeFinan;
+
+    @ApiModelProperty("历年项目名称")
+    private String baseHistorProjName;
+
+    @ApiModelProperty("'历年项目编码'")
+    private String baseHistorProjId;
+
+    @ApiModelProperty("关联IRS应用名称")
+    private String baseProjSys;
+
+    @ApiModelProperty("关联IRS应用编号")
+    private String baseProjSysCpde;
+
+    @ApiModelProperty("一本账重大应用名称")
+    private String baseAccountAppName;
+
+    @ApiModelProperty("领域大脑 一本账名称")
+    private String baseBrainName;
+
+    @ApiModelProperty("单位核心业务名称")
+    private String baseCoreBusiness;
+
+    @ApiModelProperty("单位核心业务编号")
+    private String baseCoreBusinessCode;
+
+    @ApiModelProperty("项目开始时间")
+    private LocalDateTime baseProjStartTime;
+
+    @ApiModelProperty("项目结束时间")
+    private LocalDateTime baseProjEndTime;
+
+    @ApiModelProperty("项目期限")
+    private LocalDateTime baseProjDuration;
+
+    @ApiModelProperty("项目年度")
+    private String baseProjSetYear;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
+    @ApiModelProperty("预算来源说明")
+    private String baseBasisAmountOri;
+
+    @ApiModelProperty("项目总投资")
+    private BigDecimal baseProjTotalAmount;
+
+    @ApiModelProperty("申报年度预算")
+    private BigDecimal baseProjDeclAmount;
+
+    @ApiModelProperty("建设层级")
+    private String baseProjConsClass;
+
+    @ApiModelProperty("贯通层级")
+    private String baseLowestLevel;
+
+    @ApiModelProperty("立项依据")
+    private String baseProjBasis;
+
+    @ApiModelProperty("立项依据说明")
+    private String baseBasisEstablish;
+
+    @ApiModelProperty("立项依据证明材料")
+    private String baseProjBasisFile;
+
+    @ApiModelProperty("项目概述")
+    private String baseProjIntro;
+
+    @ApiModelProperty("项目内容与预期成效")
+    private String beseExpectedResults;
+
+    @ApiModelProperty("可研报告")
+    private String baseResearchReportFile;
+
+    @ApiModelProperty("项目申报书")
+    private String baseProjApplyFile;
+
+    @ApiModelProperty("运维方案")
+    private String baseOperatMaintenFile;
+
+    @ApiModelProperty("其他附件")
+    private String baseProjOtherFile;
+
+    @ApiModelProperty("备注")
+    private String baseProjRemark;
+
+    @ApiModelProperty("数据来源 区域code")
+    private String areaCode;
+
+    @ApiModelProperty("生产时间")
+    private LocalDateTime bizTime;
+
+    @ApiModelProperty("操作标记")
+    private String op;
+
+    @ApiModelProperty("入库时间")
+    private LocalDateTime tongTime;
+}

pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApplyService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApply;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectApplyService extends IService<GovBizProjectApply> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApplyServiceImpl.java

@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.gov.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.gov.mapper.GovBizProjectApplyMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApply;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectApplyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectApplyServiceImpl extends
+        ServiceImpl<GovBizProjectApplyMapper, GovBizProjectApply> implements IGovBizProjectApplyService {
+
+}