From 6bb79064a8d717e191ceda7cb2dc1549d3613691 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 26 八月 2025 13:58:03 +0800
Subject: [PATCH] purchase添加类型 以及新增字典查询方法
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 9 ++++
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/DictDataVo.java | 16 ++++++++
ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml | 8 +++-
main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java | 5 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java | 13 ++++++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java | 2 +
main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java | 5 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java | 4 ++
8 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java b/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
index e46fc5a..4304a05 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
+++ b/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")
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java b/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java
index 890aa3b..2894994 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java
+++ b/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;
}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index f65492b..38579a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/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")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/DictDataVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/DictDataVo.java
new file mode 100644
index 0000000..7b020cf
--- /dev/null
+++ b/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;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
index a341f1e..091cd33 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
+++ b/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();
+
/**
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
index 9bc4f13..3f86756 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
+++ b/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();
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
index fced569..e9079e7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
+++ b/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();
+ }
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index d394930..3f2af4c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/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>
--
Gitblit v1.9.3