分页bug、多选修改不选时未清除数据库bug

xiangpei

2025-02-25 257ab33f3c19325d07d08240404e34fd34c21bbe

分页bug、多选修改不选时未清除数据库bug

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

@@ -160,21 +160,29 @@
        List<Long> competentDepartmentList = form.getCompetentDepartmentList();
        if(!CollectionUtils.isEmpty(competentDepartmentList)){
            entity.setCompetentDepartment(StringUtils.join(competentDepartmentList, ","));
        } else {
            entity.setCompetentDepartment("");
        }
        //资金类型转换
        List<String> fundTypeList = form.getFundTypeList();
        if(!CollectionUtils.isEmpty(fundTypeList)){
            entity.setFundType(StringUtils.join(fundTypeList, ","));
        } else {
            entity.setFundType("");
        }
        //重点分类转换
        List<String> importanceTypeList = form.getImportanceTypeList();
        if(!CollectionUtils.isEmpty(importanceTypeList)){
            entity.setImportanceType(StringUtils.join(importanceTypeList, ","));
        } else {
            entity.setImportanceType("");
        }
        //管理归口转换
        List<String> managementCentralizationList = form.getManagementCentralizationList();
        if(!CollectionUtils.isEmpty(managementCentralizationList)){
            entity.setManagementCentralization(StringUtils.join(managementCentralizationList, ","));
        } else {
            entity.setManagementCentralization("");
        }
        return entity;
    }

 business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java

@@ -61,5 +61,8 @@

    @ApiModelProperty("是否是异常项目查询：0 不是  1是")
    private Integer exe;

    @ApiModelProperty("是否是项目中心查询：0 不是  1是")
    private Integer center;
}


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

@@ -323,6 +323,9 @@
        if (query.getProjectEndTime() != null) {
            query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
        }
        if (YesOrNo.YES.getCode().equals(query.getCenter())) {
            query.setProjectPhase("6");
        }
        // 异常项目暂时返回空
        if (YesOrNo.YES.getCode().equals(query.getExe())) {
            return Result.ok().data(new ArrayList<>()).total(0);
@@ -464,15 +467,22 @@
                finish.add(item);
            }

            if (ImportanceTypeEnum.PROVINCIAL_KEY.getType().equals(item.getImportanceType())) {
                province.add(item);
            } else if (ImportanceTypeEnum.SUINING_KEY.getType().equals(item.getImportanceType())) {
                city.add(item);
            } else if (ImportanceTypeEnum.SHEHONG_KEY.getType().equals(item.getImportanceType())) {
                county.add(item);
            } else // if  (ImportanceTypeEnum.NORMAL.getType().equals(item.getImportanceType()))
            {
            if (StringUtils.isBlank(item.getImportanceType())) {
                normal.add(item);
                // 使用contains，因为重点分类可多选，使用,分割存储的
            } else {
                if (item.getImportanceType().contains(ImportanceTypeEnum.PROVINCIAL_KEY.getType())) {
                    province.add(item);
                }
                if (item.getImportanceType().contains(ImportanceTypeEnum.SUINING_KEY.getType())) {
                    city.add(item);
                }
                if (item.getImportanceType().contains(ImportanceTypeEnum.SHEHONG_KEY.getType())) {
                    county.add(item);
                }
                if (item.getImportanceType().contains(ImportanceTypeEnum.NORMAL.getType())) {
                    normal.add(item);
                }
            }
        });
        //单位先默认为元

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

@@ -124,7 +124,12 @@
                and TPI.project_type = #{query.projectType}
            </if>
            <if test="query.importanceType !=null and query.importanceType!=''">
                and TPI.importance_type = #{query.importanceType}
                and (
                TPI.importance_type like concat('%',#{query.importanceType},'%')
                <if test="query.importanceType == 'normal'">
                    or TPI.importance_type is null or TPI.importance_type = ''
                </if>
                )
            </if>
            <if test="query.tag !=null and query.tag!=''">
                and TPI.tag like concat('%',#{query.tag},'%')
@@ -135,7 +140,8 @@
            <if test="query.projectPhase !=null and query.projectPhase!='' and query.projectPhase!=6 and query.projectPhase!=5">
                and TPI.project_phase = #{query.projectPhase}
            </if>
            <if test="query.projectPhase != null and query.projectPhase != 5 ">
            /* 只要不是6就查审核通过的，6是项目中心 */
            <if test="query.projectPhase != 6">
                and TPI.used_status = 2
            </if>
            <if test="query.fundType !=null and query.fundType!=''">