From 15d08948d61801d26c4bb8b80c356c5202d45138 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 27 Jan 2026 16:18:43 +0800
Subject: [PATCH] =?UTF-8?q?1.0.61=20=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/base/domain/BaseMaterialInfo.java      |  5 ++
 .../oa/base/domain/bo/BaseMaterialInfoBo.java |  5 ++
 .../oa/base/domain/vo/BaseMaterialInfoVo.java | 48 ++++++++++++++++++-
 .../impl/BaseMaterialInfoServiceImpl.java     |  5 +-
 .../mapper/oa/base/BaseMaterialInfoMapper.xml | 43 +++++++++--------
 5 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseMaterialInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseMaterialInfo.java
index b9205345..b993204f 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseMaterialInfo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseMaterialInfo.java
@@ -77,6 +77,11 @@ public class BaseMaterialInfo extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 添加方式(1物料页面 2合同页面 3导入)
+     */
+    private String addMethod;
+
     /**
      * 激活标识（1是 0否）
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseMaterialInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseMaterialInfoBo.java
index 4c13f1db..9695d488 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseMaterialInfoBo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseMaterialInfoBo.java
@@ -83,6 +83,11 @@ public class BaseMaterialInfoBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 添加方式(1物料页面 2合同页面 3导入)
+     */
+    private String addMethod;
+
     /**
      * 激活标识（1是 0否）
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseMaterialInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseMaterialInfoVo.java
index 1b1f8324..4d1b518e 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseMaterialInfoVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseMaterialInfoVo.java
@@ -10,7 +10,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-
+import java.util.Date;
 
 
 /**
@@ -99,6 +99,13 @@ public class BaseMaterialInfoVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 添加方式(1物料页面 2合同页面 3导入)
+     */
+    @ExcelProperty(value = "添加方式", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "add_method")
+    private String addMethod;
+
     /**
      * 激活标识（1是 0否）
      */
@@ -106,5 +113,44 @@ public class BaseMaterialInfoVo implements Serializable {
     @ExcelDictFormat(dictType = "active_flag")
     private String activeFlag;
 
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建人ID
+     */
+    private Long createBy;
+
+    /**
+     * 更新人ID
+     */
+    private Long updateBy;
 
 }
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseMaterialInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseMaterialInfoServiceImpl.java
index ed0df84b..32041422 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseMaterialInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseMaterialInfoServiceImpl.java
@@ -56,7 +56,7 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
     @Override
     public TableDataInfo<BaseMaterialInfoVo> queryPageList(BaseMaterialInfoBo bo, PageQuery pageQuery) {
         MPJLambdaWrapper<BaseMaterialInfo> lqw = buildQueryWrapper(bo);
-        Page<BaseMaterialInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<BaseMaterialInfoVo> result = baseMapper.selectCustomBaseMaterialInfoVoList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -69,7 +69,7 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
     @Override
     public List<BaseMaterialInfoVo> queryList(BaseMaterialInfoBo bo) {
         MPJLambdaWrapper<BaseMaterialInfo> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectCustomBaseMaterialInfoVoList(lqw);
     }
 
     private MPJLambdaWrapper<BaseMaterialInfo> buildQueryWrapper(BaseMaterialInfoBo bo) {
@@ -87,6 +87,7 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
             .eq(bo.getPurchasePrice() != null, BaseMaterialInfo::getPurchasePrice, bo.getPurchasePrice())
             .eq(bo.getForeignPrice() != null, BaseMaterialInfo::getForeignPrice, bo.getForeignPrice())
             .eq(bo.getStockingPeriod() != null, BaseMaterialInfo::getStockingPeriod, bo.getStockingPeriod())
+            .eq(StringUtils.isNotBlank(bo.getAddMethod()), BaseMaterialInfo::getAddMethod, bo.getAddMethod())
             .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseMaterialInfo::getActiveFlag, bo.getActiveFlag())
             .eq("t.del_flag", "0")
             .orderByDesc(BaseMaterialInfo::getCreateTime);
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseMaterialInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseMaterialInfoMapper.xml
index f7ca942c..bfb5bdb6 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseMaterialInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseMaterialInfoMapper.xml
@@ -7,26 +7,31 @@
     </resultMap>
 
     <select id="selectCustomBaseMaterialInfoVoList" resultMap="BaseMaterialInfoResult">
-        select material_id,
-               tenant_id,
-               material_code,
-               material_name,
-               material_brand,
-               material_model,
-               unit_id,
-               material_parameter,
-               purchase_price,
-               foreign_price,
-               stocking_period,
-               remark,
-               active_flag,
-               del_flag,
-               create_dept,
-               create_by,
-               create_time,
-               update_by,
-               update_time
+        select t.material_id,
+               t.tenant_id,
+               t.material_code,
+               t.material_name,
+               t.material_brand,
+               t.material_model,
+               t.unit_id,
+               t.material_parameter,
+               t.purchase_price,
+               t.foreign_price,
+               t.stocking_period,
+               t.remark,
+               t.add_method,
+               t.active_flag,
+               t.del_flag,
+               t.create_dept,
+               t.create_by,
+               t.create_time,
+               t.update_by,
+               t.update_time,
+               s1.nick_name createName,
+               s2.nick_name updateName
         from base_material_info t
+                 left join sys_user s1 on s1.user_id = t.create_by
+                 left join sys_user s2 on s2.user_id = t.update_by
             ${ew.getCustomSqlSegment}
     </select>