供应商

sd-business/src/main/java/com/sd/business/entity/supplier/dto/SupplierSelectDto.java

@@ -7,11 +7,16 @@ import lombok.Setter;
 /**
  * 供应商列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-07-01
  */
 @Getter
 @Setter
 public class SupplierSelectDto extends BaseSelectDto {
 
+    /**
+     * 供应商名称
+     */
+    private String name;
+
 }

sd-business/src/main/java/com/sd/business/flow/PurchaseFlow.java

@@ -26,10 +26,10 @@ import java.util.List;
  */
 @Service
 public class PurchaseFlow  extends FlowDelegate {
+
     @Autowired
     private PurchaseService purchaseService;
 
-
     @Autowired
     private PurchaseBomService purchaseBomService;
 
@@ -44,10 +44,6 @@ public class PurchaseFlow  extends FlowDelegate {
         return "purchase";
     }
 
-    /**
-     * 流程发起
-     */
-
     @Override
     public Long start(Long flowId, JSONObject submitData) {
 
@@ -74,32 +70,26 @@ public class PurchaseFlow  extends FlowDelegate {
         return purchase.getId();
     }
 
-    /**
-     * 流程结束
-     * @param flowId
-     * @param businessId
-     * @param submitData
-     */
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
         Purchase purchase = purchaseService.getById(businessId);
         purchase.setFlowStatus(PurchaseEnums.PASSED.getKey());
         purchase.setFlowId(flowId);
-        //修改采购暂存表的数据
+        // 修改采购暂存表的数据
         purchaseService.updateById(purchase);
 
-        //修改申购表的状态为已申购
+        // 修改申购表的状态为已申购
         ApplyBuy applyBuy = new ApplyBuy();
         applyBuy.setId(purchase.getApplyBuyId());
         applyBuy.setFlowStatus(4);
         applyBuyService.updateById(applyBuy);
 
-
-        //查询采购合同bom表的信息
+        // 查询采购合同bom表的信息
         List<PurchaseBom> purchaseBoms = purchaseBomService.list(Wrappers.<PurchaseBom>lambdaQuery().eq(PurchaseBom::getPurchaseId, businessId));
 
         List<ApplyBuyBom> applyBuyBomList = new ArrayList<>();
-        //修改申购bom表的采购数量
+
+        // 修改申购bom表的采购数量
         for (PurchaseBom purchaseBom : purchaseBoms) {
             ApplyBuyBom applyBuyBom = new ApplyBuyBom();
             applyBuyBom.setPurchaseQuantity(purchaseBom.getPurchaseQuantity());
@@ -124,4 +114,5 @@ public class PurchaseFlow  extends FlowDelegate {
         //修改采购暂存表的数据
         purchaseService.updateById(purchase);
     }
+
 }

sd-business/src/main/java/com/sd/business/service/supplier/impl/SupplierServiceImpl.java

@@ -1,16 +1,16 @@
 package com.sd.business.service.supplier.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.supplier.dto.SupplierDto;
+import com.sd.business.entity.supplier.dto.SupplierSelectDto;
 import com.sd.business.entity.supplier.po.Supplier;
+import com.sd.business.entity.supplier.vo.SupplierVo;
 import com.sd.business.mapper.supplier.SupplierMapper;
 import com.sd.business.service.supplier.SupplierService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.supplier.vo.SupplierVo;
-import com.sd.business.entity.supplier.dto.SupplierSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.sd.business.entity.supplier.dto.SupplierDto;
-import cn.hutool.core.bean.BeanUtil;
 
 
 /**
@@ -28,8 +28,9 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
     public Page<SupplierVo> getPage(SupplierSelectDto dto) {
         IWrapper<Supplier> wrapper = getWrapper();
         wrapper.orderByDesc("s", Supplier::getId);
-        Page<SupplierVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        return page;
+        wrapper.like("s", Supplier::getName, dto.getName());
+
+        return this.baseMapper.getPage(dto.getPage(), wrapper);
     }
 
     @Override

sd-business/src/main/resources/mapper/supplier/SupplierMapper.xml

@@ -2,31 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.supplier.SupplierMapper">
     <select id="getPage" resultType="com.sd.business.entity.supplier.vo.SupplierVo">
-        select
-            s.id,
-            s.name,
-            s.company_telephone,
-            s.payment_period,
-            s.province,
-            s.city,
-            s.detailed_address,
-            s.duty_number,
-            s.contact_person1,
-            s.contact_number1,
-            s.contact_mailbox1,
-            s.contact_person2,
-            s.contact_number2,
-            s.contact_mailbox2,
-            s.contact_person3,
-            s.contact_number3,
-            s.contact_mailbox3,
-            s.bank,
-            s.bank_account_name,
-            s.bank_account_number,
-            s.create_user,
-            s.create_time,
-            s.update_user,
-            s.update_time
+        select s.id,
+               s.name,
+               s.company_telephone,
+               s.payment_period,
+               s.province,
+               s.city,
+               s.detailed_address,
+               s.duty_number,
+               s.contact_person1,
+               s.contact_number1,
+               s.contact_mailbox1,
+               s.contact_person2,
+               s.contact_number2,
+               s.contact_mailbox2,
+               s.contact_person3,
+               s.contact_number3,
+               s.contact_mailbox3,
+               s.bank,
+               s.bank_account_name,
+               s.bank_account_number,
+               s.create_user,
+               s.create_time,
+               s.update_user,
+               s.update_time
         from supplier s
             ${ew.customSqlSegment}
     </select>