purchase添加类型 以及新增字典查询方法

buhuazhen

2 天以前 6bb79064a8d717e191ceda7cb2dc1549d3613691

purchase添加类型
以及新增字典查询方法

 main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java

@@ -95,6 +95,11 @@
    @TableField(value = "coal_plan_id")
    private Long coalPlanId;
    /**
     * é‡‡è´­ç±»åž‹
     */
    @TableField(value = "purchase_type")
    private Integer purchaseType;
    /**
     * ç™»è®°æ—¥æœŸ
     */
    @TableField(value = "registration_date")

 main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java

@@ -93,4 +93,9 @@
     */
    @TableField(value = "freight")
    private BigDecimal freight;
    /**
     * é‡‡è´­ç±»åž‹
     */
    @TableField(value = "purchase_type")
    private Integer purchaseType;
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -49,6 +49,15 @@
        return getDataTable(list);
    }

    /**
     * èŽ·å–全部可用字段信息
     * @return
     */
    @GetMapping("/dictDataList")
    public AjaxResult dictDataList(){
       return AjaxResult.success(dictDataService.selectAllDictDataList());
    }

    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
    @PreAuthorize("@ss.hasPermi('system:dict:export')")
    @PostMapping("/export")

 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/DictDataVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.system.domain.vo;

import lombok.Data;
import lombok.RequiredArgsConstructor;

/**
 * @author buhuazhen
 * @date 2025/8/26
 * @email 3038525872@qq.com
 */
@Data
public class DictDataVo {
    private String label;
    private String value;
    private String type;
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java

@@ -19,6 +19,8 @@
     */
    public List<SysDictData> selectDictDataList(SysDictData dictData);

    public List<SysDictData> selectAllDictList();

    /**
     * æ ¹æ®å­—典类型查询字典数据
     * 

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

@@ -2,6 +2,7 @@

import java.util.List;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.vo.DictDataVo;

/**
 * å­—å…¸ ä¸šåŠ¡å±‚
@@ -57,4 +58,7 @@
     * @return ç»“æžœ
     */
    public int updateDictData(SysDictData dictData);

    public List<DictDataVo> selectAllDictDataList();

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

@@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl;

import java.util.List;

import com.ruoyi.system.domain.vo.DictDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -108,4 +110,15 @@
        }
        return row;
    }

    @Override
    public List<DictDataVo> selectAllDictDataList() {
       return dictDataMapper.selectAllDictList().stream().map(it->{
            DictDataVo dict =  new DictDataVo();
            dict.setLabel(it.getDictLabel());
            dict.setValue(it.getDictValue());
            dict.setType(it.getDictType());
            return dict;
        }).toList();
    }
}

 ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -59,8 +59,12 @@
    <select id="countDictDataByType" resultType="Integer">
        select count(1) from sys_dict_data where dict_type=#{dictType}  
    </select>
	
    <delete id="deleteDictDataById" parameterType="Long">
    <select id="selectAllDictList" resultType="com.ruoyi.common.core.domain.entity.SysDictData">
        <include refid="selectDictDataVo"/>
            where status = '0'
    </select>

    <delete id="deleteDictDataById" parameterType="Long">
         delete from sys_dict_data where dict_code = #{dictCode}
     </delete>