修改删除分类需要判断旗下是否有二级分类及分类下是否关联有办事指南bug

lidongdong

2022-10-13 3bfd069ac28bc270562afbfe95963193bec485cc

修改删除分类需要判断旗下是否有二级分类及分类下是否关联有办事指南bug

 flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java

@@ -7,6 +7,7 @@
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IClassifyAdministrationService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,6 +30,10 @@

    @Autowired(required = true)
    IClassifyAdministrationService iClassifyAdministrationService;

    @Autowired(required = true)
    ITransactionEventService iTransactionEventService;

    /**
     * 获取管理菜单列表
     * @return
@@ -127,6 +132,24 @@
        {
            return ResultData.error("id 不能为空");
        }

        /**
         * 根据上级id查询子分类
         * @param parentId
         * @return
         */
        List<String> list=iClassifyAdministrationService.selectParent(Id);
        if(list!=null && list.size()>0)
        {
            return ResultData.error("请先删除其下的二级分类");
        }

        List<String> listIds=iTransactionEventService.selectclassifyId(Id);
        if(listIds!=null && listIds.size()>0)
        {
            return ResultData.error("分类下有办事指南！不能删除");
        }

        return toAjax(iClassifyAdministrationService.deleteConfigById(Id));
    }


 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java

@@ -28,9 +28,6 @@
    @Autowired
    IGuideEvolveService iGuideEvolveService;

    //分类
    @Autowired
    IClassifyAdministrationService iClassifyAdministrationService;

    @Autowired
    HomeStatisticsService homeStatisticsService;
@@ -172,14 +169,14 @@
        pieChartAll.setFingerpostNum(homeStatisticsService.countStatisticsNum(null)+"");
        List<PieChart> workOrderList=new ArrayList<>();
        List<PieChart> fingerpostList=new ArrayList<>();
        List<ClassifyAdministration> oneIds=iClassifyAdministrationService.getClassify(null,"1");
        List<ClassifyAdministration> oneIds=homeStatisticsService.getClassify(null,"1");
        for (ClassifyAdministration oneClassify:oneIds)
        {
            PieChart workOrder=new PieChart();
            PieChart fingerpost=new PieChart();
            workOrder.setName(oneClassify.getClassifyName());
            fingerpost.setName(oneClassify.getClassifyName());
            List<ClassifyAdministration> twoIds = iClassifyAdministrationService.getClassify(oneClassify.getId()+"",null);
            List<ClassifyAdministration> twoIds = homeStatisticsService.getClassify(oneClassify.getId()+"",null);

            List clasIds=new ArrayList();


 flower_city/src/main/java/com/dg/core/db/gen/mapper/ClassifyAdministrationMapper.java

@@ -70,12 +70,13 @@


    /**
     * 首页统计用
     * 根据上级id查询子分类
     * @param parentId
     * @param classifyGrade
     * @return
     */
    public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
                                    @Param("classifyGrade") String classifyGrade);
    List<String>  selectParent(String parentId);




}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java

@@ -1,9 +1,11 @@
package com.dg.core.db.gen.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.Guidance;
import com.dg.core.db.gen.entity.GuidePlate;
import com.dg.core.db.gen.entity.OrganizationEntity;
import org.springframework.data.repository.query.Param;

import java.util.List;

@@ -74,4 +76,14 @@
     */
    int countStatisticsNum(List<String> classifyIds);


    /**
     * 首页统计用
     * @param parentId
     * @param classifyGrade
     * @return
     */
    public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
                                                    @Param("classifyGrade") String classifyGrade);

}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java

@@ -165,6 +165,11 @@
    String selectDataIfExist(@Param("departmentId") String departmentId,
                             @Param("matterName") String matterName);

    /**
     * 根据办事分类获取办事指南
     */
    List<String> selectclassifyId(String classifyId);



}

 flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java

@@ -1,8 +1,10 @@
package com.dg.core.service;

import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.Guidance;
import com.dg.core.db.gen.entity.GuidePlate;
import com.dg.core.db.gen.entity.OrganizationEntity;
import org.springframework.data.repository.query.Param;

import java.util.List;

@@ -71,4 +73,15 @@
     * 获取统计数据  首页用  勿动
     */
    int countStatisticsNum(List<String> classifyIds);


    /**
     * 首页统计用
     * @param parentId
     * @param classifyGrade
     * @return
     */
    public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
                                                    @Param("classifyGrade") String classifyGrade);

}

 flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java

@@ -72,17 +72,12 @@
     */
    ResultData queryListById(Integer id);


    /**
     * 首页统计用
     * 根据上级id查询子分类
     * @param parentId
     * @param classifyGrade
     * @return
     */
    public List<ClassifyAdministration> getClassify(String parentId,
                                    String classifyGrade);


    List<String>  selectParent(String parentId);


}

 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java

@@ -130,4 +130,11 @@
    String selectDataIfExist(@Param("departmentId") String departmentId,
                             @Param("matterName") String matterName);


    /**
     * 根据办事分类获取办事指南
     */
    List<String> selectclassifyId(String classifyId);


}

 flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java

@@ -70,10 +70,11 @@
    }

    @Override
    public List<ClassifyAdministration> getClassify(String parentId, String classifyGrade) {
        return baseMapper.getClassify(parentId,classifyGrade);
    public List<String> selectParent(String parentId) {
        return baseMapper.selectParent(parentId);
    }


    @Override
    public int insertConfig(ClassifyAdministration entity) {
        return baseMapper.insertConfig(entity);

 flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java

@@ -1,6 +1,7 @@
package com.dg.core.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.Guidance;
import com.dg.core.db.gen.entity.GuidePlate;
import com.dg.core.db.gen.entity.OrganizationEntity;
@@ -69,5 +70,10 @@
        return baseMapper.countStatisticsNum(classifyIds);
    }

    @Override
    public List<ClassifyAdministration> getClassify(String parentId, String classifyGrade) {
        return baseMapper.getClassify(parentId,classifyGrade);
    }


}

 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java

@@ -140,6 +140,11 @@
        return baseMapper.selectDataIfExist(departmentId,matterName);
    }

    @Override
    public List<String> selectclassifyId(String classifyId) {
        return baseMapper.selectclassifyId(classifyId);
    }


    @Override
    public int countNumByMatterName(String matterName) {

 flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml

@@ -101,22 +101,17 @@
        </where>
    </select>

    <!--  首页统计用  勿动  -->
    <select id="getClassify" parameterType="string" resultType="com.dg.core.db.gen.entity.ClassifyAdministration">
        select id,classify_name from automessage_classify_administration



    <select id="selectParent" resultType="string">
        select id from automessage_classify_administration
        <where>
            <if test="parentId != null and parentId != ''">
                AND parent_id=#{parentId}
            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND classify_grade = #{classifyGrade}
                AND parent_id = #{parentId}
            </if>
        </where>

    </select>







 flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml

@@ -111,6 +111,19 @@
    </select>


    <!--  首页统计用  勿动  -->
    <select id="getClassify" parameterType="string" resultType="com.dg.core.db.gen.entity.ClassifyAdministration">
        select id,classify_name from automessage_classify_administration
        <where>
            <if test="parentId != null and parentId != ''">
                AND parent_id=#{parentId}
            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND classify_grade = #{classifyGrade}
            </if>
        </where>

    </select>


</mapper>

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -375,10 +375,16 @@


    <select id="selectDataIfExist" resultType="string">
        select  id from automessage_transaction_event
        select id from automessage_transaction_event
        where department_id=#{departmentId}
        and matter_name=#{matterName}
    </select>

    <select id="selectclassifyId" resultType="string">
        select id from automessage_transaction_event
        where classify_id=#{classifyId}
    </select>



</mapper>