xiangpei
2025-02-22 d08fd7c3f0d3b11c19314b8f9677ee8626d50a49
项目投资及资金来源增设:地方政府专项债券、超长期特别国债
7个文件已修改
61 ■■■■ 已修改文件
business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/resources/mapper/ProjectInfoMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/resources/mapper/ProjectInvestmentFundingMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java
@@ -23,6 +23,14 @@
    /** 项目id */
    private Long projectId;
    @TableField("dept_bond")
    /** 地方政府专项债券 */
    private String deptBond;
    @TableField("national_debt")
    /** 超长期特别国债 */
    private String nationalDebt;
    @TableField("total_investment")
    /** 项目总投资额 */
    private String totalInvestment;
business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
@@ -203,6 +203,10 @@
    @ExcelProperty(value = "建设性质")
    private String constructionNature;
    @ExcelProperty(value = "是否招商引资项目")
    /** 是否招商引资项目:0 不是  1 是 */
    private String attractInvestment;
    /**
     * 联系方式
     */
@@ -342,6 +346,12 @@
    @ExcelProperty(value = "项目总投资额")
    private String totalInvestment;
    @ExcelProperty(value = "地方政府专项债券")
    private String deptBond;
    @ExcelProperty(value = "超长期特别国债")
    private String nationalDebt;
    /**
     * 项目本金
     */
business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java
@@ -1,17 +1,16 @@
package com.ycl.domain.form;
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
import com.ycl.system.domain.base.AbsForm;
import com.ycl.common.group.Update;
import com.ycl.domain.entity.ProjectInvestmentFunding;
import org.springframework.beans.BeanUtils;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import org.springframework.lang.NonNull;
import com.ycl.system.domain.base.AbsForm;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;
import javax.validation.constraints.NotNull;
/**
 * 项目投资及资金来源情况表表单
@@ -26,6 +25,12 @@
    @ApiModelProperty("项目id")
    private Long projectId;
    @ApiModelProperty("地方政府专项债券")
    private String deptBond;
    @ApiModelProperty("超长期特别国债")
    private String nationalDebt;
    @ApiModelProperty("项目总投资额")
    private String totalInvestment;
business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java
@@ -24,6 +24,12 @@
    @ApiModelProperty("项目id")
    private Long projectId;
    @ApiModelProperty("地方政府专项债券")
    private String deptBond;
    @ApiModelProperty("超长期特别国债")
    private String nationalDebt;
    /** 项目总投资额 */
    @ApiModelProperty("项目总投资额")
    private String totalInvestment;
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -117,7 +117,7 @@
            entity.setUsedStatus(ProjectConstant.PASS);
        }
        if(!checkProjectNameAndIdIsUnique(entity,null)){
            return Result.error("项目重复,项目名称、项目码已存在");
            throw new RuntimeException("项目重复,项目名称、项目码已存在");
        }
        baseMapper.insert(entity);
        addPlan(entity.getId()); //添加计划表
@@ -194,7 +194,7 @@
            entity.setUsedStatus(ProjectConstant.PASS);
        }
        if(!checkProjectNameAndIdIsUnique(entity,form.getId())){
            return Result.error("项目重复,项目名称、项目码已存在");
            throw new RuntimeException("项目重复,项目名称、项目码已存在");
        }
        //更新项目信息
        baseMapper.updateById(entity);
@@ -811,11 +811,10 @@
            if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
                //新增
                return ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm());
                ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm());
            } else {
                //更新
                return ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
                ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
            }
        }
        if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -74,6 +74,7 @@
            TPIF.county_fiscal_investment as TPIF_county_fiscal_investment,TPIF.county_special_fund_investment as TPIF_county_special_fund_investment,
            TPIF.domestic_loan_total as TPIF_domestic_loan_total,TPIF.bank_loan as TPIF_bank_loan,TPIF.foreign_investment_total as TPIF_foreign_investment_total,
            TPIF.enterprise_self_raised_total as TPIF_enterprise_self_raised_total,TPIF.other_investment_total as TPIF_other_investment_total,
            TPIF.dept_bond as TPIF_dept_bond,TPIF.national_debt as TPID_national_debt,
            TPII.be_cross_region as TPII_be_cross_region,TPII.construction_location as TPII_construction_location,
            TPII.detailed_address as TPII_detailed_address,TPII.be_compensation_project as TPII_be_compensation_project,TPII.compensation_reason as TPII_compensation_reason,
            TPII.planned_start_date as TPII_planned_start_date,TPII.expected_completion_date as TPII_expected_completion_date,
@@ -205,6 +206,8 @@
        TPIF.county_investment_total,TPIF.county_budget_investment,TPIF.county_fiscal_investment,
        TPIF.county_special_fund_investment,TPIF.domestic_loan_total,TPIF.bank_loan,TPIF.foreign_investment_total,TPIF.enterprise_self_raised_total,TPIF.other_investment_total,TPIF.gmt_create,
        TPIF.create_by,TPIF.gmt_update,TPIF.update_by,
        TPIF.dept_bond,
        TPIF.national_debt,
        TPII.id,TPII.project_id,TPII.be_cross_region,TPII.construction_location,TPII.detailed_address,TPII.be_compensation_project,TPII.compensation_reason,TPII.planned_start_date,
        TPII.expected_completion_date,TPII.national_industry_classification,TPII.industry_classification,TPII.project_nature,TPII.project_attribute,
        TPII.use_earth,TPII.content_scale,TPII.code,TPII.gmt_create,TPII.create_by,TPII.gmt_update, TPII.update_by,
business/src/main/resources/mapper/ProjectInvestmentFundingMapper.xml
@@ -7,6 +7,8 @@
        <result column="project_id" property="projectId" />
        <result column="total_investment" property="totalInvestment" />
        <result column="principal" property="principal" />
        <result column="dept_bond" property="deptBond" />
        <result column="national_debt" property="nationalDebt" />
        <result column="government_investment_total" property="governmentInvestmentTotal" />
        <result column="central_investment_total" property="centralInvestmentTotal" />
        <result column="central_budget_investment" property="centralBudgetInvestment" />
@@ -45,6 +47,8 @@
    <select id="getById" resultMap="BaseResultMap">
        SELECT
            TPIF.project_id,
            TPIF.dept_bond,
            TPIF.national_debt,
            TPIF.total_investment,
            TPIF.principal,
            TPIF.government_investment_total,
@@ -85,6 +89,8 @@
    <select id="getPage" resultMap="BaseResultMap">
        SELECT
            TPIF.project_id,
            TPIF.dept_bond,
            TPIF.national_debt,
            TPIF.total_investment,
            TPIF.principal,
            TPIF.government_investment_total,