1.0.6 物料关联销售名称

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseRelationMaterialController.java

@@ -17,99 +17,99 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.oa.base.domain.vo.BaseRelationMaterielVo;
-import org.dromara.oa.base.domain.bo.BaseRelationMaterielBo;
-import org.dromara.oa.base.service.IBaseRelationMaterielService;
+import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
+import org.dromara.oa.base.domain.bo.BaseRelationMaterialBo;
+import org.dromara.oa.base.service.IBaseRelationMaterialService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
  * 关联销售物料信息
- * 前端访问路由地址为:/oa/base/relationMateriel
+ * 前端访问路由地址为:/oa/base/relationMaterial
  *
  * @author Yinq
- * @date 2025-09-28
+ * @date 2025-09-30
  */
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/base/relationMateriel")
-public class BaseRelationMaterielController extends BaseController {
+@RequestMapping("/base/relationMaterial")
+public class BaseRelationMaterialController extends BaseController {
 
-    private final IBaseRelationMaterielService baseRelationMaterielService;
+    private final IBaseRelationMaterialService baseRelationMaterialService;
 
     /**
      * 查询关联销售物料信息列表
      */
-    @SaCheckPermission("oa/base:relationMateriel:list")
+    @SaCheckPermission("oa/base:relationMaterial:list")
     @GetMapping("/list")
-    public TableDataInfo<BaseRelationMaterielVo> list(BaseRelationMaterielBo bo, PageQuery pageQuery) {
-        return baseRelationMaterielService.queryPageList(bo, pageQuery);
+    public TableDataInfo<BaseRelationMaterialVo> list(BaseRelationMaterialBo bo, PageQuery pageQuery) {
+        return baseRelationMaterialService.queryPageList(bo, pageQuery);
     }
 
     /**
      * 导出关联销售物料信息列表
      */
-    @SaCheckPermission("oa/base:relationMateriel:export")
+    @SaCheckPermission("oa/base:relationMaterial:export")
     @Log(title = "关联销售物料信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(BaseRelationMaterielBo bo, HttpServletResponse response) {
-        List<BaseRelationMaterielVo> list = baseRelationMaterielService.queryList(bo);
-        ExcelUtil.exportExcel(list, "关联销售物料信息", BaseRelationMaterielVo.class, response);
+    public void export(BaseRelationMaterialBo bo, HttpServletResponse response) {
+        List<BaseRelationMaterialVo> list = baseRelationMaterialService.queryList(bo);
+        ExcelUtil.exportExcel(list, "关联销售物料信息", BaseRelationMaterialVo.class, response);
     }
 
     /**
      * 获取关联销售物料信息详细信息
      *
-     * @param relationMaterielId 主键
+     * @param relationMaterialId 主键
      */
-    @SaCheckPermission("oa/base:relationMateriel:query")
-    @GetMapping("/{relationMaterielId}")
-    public R<BaseRelationMaterielVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable("relationMaterielId") Long relationMaterielId) {
-        return R.ok(baseRelationMaterielService.queryById(relationMaterielId));
+    @SaCheckPermission("oa/base:relationMaterial:query")
+    @GetMapping("/{relationMaterialId}")
+    public R<BaseRelationMaterialVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("relationMaterialId") Long relationMaterialId) {
+        return R.ok(baseRelationMaterialService.queryById(relationMaterialId));
     }
 
     /**
      * 新增关联销售物料信息
      */
-    @SaCheckPermission("oa/base:relationMateriel:add")
+    @SaCheckPermission("oa/base:relationMaterial:add")
     @Log(title = "关联销售物料信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseRelationMaterielBo bo) {
-        return toAjax(baseRelationMaterielService.insertByBo(bo));
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseRelationMaterialBo bo) {
+        return toAjax(baseRelationMaterialService.insertByBo(bo));
     }
 
     /**
      * 修改关联销售物料信息
      */
-    @SaCheckPermission("oa/base:relationMateriel:edit")
+    @SaCheckPermission("oa/base:relationMaterial:edit")
     @Log(title = "关联销售物料信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseRelationMaterielBo bo) {
-        return toAjax(baseRelationMaterielService.updateByBo(bo));
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseRelationMaterialBo bo) {
+        return toAjax(baseRelationMaterialService.updateByBo(bo));
     }
 
     /**
      * 删除关联销售物料信息
      *
-     * @param relationMaterielIds 主键串
+     * @param relationMaterialIds 主键串
      */
-    @SaCheckPermission("oa/base:relationMateriel:remove")
+    @SaCheckPermission("oa/base:relationMaterial:remove")
     @Log(title = "关联销售物料信息", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{relationMaterielIds}")
+    @DeleteMapping("/{relationMaterialIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable("relationMaterielIds") Long[] relationMaterielIds) {
-        return toAjax(baseRelationMaterielService.deleteWithValidByIds(List.of(relationMaterielIds), true));
+                          @PathVariable("relationMaterialIds") Long[] relationMaterialIds) {
+        return toAjax(baseRelationMaterialService.deleteWithValidByIds(List.of(relationMaterialIds), true));
     }
 
     /**
      * 下拉框查询关联销售物料信息列表
      */
-    @GetMapping("/getBaseRelationMaterielList")
-    public R<List<BaseRelationMaterielVo>> getBaseRelationMaterielList(BaseRelationMaterielBo bo) {
-        List<BaseRelationMaterielVo> list = baseRelationMaterielService.queryList(bo);
+    @GetMapping("/getBaseRelationMaterialList")
+    public R<List<BaseRelationMaterialVo>> getBaseRelationMaterialList(BaseRelationMaterialBo bo) {
+        List<BaseRelationMaterialVo> list = baseRelationMaterialService.queryList(bo);
         return R.ok(list);
     }
 

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseRelationMaterial.java

@@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode;
 import java.io.Serial;
 
 /**
- * 关联销售物料信息对象 base_relation_materiel
+ * 关联销售物料信息对象 base_relation_material
  *
  * @author Yinq
- * @date 2025-09-28
+ * @date 2025-09-30
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("base_relation_materiel")
-public class BaseRelationMateriel extends TenantEntity {
+@TableName("base_relation_material")
+public class BaseRelationMaterial extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -24,13 +24,13 @@ public class BaseRelationMateriel extends TenantEntity {
     /**
      * 关联物料ID
      */
-    @TableId(value = "relation_materiel_id", type = IdType.AUTO)
-    private Long relationMaterielId;
+    @TableId(value = "relation_material_id", type = IdType.AUTO)
+    private Long relationMaterialId;
 
     /**
      * 物料ID
      */
-    private Long materielId;
+    private Long materialId;
 
     /**
      * 客户ID
@@ -40,7 +40,7 @@ public class BaseRelationMateriel extends TenantEntity {
     /**
      * 销售物料名称
      */
-    private String saleMaterielName;
+    private String saleMaterialName;
 
     /**
      * 备注
@@ -62,13 +62,13 @@ public class BaseRelationMateriel extends TenantEntity {
      * SAP物料编码
      */
     @TableField(exist = false)
-    private String materielCode;
+    private String materialCode;
 
     /**
      * SAP物料名称
      */
     @TableField(exist = false)
-    private String materielName;
+    private String materialName;
 
     /**
      * 客户名称

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseRelationMaterialBo.java

@@ -1,7 +1,6 @@
 package org.dromara.oa.base.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import org.dromara.oa.base.domain.BaseRelationMateriel;
+import org.dromara.oa.base.domain.BaseRelationMaterial;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -11,15 +10,15 @@ import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
 /**
- * 关联销售物料信息业务对象 base_relation_materiel
+ * 关联销售物料信息业务对象 base_relation_material
  *
  * @author Yinq
- * @date 2025-09-28
+ * @date 2025-09-30
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = BaseRelationMateriel.class, reverseConvertGenerate = false)
-public class BaseRelationMaterielBo extends BaseEntity {
+@AutoMapper(target = BaseRelationMaterial.class, reverseConvertGenerate = false)
+public class BaseRelationMaterialBo extends BaseEntity {
 
     /**
      * 关联物料ID
@@ -35,12 +34,13 @@ public class BaseRelationMaterielBo extends BaseEntity {
     /**
      * 客户ID
      */
+    @NotNull(message = "客户ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long customerId;
 
     /**
      * 销售物料名称
      */
-    private String saleMaterielName;
+    private String saleMaterialName;
 
     /**
      * 备注

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseRelationMaterialVo.java

@@ -1,6 +1,6 @@
 package org.dromara.oa.base.domain.vo;
 
-import org.dromara.oa.base.domain.BaseRelationMateriel;
+import org.dromara.oa.base.domain.BaseRelationMaterial;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -15,15 +15,15 @@ import java.util.Date;
 
 
 /**
- * 关联销售物料信息视图对象 base_relation_materiel
+ * 关联销售物料信息视图对象 base_relation_material
  *
  * @author Yinq
- * @date 2025-09-28
+ * @date 2025-09-30
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = BaseRelationMateriel.class)
-public class BaseRelationMaterielVo implements Serializable {
+@AutoMapper(target = BaseRelationMaterial.class)
+public class BaseRelationMaterialVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -32,25 +32,13 @@ public class BaseRelationMaterielVo implements Serializable {
      * 关联物料ID
      */
     @ExcelProperty(value = "关联物料ID")
-    private Long relationMaterielId;
+    private Long relationMaterialId;
 
     /**
      * 物料ID
      */
     @ExcelProperty(value = "物料ID")
-    private Long materielId;
-
-    /**
-     * SAP物料编码
-     */
-    @ExcelProperty(value = "SAP物料编码")
-    private String materielCode;
-
-    /**
-     * SAP物料名称
-     */
-    @ExcelProperty(value = "SAP物料名称")
-    private String materielName;
+    private Long materialId;
 
     /**
      * 客户ID
@@ -58,6 +46,18 @@ public class BaseRelationMaterielVo implements Serializable {
     @ExcelProperty(value = "客户ID")
     private Long customerId;
 
+    /**
+     * SAP物料编码
+     */
+    @ExcelProperty(value = "SAP物料编码")
+    private String materialCode;
+
+    /**
+     * SAP物料名称
+     */
+    @ExcelProperty(value = "SAP物料名称")
+    private String materialName;
+
     /**
      * 客户名称
      */
@@ -68,7 +68,7 @@ public class BaseRelationMaterielVo implements Serializable {
      * 销售物料名称
      */
     @ExcelProperty(value = "销售物料名称")
-    private String saleMaterielName;
+    private String saleMaterialName;
 
     /**
      * 备注
@@ -83,4 +83,35 @@ public class BaseRelationMaterielVo implements Serializable {
     @ExcelDictFormat(dictType = "active_flag")
     private String activeFlag;
 
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/mapper/BaseRelationMaterialMapper.java

@@ -5,17 +5,17 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import org.dromara.oa.base.domain.BaseRelationMateriel;
-import org.dromara.oa.base.domain.vo.BaseRelationMaterielVo;
+import org.dromara.oa.base.domain.BaseRelationMaterial;
+import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
  * 关联销售物料信息Mapper接口
  *
  * @author Yinq
- * @date 2025-09-28
+ * @date 2025-09-30
  */
-public interface BaseRelationMaterielMapper extends BaseMapperPlus<BaseRelationMateriel, BaseRelationMaterielVo> {
+public interface BaseRelationMaterialMapper extends BaseMapperPlus<BaseRelationMaterial, BaseRelationMaterialVo> {
 
     /**
      * 查询关联销售物料信息列表
@@ -24,7 +24,7 @@ public interface BaseRelationMaterielMapper extends BaseMapperPlus<BaseRelationM
      * @param queryWrapper 条件
      * @return 关联销售物料信息集合
      */
-    public Page<BaseRelationMaterielVo> selectCustomBaseRelationMaterielVoList(@Param("page") Page<BaseRelationMaterielVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<BaseRelationMateriel> queryWrapper);
+    public Page<BaseRelationMaterialVo> selectCustomBaseRelationMaterialVoList(@Param("page") Page<BaseRelationMaterialVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<BaseRelationMaterial> queryWrapper);
 
     /**
      * 查询关联销售物料信息列表
@@ -32,6 +32,6 @@ public interface BaseRelationMaterielMapper extends BaseMapperPlus<BaseRelationM
      * @param queryWrapper 条件
      * @return 关联销售物料信息集合
      */
-    public List<BaseRelationMaterielVo> selectCustomBaseRelationMaterielVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<BaseRelationMateriel> queryWrapper);
+    public List<BaseRelationMaterialVo> selectCustomBaseRelationMaterialVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<BaseRelationMaterial> queryWrapper);
 
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBaseRelationMaterialService.java

@@ -1,8 +1,8 @@
 package org.dromara.oa.base.service;
 
-import org.dromara.oa.base.domain.BaseRelationMateriel;
-import org.dromara.oa.base.domain.vo.BaseRelationMaterielVo;
-import org.dromara.oa.base.domain.bo.BaseRelationMaterielBo;
+import org.dromara.oa.base.domain.BaseRelationMaterial;
+import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
+import org.dromara.oa.base.domain.bo.BaseRelationMaterialBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 
@@ -13,17 +13,17 @@ import java.util.List;
  * 关联销售物料信息Service接口
  *
  * @author Yinq
- * @date 2025-09-28
+ * @date 2025-09-30
  */
-public interface IBaseRelationMaterielService {
+public interface IBaseRelationMaterialService {
 
     /**
      * 查询关联销售物料信息
      *
-     * @param relationMaterielId 主键
+     * @param relationMaterialId 主键
      * @return 关联销售物料信息
      */
-    BaseRelationMaterielVo queryById(Long relationMaterielId);
+    BaseRelationMaterialVo queryById(Long relationMaterialId);
 
     /**
      * 分页查询关联销售物料信息列表
@@ -32,7 +32,7 @@ public interface IBaseRelationMaterielService {
      * @param pageQuery 分页参数
      * @return 关联销售物料信息分页列表
      */
-    TableDataInfo<BaseRelationMaterielVo> queryPageList(BaseRelationMaterielBo bo, PageQuery pageQuery);
+    TableDataInfo<BaseRelationMaterialVo> queryPageList(BaseRelationMaterialBo bo, PageQuery pageQuery);
 
     /**
      * 查询符合条件的关联销售物料信息列表
@@ -40,7 +40,7 @@ public interface IBaseRelationMaterielService {
      * @param bo 查询条件
      * @return 关联销售物料信息列表
      */
-    List<BaseRelationMaterielVo> queryList(BaseRelationMaterielBo bo);
+    List<BaseRelationMaterialVo> queryList(BaseRelationMaterialBo bo);
 
     /**
      * 新增关联销售物料信息
@@ -48,7 +48,7 @@ public interface IBaseRelationMaterielService {
      * @param bo 关联销售物料信息
      * @return 是否新增成功
      */
-    Boolean insertByBo(BaseRelationMaterielBo bo);
+    Boolean insertByBo(BaseRelationMaterialBo bo);
 
     /**
      * 修改关联销售物料信息
@@ -56,7 +56,7 @@ public interface IBaseRelationMaterielService {
      * @param bo 关联销售物料信息
      * @return 是否修改成功
      */
-    Boolean updateByBo(BaseRelationMaterielBo bo);
+    Boolean updateByBo(BaseRelationMaterialBo bo);
 
     /**
      * 校验并批量删除关联销售物料信息信息

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseRelationMaterialServiceImpl.java

@@ -12,11 +12,11 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.oa.base.domain.BaseMaterialInfo;
 import org.dromara.oa.crm.domain.CrmCustomerInfo;
 import org.springframework.stereotype.Service;
-import org.dromara.oa.base.domain.bo.BaseRelationMaterielBo;
-import org.dromara.oa.base.domain.vo.BaseRelationMaterielVo;
-import org.dromara.oa.base.domain.BaseRelationMateriel;
-import org.dromara.oa.base.mapper.BaseRelationMaterielMapper;
-import org.dromara.oa.base.service.IBaseRelationMaterielService;
+import org.dromara.oa.base.domain.bo.BaseRelationMaterialBo;
+import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
+import org.dromara.oa.base.domain.BaseRelationMaterial;
+import org.dromara.oa.base.mapper.BaseRelationMaterialMapper;
+import org.dromara.oa.base.service.IBaseRelationMaterialService;
 
 import java.util.List;
 import java.util.Map;
@@ -26,23 +26,26 @@ import java.util.Collection;
  * 关联销售物料信息Service业务层处理
  *
  * @author Yinq
- * @date 2025-09-28
+ * @date 2025-09-30
  */
 @RequiredArgsConstructor
 @Service
-public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielService {
+public class BaseRelationMaterialServiceImpl implements IBaseRelationMaterialService {
 
-    private final BaseRelationMaterielMapper baseMapper;
+    private final BaseRelationMaterialMapper baseMapper;
 
     /**
      * 查询关联销售物料信息
      *
-     * @param relationMaterielId 主键
+     * @param relationMaterialId 主键
      * @return 关联销售物料信息
      */
     @Override
-    public BaseRelationMaterielVo queryById(Long relationMaterielId) {
-        return baseMapper.selectVoById(relationMaterielId);
+    public BaseRelationMaterialVo queryById(Long relationMaterialId) {
+        BaseRelationMaterialBo bo = new BaseRelationMaterialBo();
+        bo.setRelationMaterialId(relationMaterialId);
+        MPJLambdaWrapper<BaseRelationMaterial> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw).get(0);
     }
 
     /**
@@ -53,9 +56,9 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
      * @return 关联销售物料信息分页列表
      */
     @Override
-    public TableDataInfo<BaseRelationMaterielVo> queryPageList(BaseRelationMaterielBo bo, PageQuery pageQuery) {
-        MPJLambdaWrapper<BaseRelationMateriel> lqw = buildQueryWrapper(bo);
-        Page<BaseRelationMaterielVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+    public TableDataInfo<BaseRelationMaterialVo> queryPageList(BaseRelationMaterialBo bo, PageQuery pageQuery) {
+        MPJLambdaWrapper<BaseRelationMaterial> lqw = buildQueryWrapper(bo);
+        Page<BaseRelationMaterialVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -66,24 +69,27 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
      * @return 关联销售物料信息列表
      */
     @Override
-    public List<BaseRelationMaterielVo> queryList(BaseRelationMaterielBo bo) {
-        MPJLambdaWrapper<BaseRelationMateriel> lqw = buildQueryWrapper(bo);
+    public List<BaseRelationMaterialVo> queryList(BaseRelationMaterialBo bo) {
+        MPJLambdaWrapper<BaseRelationMaterial> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
 
-    private MPJLambdaWrapper<BaseRelationMateriel> buildQueryWrapper(BaseRelationMaterielBo bo) {
+    private MPJLambdaWrapper<BaseRelationMaterial> buildQueryWrapper(BaseRelationMaterialBo bo) {
         Map<String, Object> params = bo.getParams();
-        MPJLambdaWrapper<BaseRelationMateriel> lqw = JoinWrappers.lambda(BaseRelationMateriel.class)
-            .selectAll(BaseRelationMateriel.class)
+        MPJLambdaWrapper<BaseRelationMaterial> lqw = JoinWrappers.lambda(BaseRelationMaterial.class)
+            .selectAll(BaseRelationMaterial.class)
             .select(BaseMaterialInfo::getMaterialCode)
             .select(BaseMaterialInfo::getMaterialName)
             .select(CrmCustomerInfo::getCustomerName)
-
-            .eq(bo.getCustomerId() != null, BaseRelationMateriel::getCustomerId, bo.getCustomerId())
+            .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, BaseRelationMaterial::getMaterialId)
+            .leftJoin(CrmCustomerInfo.class, CrmCustomerInfo::getCustomerId, BaseRelationMaterial::getCustomerId)
+            .eq(bo.getMaterialId() != null, BaseRelationMaterial::getMaterialId, bo.getMaterialId())
+            .eq(bo.getCustomerId() != null, BaseRelationMaterial::getCustomerId, bo.getCustomerId())
             .like(StringUtils.isNotBlank(bo.getMaterialCode()), BaseMaterialInfo::getMaterialCode, bo.getMaterialCode())
             .like(StringUtils.isNotBlank(bo.getMaterialName()), BaseMaterialInfo::getMaterialName, bo.getMaterialName())
-            .like(StringUtils.isNotBlank(bo.getSaleMaterielName()), BaseRelationMateriel::getSaleMaterielName, bo.getSaleMaterielName())
-            .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseRelationMateriel::getActiveFlag, bo.getActiveFlag());
+            .like(StringUtils.isNotBlank(bo.getCustomerName()), CrmCustomerInfo::getCustomerName, bo.getCustomerName())
+            .like(StringUtils.isNotBlank(bo.getSaleMaterialName()), BaseRelationMaterial::getSaleMaterialName, bo.getSaleMaterialName())
+            .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseRelationMaterial::getActiveFlag, bo.getActiveFlag());
         return lqw;
     }
 
@@ -94,11 +100,12 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
      * @return 是否新增成功
      */
     @Override
-    public Boolean insertByBo(BaseRelationMaterielBo bo) {
-        BaseRelationMateriel add = MapstructUtils.convert(bo, BaseRelationMateriel.class);
+    public Boolean insertByBo(BaseRelationMaterialBo bo) {
+        BaseRelationMaterial add = MapstructUtils.convert(bo, BaseRelationMaterial.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
+            bo.setRelationMaterialId(add.getRelationMaterialId());
         }
         return flag;
     }
@@ -110,8 +117,8 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(BaseRelationMaterielBo bo) {
-        BaseRelationMateriel update = MapstructUtils.convert(bo, BaseRelationMateriel.class);
+    public Boolean updateByBo(BaseRelationMaterialBo bo) {
+        BaseRelationMaterial update = MapstructUtils.convert(bo, BaseRelationMaterial.class);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
@@ -119,7 +126,7 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(BaseRelationMateriel entity) {
+    private void validEntityBeforeSave(BaseRelationMaterial entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseRelationMaterialMapper.xml

@@ -0,0 +1,27 @@
+<?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="org.dromara.oa.base.mapper.BaseRelationMaterialMapper">
+    <resultMap type="org.dromara.oa.base.domain.vo.BaseRelationMaterialVo" id="BaseRelationMaterialResult">
+    </resultMap>
+
+    <select id="selectCustomBaseRelationMaterialVoList" resultMap="BaseRelationMaterialResult">
+        select relation_material_id,
+               tenant_id,
+               material_id,
+               customer_id,
+               sale_material_name,
+               remark,
+               active_flag,
+               del_flag,
+               create_dept,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from base_relation_material t
+            ${ew.getCustomSqlSegment}
+    </select>
+
+</mapper>

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseRelationMaterielMapper.xml

@@ -1,14 +0,0 @@
-<?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="org.dromara.oa.base.mapper.BaseRelationMaterielMapper">
-    <resultMap type="org.dromara.oa.base.domain.vo.BaseRelationMaterielVo" id="BaseRelationMaterielResult">
-    </resultMap>
-
-    <select id="selectCustomBaseRelationMaterielVoList" resultMap="BaseRelationMaterielResult">
-        select relation_materiel_id, tenant_id, materiel_id, customer_id, sale_materiel_name, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from base_relation_materiel t
-            ${ew.getCustomSqlSegment}
-    </select>
-
-</mapper>