Эх сурвалжийг харах

feat:新增供应商管理模块删除功能

Eternity 8 сар өмнө
parent
commit
8c4fec1151

+ 18 - 4
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/controller/SupplierController.java

@@ -3,21 +3,23 @@ package org.dromara.dataManagement.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.dataManagement.domain.bo.SupplierBo;
 import org.dromara.dataManagement.domain.bo.SupplierBo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
 import org.dromara.dataManagement.service.SupplierService;
 import org.dromara.dataManagement.service.SupplierService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 
 
 @SaIgnore
 @SaIgnore
 @RestController
 @RestController
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/supplier")
 @RequestMapping("/dataManagement/supplier")
-public class SupplierController {
+public class SupplierController extends BaseController {
 
 
     private final SupplierService supplierService;
     private final SupplierService supplierService;
 
 
@@ -29,4 +31,16 @@ public class SupplierController {
         return supplierService.selectPageSupplierList(supplierBo, pageQuery);
         return supplierService.selectPageSupplierList(supplierBo, pageQuery);
     }
     }
 
 
+    /**
+     * 导入供应商文件
+     */
+
+    /**
+     * 删除供应商信息
+     */
+    @DeleteMapping("/delete/{ids}")
+    public R<Void> deleteSupplierByIds(@PathVariable("ids") List<Integer> supplyertypeId) {
+        return toAjax(supplierService.deleteRecycleFactoryByIds(supplyertypeId));
+    }
+
 }
 }

+ 0 - 2
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/Supplier.java

@@ -10,8 +10,6 @@ import org.dromara.common.tenant.core.TenantEntity;
 @TableName("fa_kuyou_suppliers")
 @TableName("fa_kuyou_suppliers")
 public class Supplier extends TenantEntity {
 public class Supplier extends TenantEntity {
 
 
-    private Integer id;
-
     /**
     /**
      * 供应商类别
      * 供应商类别
      */
      */

+ 0 - 2
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/vo/SupplierVo.java

@@ -12,8 +12,6 @@ import org.dromara.dataManagement.domain.Supplier;
 @AutoMapper(target = Supplier.class)
 @AutoMapper(target = Supplier.class)
 public class SupplierVo extends BaseEntity {
 public class SupplierVo extends BaseEntity {
 
 
-    private Integer id;
-
     /**
     /**
      * 供应商类别
      * 供应商类别
      */
      */

+ 3 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/SupplierService.java

@@ -6,8 +6,11 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.dataManagement.domain.bo.SupplierBo;
 import org.dromara.dataManagement.domain.bo.SupplierBo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
 
 
+import java.util.List;
+
 public interface SupplierService {
 public interface SupplierService {
 
 
     TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery);
     TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery);
 
 
+    int deleteRecycleFactoryByIds(List<Integer> supplyertypeId);
 }
 }

+ 20 - 3
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/impl/SupplierServiceImpl.java

@@ -23,15 +23,32 @@ public class SupplierServiceImpl implements SupplierService {
 
 
     private final SupplierMapper supplierMapper;
     private final SupplierMapper supplierMapper;
 
 
+    /**
+     * 查询供应商信息
+     * @param supplierBo
+     * @param pageQuery
+     * @return
+     */
     @Override
     @Override
     public TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery) {
     public TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery) {
         QueryWrapper<Supplier> qw = new QueryWrapper<>();
         QueryWrapper<Supplier> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(supplierBo.getSupplyerCode()), "supplyer_code", supplierBo.getSupplyerCode());
-        qw.eq(StringUtils.isNotBlank(supplierBo.getSupplyerName()), "supplyer_name", supplierBo.getSupplyerName());
+        qw.like(StringUtils.isNotBlank(supplierBo.getSupplyerCode()), "supplyer_code", supplierBo.getSupplyerCode());
+        qw.like(StringUtils.isNotBlank(supplierBo.getSupplyerName()), "supplyer_name", supplierBo.getSupplyerName());
         qw.eq(StringUtils.isNotBlank(supplierBo.getStatus()), "status", supplierBo.getStatus());
         qw.eq(StringUtils.isNotBlank(supplierBo.getStatus()), "status", supplierBo.getStatus());
-//        Supplier supplier = MapstructUtils.convert(supplierBo, Supplier.class);
         List<Supplier> page = supplierMapper.selectList(pageQuery.build(), qw);
         List<Supplier> page = supplierMapper.selectList(pageQuery.build(), qw);
         List<SupplierVo> supplierVoList = MapstructUtils.convert(page, SupplierVo.class);
         List<SupplierVo> supplierVoList = MapstructUtils.convert(page, SupplierVo.class);
         return TableDataInfo.build(supplierVoList);
         return TableDataInfo.build(supplierVoList);
     }
     }
+
+    /**
+     * 批量删除供应商信息
+     * @param supplyertypeId
+     * @return
+     */
+    @Override
+    public int deleteRecycleFactoryByIds(List<Integer> supplyertypeId) {
+        QueryWrapper<Supplier> qw = new QueryWrapper<>();
+        qw.in("supplyertype_id",supplyertypeId);
+        return supplierMapper.delete(qw);
+    }
 }
 }