From 296a698b0230cfee0ee0566a5757ef6cc99490d0 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 15 Feb 2023 18:02:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=AD=E5=BB=BA=E9=A1=B9=E7=9B=AE=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E7=94=B3=E8=AF=B7=20=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRenewalFundDeclarationController.java | 37 ++++++- .../manage/ProjectRenewalFundManage.java | 104 ++++++++++++++++++ .../ProjectRenewalFundDeclarationMapper.java | 5 + .../mapper/ProjectRenewalFundDeclarationMapper.xml | 40 +++++++ .../dto/ProjectRenewalFundDeclarationDTO.java | 59 ++++++++++ .../entity/ProjectRenewalFundDeclaration.java | 122 ++------------------- .../model/po/ProjectRenewalFundDeclarationPO.java | 77 +++++++++++++ .../model/req/ProjectRenewalListReq.java | 62 +++++++++++ .../model/vo/ProjectRenewalFundDeclarationVO.java | 84 ++++++++++++++ .../IProjectRenewalFundDeclarationService.java | 4 + .../ProjectRenewalFundDeclarationServiceImpl.java | 13 ++- 11 files changed, 491 insertions(+), 116 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectRenewalFundDeclarationDTO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectRenewalFundDeclarationVO.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java index ef12320..cadf505 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java @@ -1,9 +1,16 @@ package com.ningdatech.pmapi.projectlib.controller; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.pmapi.projectlib.manage.ProjectRenewalFundManage; +import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO; +import com.ningdatech.pmapi.projectlib.model.req.ProjectRenewalListReq; +import com.ningdatech.pmapi.projectlib.model.vo.ProjectRenewalFundDeclarationVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** *

@@ -13,8 +20,28 @@ import org.springframework.stereotype.Controller; * @author WendyYang * @since 2023-02-15 */ -@Controller -@RequestMapping("/pmapi.projectlib/nd-project-renewal-fund-declaration") +@RestController +@RequestMapping("/api/v1/project/renewal") +@AllArgsConstructor +@Api(tags = "续建项目资金库") public class ProjectRenewalFundDeclarationController { + private final ProjectRenewalFundManage projectRenewalFundManage; + + @GetMapping("/list") + @ApiOperation("项目续建资金库") + public PageVo list(ProjectRenewalListReq req) { + return projectRenewalFundManage.list(req); + } + + @GetMapping("/{id}") + @ApiOperation("项目续建资金详情") + private ProjectRenewalFundDeclarationVO detail (@PathVariable Long id){ + return projectRenewalFundManage.detail(id); + } + @PostMapping("/declared") + @ApiOperation("项目续建资金申请") + private Long declared (@Validated @RequestBody ProjectRenewalFundDeclarationDTO dto){ + return projectRenewalFundManage.declared(dto); + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java new file mode 100644 index 0000000..acbf29d --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java @@ -0,0 +1,104 @@ +package com.ningdatech.pmapi.projectlib.manage; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.basic.util.CollUtils; +import com.ningdatech.pmapi.projectlib.enumeration.ProjectRenewalApprovalStatusEnum; +import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO; +import com.ningdatech.pmapi.projectlib.model.entity.Project; +import com.ningdatech.pmapi.projectlib.model.entity.ProjectRenewalFundDeclaration; +import com.ningdatech.pmapi.projectlib.model.req.ProjectRenewalListReq; +import com.ningdatech.pmapi.projectlib.model.vo.ProjectRenewalFundDeclarationVO; +import com.ningdatech.pmapi.projectlib.service.IProjectRenewalFundDeclarationService; +import com.ningdatech.pmapi.projectlib.service.IProjectService; +import com.wflow.exception.BusinessException; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Objects; + +/** + *

+ * ProjectRenewalFundManage + *

+ * + * @author ZPF + * @since 14:19 2023/2/15 + */ +@Component +@RequiredArgsConstructor +public class ProjectRenewalFundManage { + + private final IProjectRenewalFundDeclarationService projectRenewalFundDeclarationService; + + private final IProjectService projectService; + + /** + * 项目续建资金库列表 分页 + * @param req + * @return + */ + public PageVo list(ProjectRenewalListReq req) { + Page page = req.page(); + projectRenewalFundDeclarationService.pageSql(page, req); + long total; + if ((total = page.getTotal()) == 0) { + return PageVo.empty(); + } + List records = CollUtils.convert(page.getRecords(), w -> { + ProjectRenewalFundDeclarationVO item = new ProjectRenewalFundDeclarationVO(); + BeanUtils.copyProperties(w,item); + return item; + }); + return PageVo.of(records, total); + } + + /** + * @param id + * @author ZPF + * @since 2023/02/15 11:15 + */ + public ProjectRenewalFundDeclarationVO detail(Long id) { + // 查询项目申报信息 + ProjectRenewalFundDeclaration renewal = projectRenewalFundDeclarationService.getById(id); + if(Objects.isNull(renewal)){ + return null; + } + ProjectRenewalFundDeclarationVO vo = new ProjectRenewalFundDeclarationVO(); + BeanUtils.copyProperties(renewal, vo); + // 查询项目信息 + if(Objects.nonNull(vo)){ + Project project = projectService.getById(renewal.getProjectId()); + if(Objects.isNull(project)){ + return vo; + } + vo.setApprovalAmount(project.getApprovalAmount()); + vo.setProjectName(project.getProjectName()); + vo.setProjectType(project.getProjectType()); + vo.setStage(project.getStage()); + vo.setStatus(project.getStatus()); + } + return vo; + } + + /** + * 申报 + * @param dto + * @return + */ + public Long declared(ProjectRenewalFundDeclarationDTO dto) { + ProjectRenewalFundDeclaration declaration = new ProjectRenewalFundDeclaration(); + BeanUtils.copyProperties(dto,declaration); + declaration.setId(null); + declaration.setCreateOn(LocalDateTime.now()); + declaration.setUpdateOn(LocalDateTime.now()); + declaration.setApprovalStatus(ProjectRenewalApprovalStatusEnum.PENDING.name()); + if(!projectRenewalFundDeclarationService.save(declaration)){ + throw new BusinessException("申报失败"); + } + return declaration.getId(); + } +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.java index e1d3f98..de87027 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.java @@ -1,7 +1,11 @@ package com.ningdatech.pmapi.projectlib.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ningdatech.pmapi.projectlib.model.entity.ProjectRenewalFundDeclaration; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ningdatech.pmapi.projectlib.model.po.ProjectRenewalFundDeclarationPO; +import com.ningdatech.pmapi.projectlib.model.req.ProjectRenewalListReq; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProjectRenewalFundDeclarationMapper extends BaseMapper { + Page pageSql(Page page,@Param("param") ProjectRenewalListReq req); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml index 0343e39..de14075 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml @@ -2,4 +2,44 @@ + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectRenewalFundDeclarationDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectRenewalFundDeclarationDTO.java new file mode 100644 index 0000000..f2e5ef8 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectRenewalFundDeclarationDTO.java @@ -0,0 +1,59 @@ +package com.ningdatech.pmapi.projectlib.model.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 续建项目资金申请 + *

+ * + * @author WendyYang + * @since 2023-02-15 + */ +@ApiModel(value = "NdProjectRenewalFundDeclarationDTO", description = "续建项目资金申请表") +@Data +public class ProjectRenewalFundDeclarationDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("关联项目ID") + private Long projectId; + + @ApiModelProperty("项目年份") + private Integer projectYear; + + @ApiModelProperty("年度支付金额") + private BigDecimal annualPaymentAmount; + + @ApiModelProperty("自有资金") + private BigDecimal haveAmount; + + @ApiModelProperty("政府投资 本级财务金额") + private BigDecimal govOwnFinanceAmount; + + @ApiModelProperty("政府投资 上级财务金额") + private BigDecimal govSuperiorFinanceAmount; + + @ApiModelProperty("银行贷款金额") + private BigDecimal bankLendingAmount; + + @ApiModelProperty("其它金额") + private BigDecimal otherAmount; + + @ApiModelProperty("单位code") + private String orgCode; + + @ApiModelProperty("区域code") + private String regionCode; + + @ApiModelProperty("是否删除 false未删 true已删") + private Boolean deleted; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectRenewalFundDeclaration.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectRenewalFundDeclaration.java index 9132e8c..e937f24 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectRenewalFundDeclaration.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectRenewalFundDeclaration.java @@ -1,11 +1,14 @@ package com.ningdatech.pmapi.projectlib.model.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** *

@@ -17,11 +20,13 @@ import io.swagger.annotations.ApiModelProperty; */ @TableName("nd_project_renewal_fund_declaration") @ApiModel(value = "NdProjectRenewalFundDeclaration对象", description = "续建项目资金申请表") +@Data public class ProjectRenewalFundDeclaration implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("主键") + @TableId(type = IdType.AUTO) private Long id; @ApiModelProperty("创建时间") @@ -57,117 +62,14 @@ public class ProjectRenewalFundDeclaration implements Serializable { @ApiModelProperty("审核状态 待审核PENGING 审核通过PASS 审核不通过NO_PASS") private String approvalStatus; + @ApiModelProperty("单位code") + private String orgCode; + + @ApiModelProperty("区域code") + private String regionCode; + @ApiModelProperty("是否删除 false未删 true已删") private Boolean deleted; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - public LocalDateTime getCreateOn() { - return createOn; - } - - public void setCreateOn(LocalDateTime createOn) { - this.createOn = createOn; - } - public LocalDateTime getUpdateOn() { - return updateOn; - } - - public void setUpdateOn(LocalDateTime updateOn) { - this.updateOn = updateOn; - } - public Long getProjectId() { - return projectId; - } - - public void setProjectId(Long projectId) { - this.projectId = projectId; - } - public Integer getProjectYear() { - return projectYear; - } - - public void setProjectYear(Integer projectYear) { - this.projectYear = projectYear; - } - public BigDecimal getAnnualPaymentAmount() { - return annualPaymentAmount; - } - - public void setAnnualPaymentAmount(BigDecimal annualPaymentAmount) { - this.annualPaymentAmount = annualPaymentAmount; - } - public BigDecimal getHaveAmount() { - return haveAmount; - } - - public void setHaveAmount(BigDecimal haveAmount) { - this.haveAmount = haveAmount; - } - public BigDecimal getGovOwnFinanceAmount() { - return govOwnFinanceAmount; - } - - public void setGovOwnFinanceAmount(BigDecimal govOwnFinanceAmount) { - this.govOwnFinanceAmount = govOwnFinanceAmount; - } - public BigDecimal getGovSuperiorFinanceAmount() { - return govSuperiorFinanceAmount; - } - - public void setGovSuperiorFinanceAmount(BigDecimal govSuperiorFinanceAmount) { - this.govSuperiorFinanceAmount = govSuperiorFinanceAmount; - } - public BigDecimal getBankLendingAmount() { - return bankLendingAmount; - } - - public void setBankLendingAmount(BigDecimal bankLendingAmount) { - this.bankLendingAmount = bankLendingAmount; - } - public BigDecimal getOtherAmount() { - return otherAmount; - } - - public void setOtherAmount(BigDecimal otherAmount) { - this.otherAmount = otherAmount; - } - public String getApprovalStatus() { - return approvalStatus; - } - - public void setApprovalStatus(String approvalStatus) { - this.approvalStatus = approvalStatus; - } - public Boolean getDeleted() { - return deleted; - } - - public void setDeleted(Boolean deleted) { - this.deleted = deleted; - } - - @Override - public String toString() { - return "NdProjectRenewalFundDeclaration{" + - "id=" + id + - ", createOn=" + createOn + - ", updateOn=" + updateOn + - ", projectId=" + projectId + - ", projectYear=" + projectYear + - ", annualPaymentAmount=" + annualPaymentAmount + - ", haveAmount=" + haveAmount + - ", govOwnFinanceAmount=" + govOwnFinanceAmount + - ", govSuperiorFinanceAmount=" + govSuperiorFinanceAmount + - ", bankLendingAmount=" + bankLendingAmount + - ", otherAmount=" + otherAmount + - ", approvalStatus=" + approvalStatus + - ", deleted=" + deleted + - "}"; - } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java new file mode 100644 index 0000000..83fa374 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java @@ -0,0 +1,77 @@ +package com.ningdatech.pmapi.projectlib.model.po; + +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; + +/** + *

+ * 续建项目资金申请表 + *

+ * + * @author WendyYang + * @since 2023-02-15 + */ +@ApiModel(value = "NdProjectRenewalFundDeclarationPO", description = "续建项目资金申请表") +@Data +public class ProjectRenewalFundDeclarationPO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("创建时间") + private LocalDateTime createOn; + + @ApiModelProperty("修改时间") + private LocalDateTime updateOn; + + @ApiModelProperty("关联项目ID") + private Long projectId; + + @ApiModelProperty("项目年份") + private Integer projectYear; + + @ApiModelProperty("年度支付金额") + private BigDecimal annualPaymentAmount; + + @ApiModelProperty("自有资金") + private BigDecimal haveAmount; + + @ApiModelProperty("政府投资 本级财务金额") + private BigDecimal govOwnFinanceAmount; + + @ApiModelProperty("政府投资 上级财务金额") + private BigDecimal govSuperiorFinanceAmount; + + @ApiModelProperty("银行贷款金额") + private BigDecimal bankLendingAmount; + + @ApiModelProperty("其它金额") + private BigDecimal otherAmount; + + @ApiModelProperty("审核状态 待审核PENGING 审核通过PASS 审核不通过NO_PASS") + private String approvalStatus; + + @ApiModelProperty("单位code") + private String orgCode; + + @ApiModelProperty("区域code") + private String regionCode; + + @ApiModelProperty("项目类型") + private Integer projectType; + + @ApiModelProperty("是否删除 false未删 true已删") + private Boolean deleted; + + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java new file mode 100644 index 0000000..7e4e5f1 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java @@ -0,0 +1,62 @@ +package com.ningdatech.pmapi.projectlib.model.req; + +import com.ningdatech.basic.model.PagePo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import java.util.List; + +/** + *

+ * ProjectRenewalListReq + *

+ * + * @author zpf + * @since 14:35 2023/2/15 + */ +@Data +@ApiModel("项目续建资金库列表查询") +@EqualsAndHashCode(callSuper = true) +public class ProjectRenewalListReq extends PagePo { + + @ApiModelProperty("区域编码") + private String regionCode; + + @ApiModelProperty("项目名称") + private String projectName; + + @ApiModelProperty("项目类型") + private Integer projectType; + + @ApiModelProperty("预算年度") + private Integer projectYear; + + @ApiModelProperty("项目阶段") + private Integer stage; + + @ApiModelProperty("项目状态") + private Integer status; + + @ApiModelProperty("创建时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createOnMin; + + @ApiModelProperty("创建时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createOnMax; + + @ApiModelProperty("用户ID") + private Long userId; + + @ApiModelProperty("单位code") + private String orgCode; + + @ApiModelProperty("项目阶段 多个") + private List stageList; + + @ApiModelProperty("项目状态 多个") + private List statusList; +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectRenewalFundDeclarationVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectRenewalFundDeclarationVO.java new file mode 100644 index 0000000..c732dd4 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectRenewalFundDeclarationVO.java @@ -0,0 +1,84 @@ +package com.ningdatech.pmapi.projectlib.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; + +/** + *

+ * 续建项目资金申请表 + *

+ * + * @author WendyYang + * @since 2023-02-15 + */ +@ApiModel(value = "NdProjectRenewalFundDeclarationVO", description = "续建项目资金申请表") +@Data +public class ProjectRenewalFundDeclarationVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("创建时间") + private LocalDateTime createOn; + + @ApiModelProperty("修改时间") + private LocalDateTime updateOn; + + @ApiModelProperty("项目年份") + private Integer projectYear; + + @ApiModelProperty("年度支付金额") + private BigDecimal annualPaymentAmount; + + @ApiModelProperty("自有资金") + private BigDecimal haveAmount; + + @ApiModelProperty("政府投资 本级财务金额") + private BigDecimal govOwnFinanceAmount; + + @ApiModelProperty("政府投资 上级财务金额") + private BigDecimal govSuperiorFinanceAmount; + + @ApiModelProperty("银行贷款金额") + private BigDecimal bankLendingAmount; + + @ApiModelProperty("其它金额") + private BigDecimal otherAmount; + + @ApiModelProperty("审核状态 待审核PENGING 审核通过PASS 审核不通过NO_PASS") + private String approvalStatus; + + @ApiModelProperty("是否删除 false未删 true已删") + private Boolean deleted; + + @ApiModelProperty("单位code") + private String orgCode; + + @ApiModelProperty("区域code") + private String regionCode; + + @ApiModelProperty("项目阶段") + private Integer stage; + + @ApiModelProperty("项目状态") + private Integer status; + + @ApiModelProperty("立项批复资金") + private BigDecimal approvalAmount; + + @ApiModelProperty("关联项目ID") + private Long projectId; + + @ApiModelProperty("关联项目名字") + private String projectName; + + @ApiModelProperty("项目类型 1建设 2运维") + private Integer projectType; +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/IProjectRenewalFundDeclarationService.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/IProjectRenewalFundDeclarationService.java index 987a573..aed12d6 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/IProjectRenewalFundDeclarationService.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/IProjectRenewalFundDeclarationService.java @@ -1,7 +1,10 @@ package com.ningdatech.pmapi.projectlib.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ningdatech.pmapi.projectlib.model.entity.ProjectRenewalFundDeclaration; import com.baomidou.mybatisplus.extension.service.IService; +import com.ningdatech.pmapi.projectlib.model.po.ProjectRenewalFundDeclarationPO; +import com.ningdatech.pmapi.projectlib.model.req.ProjectRenewalListReq; /** *

@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IProjectRenewalFundDeclarationService extends IService { + Page pageSql(Page page, ProjectRenewalListReq req); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectRenewalFundDeclarationServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectRenewalFundDeclarationServiceImpl.java index ccfcfdb..fedc224 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectRenewalFundDeclarationServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectRenewalFundDeclarationServiceImpl.java @@ -1,9 +1,13 @@ package com.ningdatech.pmapi.projectlib.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ningdatech.pmapi.projectlib.model.entity.ProjectRenewalFundDeclaration; import com.ningdatech.pmapi.projectlib.mapper.ProjectRenewalFundDeclarationMapper; +import com.ningdatech.pmapi.projectlib.model.po.ProjectRenewalFundDeclarationPO; +import com.ningdatech.pmapi.projectlib.model.req.ProjectRenewalListReq; import com.ningdatech.pmapi.projectlib.service.IProjectRenewalFundDeclarationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; /** @@ -15,6 +19,13 @@ import org.springframework.stereotype.Service; * @since 2023-02-15 */ @Service -public class ProjectRenewalFundDeclarationServiceImpl extends ServiceImpl implements IProjectRenewalFundDeclarationService { +@RequiredArgsConstructor +public class ProjectRenewalFundDeclarationServiceImpl extends + ServiceImpl implements IProjectRenewalFundDeclarationService { + private final ProjectRenewalFundDeclarationMapper mapper; + @Override + public Page pageSql(Page page, ProjectRenewalListReq req) { + return mapper.pageSql(page,req); + } }