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

@@ -1863,11 +1863,22 @@
                            continue;
                        }
                        if (s.startsWith("fileupload")) {
                            List files = (List) newP.get(s);
                            Object o = newP.get(s);
                            log.info("输出object------------》{}",JSON.toJSONString(o));
                            if (Objects.isNull(o)) {
                                continue;
                            }
                            List files = (List) o;
                            for (Object file : files) {
                                LinkedHashMap<String, String> fileMap = (LinkedHashMap<String, String>) file;
                                String url = fileMap.get("url");
                                if (StringUtils.isBlank(url)) {
                                        continue;
                                }
                                fileMap.put("url", url.replace("42.193.1.25", this.targetIp));
                                if (url.contains("119.6.246.90")){
                                fileMap.put("url", url.replace("119.6.246.90", this.targetIp));
                                }
                            }
                        }
                    }

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

@@ -371,7 +371,7 @@
            // 获取本年度的投资金额
            List<ProjectInfoYearPlan> yearPlans = new LambdaQueryChainWrapper<>(projectInfoYearPlanService.getBaseMapper())
                    .eq(ProjectInfoYearPlan::getProjectInfoId, projectVO.getId())
                    .eq(ProjectInfoYearPlan::getYear, year)
                    .eq(ProjectInfoYearPlan::getYear, String.valueOf(year))
                    .list();
            if (! CollectionUtils.isEmpty(yearPlans)) {
                projectVO.setYearInvestAmount(yearPlans.get(0).getYearTotalMoney());

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

@@ -108,12 +108,12 @@
            d.dept_name as project_owner_unit_name
        FROM
            t_project_info TPI
        LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
        LEFT JOIN t_project_investment_info TPII ON TPI.id = TPII.project_id and TPII.deleted = 0
        LEFT JOIN t_project_investment_policy_compliance TPIPC ON TPI.id = TPIPC.project_id and TPIPC.deleted = 0
        LEFT JOIN t_project_unit_registration_info TPURI ON TPI.id = TPURI.project_id and TPURI.deleted = 0
        LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
        LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
        LEFT JOIN t_project_investment_funding TPIF ON CONCAT('', TPI.id) = CONCAT('', TPIF.project_id) and TPIF.deleted = 0
        LEFT JOIN t_project_investment_info TPII ON CONCAT('', TPI.id) = CONCAT('', TPII.project_id) and TPII.deleted = 0
        LEFT JOIN t_project_investment_policy_compliance TPIPC ON CONCAT('', TPI.id) = CONCAT('', TPIPC.project_id) and TPIPC.deleted = 0
        LEFT JOIN t_project_unit_registration_info TPURI ON CONCAT('', TPI.id) = CONCAT('', TPURI.project_id) and TPURI.deleted = 0
        LEFT JOIN t_project_process TPP ON CONCAT('', TPI.id) = CONCAT('', TPP.project_id) and TPP.deleted = 0
        LEFT JOIN sys_dept d ON CONCAT('', d.dept_id) = TPI.project_owner_unit
        <where>
            TPI.deleted = 0
            <if test="query.coding !=null and query.coding!=''">
@@ -178,15 +178,23 @@
                ${query.params.dataScope}
            </if>
        </where>
        ORDER BY FIELD(TPI.used_status, 1, -1, 0, 2), TPI.gmt_create ASC
        ORDER BY
            CASE
                WHEN TPI.used_status = 1 THEN 1
                WHEN TPI.used_status = -1 THEN 2
                WHEN TPI.used_status = 0 THEN 3
                WHEN TPI.used_status = 2 THEN 4
                ELSE 5
            END,
            TPI.gmt_create ASC
    </select>

    <select id="homeCount" parameterType="com.ycl.common.core.domain.BaseEntity" resultType="com.ycl.domain.vo.ProjectVO">
        SELECT TPI.*,TPIF.total_investment,TPP.process_ins_id as processId
        FROM t_project_info TPI
        LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
        LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
        LEFT JOIN sys_dept d ON TPI.project_owner_unit = d.dept_id
        LEFT JOIN t_project_investment_funding TPIF ON CONCAT('', TPI.id) = CONCAT('', TPIF.project_id) and TPIF.deleted = 0
        LEFT JOIN t_project_process TPP ON CONCAT('', TPI.id) = CONCAT('', TPP.project_id) and TPP.deleted = 0
        LEFT JOIN sys_dept d ON TPI.project_owner_unit = CONCAT('', d.dept_id)
        <where>
            TPI.deleted = 0 AND TPI.used_status = 2
            ${params.dataScope}
@@ -221,10 +229,10 @@
        TPURI.legal_representative,TPURI.fixed_phone,TPURI.legal_person_idcard,TPURI.project_contact_person,TPURI.phone,TPURI.contact_idcard,
        TPURI.wechat,TPURI.contact_address,TPURI.post_code,TPURI.email,TPURI.create_by,TPURI.update_by,TPURI.gmt_create,TPURI.gmt_update
        from t_project_info TPI
        left join t_project_investment_funding TPIF on TPI.id = TPIF.project_id and TPIF.deleted = 0
        left join t_project_investment_info TPII on TPI.id = TPII.project_id and TPII.deleted = 0
        left join t_project_unit_registration_info TPURI on TPI.id = TPURI.project_id and TPURI.deleted = 0
        left join t_project_investment_policy_compliance TPIPC on TPI.id = TPIPC.project_id and TPIPC.deleted = 0
        left join t_project_investment_funding TPIF on CONCAT('', TPI.id) = CONCAT('', TPIF.project_id) and TPIF.deleted = 0
        left join t_project_investment_info TPII on CONCAT('', TPI.id) = CONCAT('', TPII.project_id) and TPII.deleted = 0
        left join t_project_unit_registration_info TPURI on CONCAT('', TPI.id) = CONCAT('', TPURI.project_id) and TPURI.deleted = 0
        left join t_project_investment_policy_compliance TPIPC on CONCAT('', TPI.id) = CONCAT('', TPIPC.project_id) and TPIPC.deleted = 0
        <where>
            TPI.deleted =0
            <if test="dataIdList != null and dataIdList.size > 0">

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

@@ -93,10 +93,10 @@
                TPE.department,
                TPE.parent_id,
                TPE.year,
                (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
                (SELECT  SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = TPE.unit) AS unit_name,
                (SELECT  SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = TPE.department) AS department_name
        FROM t_project_engineering TPE
                 INNER JOIN t_project_info TPI ON TPI.id = TPE.project_info_id AND TPI.deleted = 0
                 INNER JOIN t_project_info TPI ON CONCAT('', TPI.id) = CONCAT('', TPE.project_info_id) AND TPI.deleted = 0
        WHERE
              TPE.parent_id = #{id} and TPE.deleted = 0
        ORDER BY
@@ -113,12 +113,12 @@
        )
        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.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,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = TT.unit) AS project_owner_unit_name,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = TT.department) AS competent_department_name,
            TPP.process_ins_id, TPP.process_def_id
        FROM
            temp_table TT
                LEFT JOIN t_project_process TPP ON TPP.project_id = TT.id AND TPP.deleted = 0 AND TPP.project_type = 'ENGINEERING'
                LEFT JOIN t_project_process TPP ON CONCAT('', TPP.project_id) = CONCAT('', TT.id) AND TPP.deleted = 0 AND TPP.project_type = 'ENGINEERING'
        ORDER BY
            TT.gmt_create DESC
    </select>
@@ -142,14 +142,14 @@
            TPP.process_def_id,
            TPP.process_ins_id,
            TPIF.total_investment as investmentAmount,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE SD.dept_id = PI.project_owner_unit) AS project_owner_unit_name,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE SD.dept_id = PI.competent_department) AS competent_department_name,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = PI.project_owner_unit) AS project_owner_unit_name,
            (SELECT  SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = PI.competent_department) AS competent_department_name,
            d.dept_name as project_owner_unit_name
        FROM
            t_project_info PI
                LEFT JOIN t_project_investment_funding TPIF ON TPIF.project_id = PI.id AND TPIF.deleted = 0
                LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0
                LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit
                LEFT JOIN t_project_investment_funding TPIF ON CONCAT('', TPIF.project_id) = CONCAT('', PI.id) AND TPIF.deleted = 0
                LEFT JOIN t_project_process TPP ON CONCAT('', TPP.project_id) = CONCAT('', PI.id) AND TPP.deleted = 0
                LEFT JOIN sys_dept d ON CONCAT('', d.dept_id) = PI.project_owner_unit
        <where>
            AND PI.used_status = 2 AND PI.deleted = 0
            <if test="query.projectName != null and query.projectName != ''">
@@ -169,14 +169,14 @@
               PI.id, PI.project_name
        FROM
             t_project_process PP
                 INNER JOIN t_project_info PI ON PP.project_id = PI.id AND PI.deleted = 0 AND PP.process_ins_id = #{processInsId}
                 INNER JOIN t_project_info PI ON CONCAT('', PP.project_id) = CONCAT('', PI.id) AND PI.deleted = 0 AND PP.process_ins_id = #{processInsId}
    </select>


    <select id="getNormalInsIds" resultType="string">
        SELECT TPP.process_ins_id FROM t_project_info TPI INNER JOIN t_project_process TPP ON TPI.id = TPP.project_id AND TPI.deleted = 0 AND TPP.project_type = 'PROJECT'
        SELECT TPP.process_ins_id FROM t_project_info TPI INNER JOIN t_project_process TPP ON CONCAT('', TPI.id) = CONCAT('', TPP.project_id) AND TPI.deleted = 0 AND TPP.project_type = 'PROJECT'
        UNION ALL
        SELECT TPP.process_ins_id FROM t_project_engineering TPE INNER JOIN t_project_process TPP ON TPE.id = TPP.project_id AND TPE.deleted = 0 AND TPP.project_type = 'ENGINEERING'
        SELECT TPP.process_ins_id FROM t_project_engineering TPE INNER JOIN t_project_process TPP ON CONCAT('', TPE.id) = CONCAT('', TPP.project_id) AND TPE.deleted = 0 AND TPP.project_type = 'ENGINEERING'
    </select>

    <resultMap id="flowableVarVOResultMap" type="com.ycl.domain.vo.FlowableVarVO">

 start/pom.xml

@@ -42,7 +42,13 @@
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
        </dependency>

        <dependency>
            <groupId>com.local</groupId>
            <artifactId>myjar</artifactId>
            <version>1.0</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/resources/lib/JDBC-VB_P-2.13-2025082015.jar</systemPath> <!-- 关键：jar 路径 -->
        </dependency>
        <!-- 系统模块-->
        <dependency>
            <groupId>com.ycl</groupId>
@@ -58,6 +64,7 @@
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>2.5.15</version>
                <configuration>
                    <includeSystemScope>true</includeSystemScope>
                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                </configuration>
                <executions>

 start/src/main/resources/application-dev.yml

@@ -40,14 +40,13 @@
                max-wait: -1ms
    datasource:
        type: com.alibaba.druid.pool.DruidDataSource
        driverClassName: com.mysql.cj.jdbc.Driver
        driverClassName: org.postgresql.Driver
        druid:
            # 主库数据源
            master:
#                url: jdbc:mysql://42.193.1.25:3306/project_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                url: jdbc:mysql://42.193.1.25:3306/project_management_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowMultiQueries=true
                username: root
                password: 321$YcYl@1970!
                url: jdbc:postgresql://172.27.30.2:5432/project_management
                username: project
                password: Mysql@my
            # 从库数据源
            slave:
                # 从数据源开关/默认关闭

 start/src/main/resources/application.yml

@@ -90,7 +90,7 @@

# PageHelper分页插件
pagehelper:
  helperDialect: mysql
  helperDialect: postgresql
  supportMethodsArguments: true
  params: count=countSql


 start/src/main/resources/lib/JDBC-VB_P-2.13-2025082015.jar

Binary files differ