Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-19 ae347a6603c94f73462c9c3e39c3e04476556d6e

Merge remote-tracking branch 'origin/master'

 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java

@@ -139,7 +139,7 @@
            }
        }
        ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
                .select(ProjectInfo::getCreateBy)
                .select(ProjectInfo::getProjectOwnerUnit)
                .eq(ProjectInfo::getId, form.getProjectId())
                .one();
        if (Objects.isNull(project)) {

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

@@ -15,7 +15,6 @@
        <result column="project_phase" property="projectPhase" />
        <result column="tag" property="tag" />
<!--        <result column="competent_department" property="competentDepartment" />-->
        <result column="area_code" property="areaCode" />
<!--        <result column="management_centralization" property="managementCentralization" />-->
        <result column="project_approval_type" property="projectApprovalType" />
        <result column="importance_type" property="importanceType" />
@@ -24,9 +23,6 @@
        <result column="create_project_time" property="createProjectTime" />
        <result column="plan_start_time" property="planStartTime" />
        <result column="plan_complete_time" property="planCompleteTime" />
        <result column="win_unit" property="winUnit" />
        <result column="win_amount" property="winAmount" />
        <result column="win_time" property="winTime" />
        <result column="project_address" property="projectAddress" />
        <result column="longitude" property="longitude" />
        <result column="latitude" property="latitude" />
@@ -34,8 +30,6 @@
        <result column="project_owner_unit_name" property="projectOwnerUnitName" />
        <result column="project_contact_person" property="projectContactPerson" />
        <result column="contact" property="contact" />
        <result column="gmt_create_time" property="gmtCreateTime" />
        <result column="gmt_update_time" property="gmtUpdateTime" />
        <result column="update_by" property="updateBy" />
        <result column="create_by" property="createBy" />
        <result column="process_def_id" property="processDefId" />