fix:更新烧花工厂模块代码

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

@@ -2,8 +2,11 @@ package org.dromara.dataManagement.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.core.DropDownOptions;
+import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
@@ -12,6 +15,8 @@ import org.dromara.dataManagement.domain.vo.SupplierVo;
 import org.dromara.dataManagement.service.SupplierService;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -32,8 +37,12 @@ public class SupplierController extends BaseController {
     }
 
     /**
-     * 导入供应商文件
+     * 下载供应商导入模版
      */
+    @GetMapping("/downloadTemplate")
+    public void getExampleExcel(HttpServletResponse response){
+        ExcelUtil.exportExcel(new ArrayList<>(), "供应商导入模板", SupplierVo.class, response);
+    }
 
     /**
      * 删除供应商信息

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

@@ -1,6 +1,7 @@
 package org.dromara.dataManagement.domain.vo;
 
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,56 +16,67 @@ public class SupplierVo extends BaseEntity {
     /**
      * 供应商类别
      */
+    @ExcelProperty(value = "供应商类别", order = 1)
     private int supplyertypeId;
 
     /**
      * 供应商编号
      */
+    @ExcelProperty(value = "供应商编号", order = 2)
     private String supplyerCode;
 
     /**
      * 供应商名称
      */
+    @ExcelProperty(value = "供应商名称", order = 3)
     private String supplyerName;
 
     /**
      * 首要联系人
      */
+    @ExcelProperty(value = "首要联系人", order = 4)
     private String firstConnectName;
 
     /**
      * 首要联系人手机号
      */
+    @ExcelProperty(value = "首要联系人手机号", order = 5)
     private String firstConnectMobile;
 
     /**
      * 首要联系人座机号
      */
+    @ExcelProperty(value = "首要联系人座机号", order = 6)
     private String firstConnectPhone;
 
     /**
      * 首要联系人QQ/微信/Email
      */
+    @ExcelProperty(value = "首要联系人QQ/微信/Email", order = 7)
     private String qqWxEmail;
 
     /**
      * 联系地址
      */
+    @ExcelProperty(value = "联系地址", order = 8)
     private String connectAddress;
 
     /**
      * 备注
      */
+    @ExcelProperty(value = "备注", order = 9)
     private String note;
 
     /**
      * 应付余额
      */
+    @ExcelProperty(value = "应付余额", order = 10)
     private double needGiveAccount;
 
     /**
      * 状态
      */
+    @ExcelProperty(value = "状态", order = 11)
     private String status;
 
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.productionManagement.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -15,6 +16,7 @@ import java.util.List;
 /**
  * 烧花工厂管理接口
  */
+@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/productionManagement/shaohuaFactory")
@@ -59,8 +61,11 @@ public class ShaoHuaFactoryController extends BaseController {
      * @return
      */
     @DeleteMapping("/{ids}")
-    public R<Void> deleteFactoryByIds(@PathVariable int [] ids) {
-        return toAjax(shaoHuaFactoryService.deleteFactoryByIds(ids));
+    public R<Void> deleteFactoryByIds(@PathVariable List<Integer> ids) {
+        if(shaoHuaFactoryService.deleteFactoryByIds(ids) > 0){
+            return R.ok();
+        }
+        return R.fail("不存在此工厂或此工厂已被删除");
     }
 
     /**
@@ -100,7 +105,11 @@ public class ShaoHuaFactoryController extends BaseController {
      */
     @DeleteMapping("/recycle/{ids}")
     public R<Void> deleteRecycleFactoryByIds(@PathVariable List<Integer> ids) {
-        return toAjax(shaoHuaFactoryService.deleteRecycleFactoryByIds(ids));
+        int status = shaoHuaFactoryService.deleteRecycleFactoryByIds(ids);
+        if (status==1){
+            return toAjax(1);
+        }
+        return R.fail("该回收站中不存在此工厂或已被删除");
     }
 
     /**

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

@@ -15,7 +15,7 @@ public interface ShaoHuaFactoryService {
 
     int updateFactory(ShaoHuaFactoryBo shaohuaFactoryBo);
 
-    int deleteFactoryByIds(int[] ids);
+    int deleteFactoryByIds(List<Integer> ids);
 
     TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery);
 

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

@@ -1,5 +1,6 @@
 package org.dromara.productionManagement.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -8,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.productionManagement.domain.Factory;
 import org.dromara.productionManagement.domain.ShaoHuaFactory;
 import org.dromara.productionManagement.domain.bo.ShaoHuaFactoryBo;
 import org.dromara.productionManagement.domain.vo.ShaoHuaFactoryVo;
@@ -25,6 +27,7 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
 
     /**
      * 分页查询烧花工厂信息
+     *
      * @param shaohuaFactoryBo
      * @param pageQuery
      * @return
@@ -42,6 +45,7 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
 
     /**
      * 新增烧花工厂信息
+     *
      * @param shaohuaFactoryBo
      * @return
      */
@@ -53,6 +57,7 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
 
     /**
      * 修改烧花工厂信息
+     *
      * @param shaohuaFactoryBo
      * @return
      */
@@ -64,19 +69,23 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
 
     /**
      * 删除烧花工厂信息（删除到回收站）
+     *
      * @param ids
      * @return
      */
     @Override
-    public int deleteFactoryByIds(int[] ids) {
-        List<ShaoHuaFactory> list = new ArrayList<>();
-        for (int factoryId : ids) {
-            ShaoHuaFactory factory = new ShaoHuaFactory();
-            factory.setId(factoryId);
-            factory.setDeleteTime(new Date());
-            list.add(factory);
+    public int deleteFactoryByIds(List<Integer> ids) {
+        if (ids == null) {
+            return -1;
         }
-        return shaoHuaFactoryMapper.updateById(list).size();
+        if (ids.isEmpty()) {
+            return -1;
+        }
+        UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", ids)
+            .isNull("deletetime")
+            .set("deletetime",new Date());
+        return shaoHuaFactoryMapper.update(updateWrapper);
     }
 
     /**
@@ -89,48 +98,51 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
     public TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery) {
         QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
         Map<String, Object> params = shaohuafactoryBo.getParams();
-        qw.eq(0 != shaohuafactoryBo.getId(),"id", shaohuafactoryBo.getId());
-        qw.like(StringUtils.isNotBlank(shaohuafactoryBo.getName()),"name",shaohuafactoryBo.getName());
+        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"));
+            "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
         qw.isNotNull("deletetime");
-        Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(),qw);
+        Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 
     /**
      * 回收站还原（id还原）
+     *
      * @param ids
      * @return
      */
     @Override
     public int backFactoryByIds(List<Integer> ids) {
         UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id",ids);
-        updateWrapper.set("deletetime",null);
+        updateWrapper.in("id", ids);
+        updateWrapper.set("deletetime", null);
         return shaoHuaFactoryMapper.update(updateWrapper);
     }
 
     /**
      * 回收站还原（全部还原）
+     *
      * @return
      */
     @Override
     public int backFactoryAll() {
         UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("deletetime",null);
+        updateWrapper.set("deletetime", null);
         return shaoHuaFactoryMapper.update(updateWrapper);
     }
 
     /**
      * 回收站删除（id删除）
+     *
      * @param ids
      * @return
      */
     @Override
     public int deleteRecycleFactoryByIds(List<Integer> ids) {
         QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
-        qw.in("id",ids);
+        qw.in("id", ids);
         qw.isNotNull("deletetime");
         return shaoHuaFactoryMapper.delete(qw);
     }