Merge remote-tracking branch 'origin/master'

xiangpei

2025-03-24 7a79d42944f2535814966e10368b8ef8dce3e0fb

Merge remote-tracking branch 'origin/master'

 business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java

@@ -58,4 +58,8 @@
    /** 年份 */
    private String year;

    @TableField("build_content")
    /** 建设内容 */
    private String buildContent;

}

 business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java

@@ -58,6 +58,9 @@
    @ApiModelProperty("父工程")
    private String parent;

    @ApiModelProperty("建设内容")
    private String buildContent;

    public static ProjectEngineering getEntityByForm(@NonNull ProjectEngineeringForm form, ProjectEngineering entity) {
        if(entity == null) {
          entity = new ProjectEngineering();

 business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java

@@ -91,6 +91,10 @@
    @ApiModelProperty("业主单位名字")
    private String unitName;

    /** 建设内容 */
    @ApiModelProperty("建设内容")
    private String buildContent;

    /** 工程列表 */
    @ApiModelProperty("子工程列表")
    private List<ProjectEngineeringVO> children = new ArrayList<ProjectEngineeringVO>();

 business/src/main/resources/mapper/ProjectEngineeringMapper.xml

@@ -17,6 +17,7 @@
        <result column="year" property="year" />
        <result column="unit_name" property="unitName" />
        <result column="department_name" property="departmentName" />
        <result column="build_content" property="buildContent"/>
        <collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineering" column="id"></collection>

    </resultMap>
@@ -34,6 +35,7 @@
                TPE.department,
                TPE.parent_id,
                TPE.year,
                TPE.build_content,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.unit) AS unit_name,
                (SELECT  SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.department) AS department_name
        FROM t_project_engineering TPE
@@ -53,7 +55,8 @@
            TPE.unit,
            TPE.department,
            TPE.parent_id,
            TPE.year
            TPE.year,
            TPE.build_content
        FROM
            t_project_engineering TPE
        WHERE
@@ -73,6 +76,7 @@
            TPE.parent_id,
            TPE.year,
            TPI.project_name,
            TPE.build_content,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.unit) AS unit_name,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.department) AS department_name
        FROM

 business/src/main/resources/mapper/ProjectProcessMapper.xml

@@ -79,6 +79,7 @@
        <result column="competent_department_name" property="competentDepartmentName" />
        <result column="process_ins_id" property="processInsId" />
        <result column="process_def_id" property="processDefId" />
        <result column="build_content" property="buildContent" />
    </resultMap>

    <select id="getProjectEngineeringList" parameterType="string" resultMap="EngineeringMap">
@@ -105,13 +106,13 @@
    <select id="getEngineeringList" parameterType="long" resultMap="EngineeringMap">
        WITH RECURSIVE temp_table AS (
            SELECT
                id, project_info_id, project_name, project_type, investment_amount, status, unit, department, parent_id, year, gmt_create  FROM t_project_engineering WHERE project_info_id = #{projectId} AND parent_id = '0' AND deleted = 0
                id, project_info_id, project_name, project_type, investment_amount, status, unit, department, parent_id, year, gmt_create, build_content  FROM t_project_engineering WHERE project_info_id = #{projectId} AND parent_id = '0' AND deleted = 0
            UNION ALL
            SELECT
                TPE.id, TPE.project_info_id, TPE.project_name, TPE.project_type, TPE.investment_amount, TPE.status, TPE.unit, TPE.department, TPE.parent_id, TPE.year, TPE.gmt_create FROM t_project_engineering TPE INNER JOIN temp_table tb ON TPE.parent_id = tb.id AND TPE.deleted = 0
                TPE.id, TPE.project_info_id, TPE.project_name, TPE.project_type, TPE.investment_amount, TPE.status, TPE.unit, TPE.department, TPE.parent_id, TPE.year, TPE.gmt_create, TPE.build_content FROM t_project_engineering TPE INNER JOIN temp_table tb ON TPE.parent_id = tb.id AND TPE.deleted = 0
        )
        SELECT
            TT.id, TT.project_info_id, TT.project_name, TT.project_type, TT.investment_amount, TT.status, TT.unit, TT.department, TT.parent_id, TT.year, TT.gmt_create,
            TT.id, TT.project_info_id, TT.project_name, TT.project_type, TT.investment_amount, TT.status, TT.unit, TT.department, TT.parent_id, TT.year, TT.gmt_create,TT.build_content,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.unit) AS project_owner_unit_name,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.department) AS competent_department_name,
            TPP.process_ins_id, TPP.process_def_id