xiangpei
2024-11-29 7135c1017f16aa5ff5771c53ece1974b5fea01ac
sql字段
2个文件已修改
11 ■■■■■ 已修改文件
business/src/main/resources/mapper/ProjectInfoMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flowable/src/main/java/com/ycl/service/impl/FlowDefinitionServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -55,7 +55,7 @@
    <select id="getPage" resultMap="resultMap">
        SELECT
            TPI.*,TPP.process_instance_id as processId,
            TPI.*,TPP.process_ins_id as processId,
            TPIF.total_investment  as TPIF_totalInvestment,
            TPIF.principal as TPIF_principal,TPIF.government_investment_total as TPIF_government_investment_total,TPIF.central_investment_total as TPIF_central_investment_total,
            TPIF.central_budget_investment as TPIF_central_budget_investment,TPIF.central_fiscal_investment as TPIF_central_fiscal_investment,
@@ -144,10 +144,10 @@
                and TPI.create_project_time between #{query.projectStartTime} and #{query.projectEndTime}
            </if>
            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'reserve'">
                and TPP.process_instance_id is null
                and TPP.process_ins_id is null
            </if>
            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
                and TPP.process_instance_id is not null
                and TPP.process_ins_id is not null
            </if>
            <if test="query.projectCategory == 3">
                and (TPI.project_status = 'working' or TPI.project_status = 'stop')
@@ -157,7 +157,7 @@
    </select>
    <select id="homeCount" resultType="com.ycl.domain.vo.ProjectVO">
        SELECT TPI.*,TPIF.total_investment,TPP.process_instance_id as processId
        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
flowable/src/main/java/com/ycl/service/impl/FlowDefinitionServiceImpl.java
@@ -27,6 +27,7 @@
import org.flowable.image.impl.DefaultProcessDiagramGenerator;
import org.flowable.task.api.Task;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.IOException;
@@ -237,9 +238,11 @@
     * @param deployId 流程部署ID act_ge_bytearray 表中 deployment_id值
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delete(String deployId) {
        // true 允许级联删除 ,不设置会导致数据库外键关联异常
        repositoryService.deleteDeployment(deployId, true);
        // TODO 删除项目绑定的
    }