fix:完善改烧花工厂功能，并新增供应商管理功能

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

@@ -0,0 +1,20 @@
+package org.dromara.dataManagement.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.dataManagement.service.SupplierService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/dataManagement/supplier")
+public class SupplierController {
+
+    private final SupplierService supplierService;
+
+
+}

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

@@ -0,0 +1,13 @@
+package org.dromara.dataManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("")
+public class Supplier extends TenantEntity {
+
+}

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/bo/SupplierBo.java

@@ -0,0 +1,14 @@
+package org.dromara.dataManagement.domain.bo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.dataManagement.domain.Supplier;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Supplier.class, reverseConvertGenerate = false)
+public class SupplierBo extends BaseEntity {
+}

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

@@ -0,0 +1,14 @@
+package org.dromara.dataManagement.domain.vo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.dataManagement.domain.Supplier;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Supplier.class)
+public class SupplierVo extends BaseEntity {
+}

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/mapper/SupplierMapper.java

@@ -0,0 +1,8 @@
+package org.dromara.dataManagement.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public class SupplierMapper {
+}

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

@@ -0,0 +1,5 @@
+package org.dromara.dataManagement.service;
+
+
+public interface SupplierService {
+}

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

@@ -0,0 +1,11 @@
+package org.dromara.dataManagement.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.dataManagement.service.SupplierService;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@RequiredArgsConstructor
+public class SupplierServiceImpl implements SupplierService {
+}

ruoyi-modules/ruoyi-dataManagement/src/main/resources/mapper/SupplierMapper.xml

@@ -0,0 +1,7 @@
+<?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.dataManagement.mapper.SupplierMapper">
+
+</mapper>

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/ShaoHuaFactoryController.java

@@ -64,7 +64,7 @@ public class ShaoHuaFactoryController extends BaseController {
     }
 
     /**
-     * 回收站查询
+     * 回收站条件查询
      * @param shaohuafactoryBo
      * @param pageQuery
      * @return

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/bo/ShaoHuaFactoryBo.java

@@ -21,6 +21,7 @@ public class ShaoHuaFactoryBo extends BaseEntity implements Serializable {
     /**
      * id
      */
+
     private int id;
 
     /**

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/impl/ShaoHuaFactoryImpl.java

@@ -15,9 +15,7 @@ import org.dromara.productionManagement.mapper.ShaoHuaFactoryMapper;
 import org.dromara.productionManagement.service.ShaoHuaFactoryService;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 @RequiredArgsConstructor
@@ -82,7 +80,7 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
     }
 
     /**
-     * 查询回收站信息
+     * 条件查询回收站信息
      * @param shaohuafactoryBo
      * @param pageQuery
      * @return
@@ -90,7 +88,11 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
     @Override
     public TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery) {
         QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(shaohuafactoryBo.getName()),"name",shaohuafactoryBo.getName());
+        Map<String, Object> params = shaohuafactoryBo.getParams();
+        qw.eq(0 != shaohuafactoryBo.getId(),"id", shaohuafactoryBo.getId());
+        qw.like(StringUtils.isNotBlank(shaohuafactoryBo.getName()),"name",shaohuafactoryBo.getName());
+        qw.between(params.get("begindeletetime") != null && params.get("enddeletetime") != null,
+                "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
         qw.isNotNull("deletetime");
         Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);