xiangpei
2025-02-20 f964eea96288e345a5b001909f3f718c78d19f06
项目增加项目子类型字段
6个文件已修改
30 ■■■■ 已修改文件
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/resources/mapper/ProjectInfoMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -39,9 +39,13 @@
    private String constructionNature;
    @TableField("project_type")
    /** 项目类型(0房屋建筑,1城市基础设施,2交通运输,3水利,4能源,5非煤矿山,6其他) */
    /** 项目类型 */
    private String projectType;
    @TableField("project_sub_type")
    /** 项目子类型 */
    private String projectSubType;
    @TableField("project_status")
    /** 项目状态  (0未开工,1已开工,2已竣工,3暂停) */
    private String projectStatus;
business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
@@ -48,6 +48,12 @@
    private String projectType;
    /**
     * 项目类型
     */
    @ExcelProperty(value = "项目子类型",converter = ExcelEnumConvert.class)
    private String projectSubType;
    /**
     * 项目状态
     */
    @ExcelProperty(value = "项目状态",converter = ExcelEnumConvert.class)
business/src/main/java/com/ycl/domain/excel/ProjectTempImport.java
@@ -21,6 +21,9 @@
    @ExcelProperty(value = "项目类型")
    private String projectType;
    @ExcelProperty(value = "项目子类型")
    private String projectSubType;
    @ExcelProperty(value = "建设内容")
    private String content;
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -45,9 +45,12 @@
    @ApiModelProperty("建设性质")
    private String constructionNature;
    @ApiModelProperty("项目类型(0房屋建筑,1城市基础设施,2交通运输,3水利,4能源,5非煤矿山,6其他)")
    @ApiModelProperty("项目类型")
    private String projectType;
    @ApiModelProperty("项目子类型")
    private String projectSubType;
    @ApiModelProperty("项目状态  (0未开工,1已开工,2已竣工,3暂停)")
    private String projectStatus;
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -43,10 +43,13 @@
    @ApiModelProperty("建设性质")
    private String constructionNature;
    /** 项目类型(0房屋建筑,1城市基础设施,2交通运输,3水利,4能源,5非煤矿山,6其他) */
    @ApiModelProperty("项目类型(0房屋建筑,1城市基础设施,2交通运输,3水利,4能源,5非煤矿山,6其他)")
    /** 项目类型 */
    @ApiModelProperty("项目类型")
    private String projectType;
    @ApiModelProperty("项目子类型")
    private String projectSubType;
    /** 项目状态  (0未开工,1已开工,2已竣工,3暂停) */
    @ApiModelProperty("项目状态  (0未开工,1已开工,2已竣工,3暂停)")
    private String projectStatus;
business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -18,6 +18,7 @@
            TPI.content,
            TPI.construction_nature,
            TPI.project_type,
            TPI.project_sub_type,
            TPI.project_status,
            TPI.fund_type,
            TPI.invest_type,
@@ -194,7 +195,7 @@
    <select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO">
        select
        TPI.id as id,TPI.project_name,TPI.project_code,TPI.content,TPI.construction_nature,TPI.project_type,TPI.project_status,TPI.fund_type,TPI.invest_type,TPI.project_phase,
        TPI.id as id,TPI.project_name,TPI.project_code,TPI.content,TPI.construction_nature,TPI.project_type,TPI.project_sub_type,TPI.project_status,TPI.fund_type,TPI.invest_type,TPI.project_phase,
        TPI.tag,TPI.competent_department,TPI.area,TPI.management_centralization,TPI.project_approval_type,TPI.importance_type,TPI.year,TPI.year_invest_amount,TPI.create_project_time,TPI.plan_start_time,
        TPI.plan_complete_time,TPI.win_unit,TPI.win_amount,TPI.win_time,TPI.project_address,TPI.longitude,TPI.latitude,
        TPI.project_owner_unit,TPI.project_contact_person,TPI.contact,TPI.gmt_create,TPI.gmt_update,TPI.update_by,TPI.create_by,