From 0912a30a9687ae8526a42f6453c2679039398532 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 24 二月 2025 23:59:14 +0800 Subject: [PATCH] 增加:2023年增发国债资金 字段 --- business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java | 3 +++ business/src/main/resources/mapper/ProjectInfoMapper.xml | 3 ++- business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 14 ++++++++++++++ business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java | 4 ++++ business/src/main/resources/mapper/ProjectInvestmentFundingMapper.xml | 3 +++ business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java | 3 +++ 6 files changed, 29 insertions(+), 1 deletions(-) diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java index 4ef110f..1777f59 100644 --- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java +++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java @@ -74,6 +74,14 @@ /** 涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id) */ private String competentDepartment; +// @TableField("competent_department_person") +// /** 涓荤閮ㄩ棬鑱旂郴浜� */ +// private Long competentDepartmentPerson; +// +// @TableField("competent_department_phone") +// /** 涓荤閮ㄩ棬鑱旂郴鏂瑰紡 */ +// private String competentDepartmentPhone; + @TableField("area") /** 琛屾斂鍖哄煙 */ private String area; @@ -164,10 +172,16 @@ @TableField("remark") /** 瀹℃牳淇℃伅 */ private String remark; + @TableField("industry_competent_department") + /** 琛屼笟涓荤閮ㄩ棬 */ private Long industryCompetentDepartment; + @TableField("industry_competent_department_person") + /** 琛屼笟涓荤閮ㄩ棬鑱旂郴浜� */ private Long industryCompetentDepartmentPerson; + @TableField("department_person_phone") + /** 琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡 */ private String departmentPersonPhone; } diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java b/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java index 5244337..05953d9 100644 --- a/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java +++ b/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentFunding.java @@ -31,6 +31,10 @@ /** 瓒呴暱鏈熺壒鍒浗鍊� */ private String nationalDebt; + @TableField("additional_national_debt") + /** 2023骞村鍙戝浗鍊鸿祫閲� */ + private String additionalNationalDebt; + @TableField("total_investment") /** 椤圭洰鎬绘姇璧勯 */ private String totalInvestment; diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java index aff965e..078a176 100644 --- a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java +++ b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentFundingForm.java @@ -31,6 +31,9 @@ @ApiModelProperty("瓒呴暱鏈熺壒鍒浗鍊�") private String nationalDebt; + @ApiModelProperty("2023骞村鍙戝浗鍊鸿祫閲�") + private String additionalNationalDebt; + @ApiModelProperty("椤圭洰鎬绘姇璧勯") private String totalInvestment; diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java index fa229ab..684962b 100644 --- a/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java +++ b/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentFundingVO.java @@ -30,6 +30,9 @@ @ApiModelProperty("瓒呴暱鏈熺壒鍒浗鍊�") private String nationalDebt; + @ApiModelProperty("2023骞村鍙戝浗鍊鸿祫閲�") + private String additionalNationalDebt; + /** 椤圭洰鎬绘姇璧勯 */ @ApiModelProperty("椤圭洰鎬绘姇璧勯") private String totalInvestment; diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml index 5694ac9..5615363 100644 --- a/business/src/main/resources/mapper/ProjectInfoMapper.xml +++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml @@ -74,7 +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, + TPIF.dept_bond as TPIF_dept_bond,TPIF.national_debt as TPIF_national_debt, TPIF.additional_national_debt as TPIF_additional_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, @@ -199,6 +199,7 @@ TPIF.create_by,TPIF.gmt_update,TPIF.update_by, TPIF.dept_bond, TPIF.national_debt, + TPIF.additional_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, diff --git a/business/src/main/resources/mapper/ProjectInvestmentFundingMapper.xml b/business/src/main/resources/mapper/ProjectInvestmentFundingMapper.xml index 3ccb767..f91aca6 100644 --- a/business/src/main/resources/mapper/ProjectInvestmentFundingMapper.xml +++ b/business/src/main/resources/mapper/ProjectInvestmentFundingMapper.xml @@ -9,6 +9,7 @@ <result column="principal" property="principal" /> <result column="dept_bond" property="deptBond" /> <result column="national_debt" property="nationalDebt" /> + <result column="additional_national_debt" property="additionalNationalDebt" /> <result column="government_investment_total" property="governmentInvestmentTotal" /> <result column="central_investment_total" property="centralInvestmentTotal" /> <result column="central_budget_investment" property="centralBudgetInvestment" /> @@ -49,6 +50,7 @@ TPIF.project_id, TPIF.dept_bond, TPIF.national_debt, + TPIF.additional_national_debt, TPIF.total_investment, TPIF.principal, TPIF.government_investment_total, @@ -91,6 +93,7 @@ TPIF.project_id, TPIF.dept_bond, TPIF.national_debt, + TPIF.additional_national_debt, TPIF.total_investment, TPIF.principal, TPIF.government_investment_total, -- Gitblit v1.8.0