森林防火 供应商管理

rentaiming

2024-07-19 9712b44935d8a86ac063468cc35577e0da429049

森林防火 供应商管理

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java

@@ -53,6 +53,7 @@
            slGoodsMaterials.setGoodsMaterialsName(slGoodsMaterialsDTO.getGoodsMaterialsName());
            slGoodsMaterials.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
            slGoodsMaterials.setRepertory(slGoodsMaterialsDTO.getRepertory());
            this.save(slGoodsMaterials);
        }else{
            SlGoodsMaterials byId = this.getById(slGoodsMaterialsDTO.getId());
            if (slGoodsMaterialsDTO.getGoodsMaterialsName()!=null){

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java

@@ -43,7 +43,7 @@
                regionVoList3.add(regionVo);
            }
            if (regionVo.getLevel() == 4) {
                regionVoList3.add(regionVo);
                regionVoList4.add(regionVo);
            }
        }

@@ -58,9 +58,11 @@
            regionVoIterator4 = regionVoList4.iterator();
            while (regionVoIterator4.hasNext()) {
                children = regionVoIterator4.next();
                if (regionVo.getCode().equals(children.getParentId())) {
                if(children.getCode()!=null) {
                    if (regionVo.getCode().equals(children.getParentId().toString())) {
                    regionVo.getChildren().add(children);
                    regionVoIterator4.remove();
                    }
                }
            }
        }
@@ -76,9 +78,11 @@
            regionVoIterator3 = regionVoList3.iterator();
            while (regionVoIterator3.hasNext()) {
                children = regionVoIterator3.next();
                if (regionVo.getCode().equals(children.getParentId())) {
                if(children.getCode()!=null){
                    if (regionVo.getCode().equals(children.getParentId().toString())) {
                    regionVo.getChildren().add(children);
                    regionVoIterator3.remove();
                    }
                }
            }
        }
@@ -91,11 +95,14 @@
            regionVoIterator2 = regionVoList2.iterator();
            while (regionVoIterator2.hasNext()) {
                children = regionVoIterator2.next();
                if (regionVo.getCode().equals(children.getParentId())) {
                if (regionVo.getCode()!=null){
                    if (regionVo.getCode().equals(children.getParentId().toString())) {
                    regionVo.getChildren().add(children);
                    regionVoIterator2.remove();
                }
            }

            }
        }
        // 返回处理后的地区列表
        return regionVoList1;

 ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlRegionMapper.xml

@@ -1,23 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.rouyi.management.mapper.SlRegionMapper">
<mapper namespace="com.ruoyi.management.mapper.SlRegionMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlRegion">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="code" property="code" />
        <result column="citycode" property="citycode" />
        <result column="parent_id" property="parentId" />
        <result column="english" property="english" />
        <result column="level" property="level" />
        <result column="hierarchy" property="hierarchy" />
        <result column="all_name" property="allName" />
    </resultMap>

    <select id="listRegionVo" resultType="com.ruoyi.management.domain.vo.RegionVo">
        SELECT tr.id id, tr.parent_id parentId, tr.level level, tr.code value, tr.name label
        FROM t_region tr
        SELECT tr.id id, tr.parent_id parentId, tr.level level, tr.code code, tr.name label
        FROM sl_region tr
    </select>

</mapper>