Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysSuppliesController.java

@@ -5,7 +5,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.ActSuppliesTemplate;
 import com.ruoyi.system.domain.SysSupplies;
 import com.ruoyi.system.service.ISysSuppliesService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,12 +32,11 @@ public class SysSuppliesController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:supplies:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ActSuppliesTemplate sysSupplies)
+    public TableDataInfo list(SysSupplies sysSupplies)
     {
         startPage();
         List<SysSupplies> list = iSysSuppliesService.list();
         return getDataTable(list);
-
     }
     /**
      * 保存物资管理列表

ruoyi-admin/src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: 123456
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="H:/Project/java/klck/klck/hbghgz/logs" />
+	<property name="log.path" value="D:/develop/idea-workspace/klbsxt/hbghgz/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -115,7 +116,7 @@ public class ActSuppliesController extends BaseController
     {
 
         List<Integer> find = Stream.concat(actSuppliesService.findall().stream(),actSuppliesService.findAllId().stream()).collect(Collectors.toList());
-        System.out.println(find.toString());
+
         for (long num : ids){
             if (find.contains((int)num)){
                 return AjaxResult.success("删除失败","操作失败");
@@ -143,9 +144,21 @@ public class ActSuppliesController extends BaseController
     @GetMapping("/disable/{id}")
     public AjaxResult setDisable(@PathVariable("id") Long id)
     {
+
+        BigDecimal numBigDecimal = new BigDecimal(id);
+        Integer numberInt = numBigDecimal.intValue();
+
+        List<Integer> find = Stream.concat(actSuppliesService.findall().stream(),actSuppliesService.findAllId().stream()).collect(Collectors.toList());
+        if (find.contains(numberInt)){
+
+            return AjaxResult.success("删除失败","操作失败");
+
+        }
+
         System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
         actSuppliesService.setDisable(id);
-        return AjaxResult.success();
+
+        return AjaxResult.success("200","修改成功");
 
     }
 

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesConvertController.java

@@ -10,7 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * 模板转换页面接口
@@ -83,4 +87,33 @@ public class ActSuppliesConvertController extends BaseController{
     }
 
 
+    @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:converSupplies')")
+    @PostMapping("/converSupplies")
+    public TableDataInfo  convertSupplies(@RequestBody String[] names){
+
+        List<String> name = Arrays.asList(names);
+
+        List<ActOperation> list = actSuppliesConvertService.converSupplies(name);
+
+        name = name.stream()
+                .map(str -> {
+                    if (str == null) {
+                        return null; // 保留原始的null值
+                    }
+                    for (int i = 0; i < list.size(); i++) {
+                        if (str.equals(list.get(i).getDetaliesName())) {
+                            return list.get(i).getSuppliesName();
+                        }
+                    }
+                    return str;
+                })
+                .collect(Collectors.toList());
+
+        System.out.println(name.toString());
+
+        return getDataTable(name);
+
+    }
+
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleDetailController.java

@@ -103,6 +103,7 @@ public class ActSuppliesRoleDetailController extends BaseController
     public AjaxResult add(@RequestBody ActSuppliesRoleDetail actSuppliesRoleDetail)
     {
         return toAjax(actSuppliesRoleDetailService.insertActSuppliesRoleDetail(actSuppliesRoleDetail));
+
     }
 
     /**

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActOperation.java

 package com.ruoyi.system.domain;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class ActOperation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
     private Integer id;
-    private String OperationName;
-    private Integer status;
+    private String suppliesName;
+    private String detaliesName;
 
     public Integer getId() {
         return id;
@@ -18,19 +20,28 @@ public class ActOperation extends BaseEntity {
         this.id = id;
     }
 
-    public String getOperationName() {
-        return OperationName;
+    public String getSuppliesName() {
+        return suppliesName;
     }
 
-    public void setOperationName(String operationName) {
-        OperationName = operationName;
+    public void setSuppliesName(String operationName) {
+        suppliesName = operationName;
     }
 
-    public Integer getStatus() {
-        return status;
+    public String getDetaliesName() {
+        return detaliesName;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDetaliesName(String detaliesName) {
+        this.detaliesName = detaliesName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("suppliesName", getSuppliesName())
+                .append("detaliesName", getDetaliesName())
+                .toString();
     }
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRoleDetail.java

@@ -26,10 +26,10 @@ public class ActSuppliesRoleDetail extends BaseEntity
     private String detailName;
 
     /** 导入数据行列*/
-    private String detailMH;
-    private String detailML;
-    private String detailYH;
-    private String detailYL;
+    private String[] detailMH;
+    private String[] detailML;
+    private String[] detailYH;
+    private String[] detailYL;
     private String detailYS;
     /**所属规则*/
     @Excel(name = "所属规则")
@@ -81,35 +81,35 @@ public class ActSuppliesRoleDetail extends BaseEntity
         this.convertStatus = convertStatus;
     }
 
-    public String getDetailMH() {
+    public String[] getDetailMH() {
         return detailMH;
     }
 
-    public void setDetailMH(String detailMH) {
+    public void setDetailMH(String[] detailMH) {
         this.detailMH = detailMH;
     }
 
-    public String getDetailML() {
+    public String[] getDetailML() {
         return detailML;
     }
 
-    public void setDetailML(String detailML) {
+    public void setDetailML(String[] detailML) {
         this.detailML = detailML;
     }
 
-    public String getDetailYH() {
+    public String[] getDetailYH() {
         return detailYH;
     }
 
-    public void setDetailYH(String detailYH) {
+    public void setDetailYH(String[] detailYH) {
         this.detailYH = detailYH;
     }
 
-    public String getDetailYL() {
+    public String[] getDetailYL() {
         return detailYL;
     }
 
-    public void setDetailYL(String detailYL) {
+    public void setDetailYL(String[] detailYL) {
         this.detailYL = detailYL;
     }
 

ruoyi-supplies/src/main/java/com/ruoyi/system/ex/ServiceException.java

+package com.ruoyi.system.ex;
+
+import com.ruoyi.system.web.ServiceCode;
+
+public class ServiceException extends RuntimeException{
+
+    private ServiceCode serviceCode;
+
+    public ServiceException(ServiceCode serviceCode,String message) {
+        super(message);
+        this.serviceCode = serviceCode;
+    }
+    public ServiceCode getServiceCode(){
+        return  serviceCode;
+    }
+}

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesConverMapper.java

 package com.ruoyi.system.mapper;
 
-import com.ruoyi.system.domain.ActSupplies;
-import com.ruoyi.system.domain.ActSuppliesRole;
-import com.ruoyi.system.domain.ActSuppliesRoleDetail;
-import com.ruoyi.system.domain.ActSuppliesTemplate;
+import com.ruoyi.system.domain.*;
 
 import java.util.List;
 
@@ -18,4 +15,6 @@ public interface ActSuppliesConverMapper {
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
     ActSupplies selectSuppliesname(String name);
+
+    List<ActOperation> converSupplies(List<String> name);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesMapper.java

@@ -65,4 +65,13 @@ public interface ActSuppliesMapper
     List<Integer> findall();
 
     List<Integer> findAllId();
+
+
+    /**
+     * 根据物料总分类名称统计数量
+     * @param suppliesName
+     * @return
+     */
+    public int countBySuppliesName(String suppliesName);
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesRoleMapper.java

@@ -3,6 +3,8 @@ package com.ruoyi.system.mapper;
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 /**
  * 导入规则Mapper接口
@@ -63,4 +65,8 @@ public interface ActSuppliesRoleMapper
     List<ActSuppliesTemplate> saveSid();
 
     List<Integer> findall();
+
+    public int countByRoleName(String roleName);
+
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesConvertService.java

@@ -15,4 +15,6 @@ public interface IActSuppliesConvertService {
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
     ActSupplies selectSuppliesname(String name);
+
+    List<ActOperation> converSupplies(List<String> name);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesRoleService.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service;
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
+import org.springframework.stereotype.Repository;
 
 /**
  * 导入规则Service接口
@@ -10,6 +11,7 @@ import com.ruoyi.system.domain.ActSuppliesTemplate;
  * @author dongjg
  * @date 2023-07-12
  */
+@Repository
 public interface IActSuppliesRoleService 
 {
     /**

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesService.java

 package com.ruoyi.system.service;
 
 import com.ruoyi.system.domain.ActSupplies;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-07-11
  */
+@Repository
 public interface IActSuppliesService 
 {
     /**
@@ -80,4 +82,6 @@ public interface IActSuppliesService
     void setDisable(Long id);
 
     List<Integer> findAllId();
+
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesConvertServiceImpl.java

@@ -39,4 +39,9 @@ public class ActSuppliesConvertServiceImpl implements IActSuppliesConvertService
     public ActSupplies selectSuppliesname(String name) {
         return actSuppliesConverMapper.selectSuppliesname(name);
     }
+
+    @Override
+    public List<ActOperation> converSupplies(List<String> name) {
+        return actSuppliesConverMapper.converSupplies(name);
+    }
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java

 package com.ruoyi.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -59,13 +60,27 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
     public int insertActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail)
     {
 
-        String content = "导入表中第"+actSuppliesRoleDetail.getDetailYH()+"行:第"+actSuppliesRoleDetail.getDetailYL()+"列的数据=>"+"模板表中第"+actSuppliesRoleDetail.getDetailMH()+"行:第"+actSuppliesRoleDetail.getDetailML()+"列" ;
+        //re:导入表的行，ce:导入表的列，se:导入表的sheet;rt:模板表的行，ct:模板表的列，st:模板表的sheet;ys:运算符
 
-        //
-        String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ct\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}]" ;
+        List<String> filteredList = new ArrayList<>();
 
-        actSuppliesRoleDetail.setDetailName(content);
-        actSuppliesRoleDetail.setDetailContent(content1);
+
+        for (int i =0 ;i<actSuppliesRoleDetail.getDetailMH().length; i++){
+
+            filteredList.add("{\"se\":\"0\",\"re\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYH()[i]))-1)+"\",\"ce\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYL()[i]))-1)+"\",\"st\":\"0\",\"rt\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailMH()[i]))-1)+"\",\"ct\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailML()[i]))-1)+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}") ;
+
+        }
+
+
+        String content = String.join(",",filteredList);
+
+        String content2 = "["+content+"]";
+
+
+
+//        String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ct\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}]" ;
+
+        actSuppliesRoleDetail.setDetailContent(content2);
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesRoleDetail.setCreateBy(user.getUserName());
         actSuppliesRoleDetail.setCreateTime(DateUtils.getNowDate());
@@ -83,12 +98,10 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
     public int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail)
     {
 
-        String content12 = "导入表中第"+actSuppliesRoleDetail.getDetailYH()+"行:第"+actSuppliesRoleDetail.getDetailYL()+"列的数据=>"+"模板表中第"+actSuppliesRoleDetail.getDetailMH()+"行:第"+actSuppliesRoleDetail.getDetailML()+"列" ;
-
         //re:导入表的行，ce:导入表的列，se:导入表的sheet;rt:模板表的行，ct:模板表的列，st:模板表的sheet;ys:运算符
         String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ct\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}]" ;
 
-        actSuppliesRoleDetail.setDetailName(content12);
+
         actSuppliesRoleDetail.setDetailContent(content1);
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesRoleDetail.setUpdateBy(user.getUserName());

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleServiceImpl.java

@@ -5,6 +5,9 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesDetails;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
+import com.ruoyi.system.ex.ServiceException;
+import com.ruoyi.system.web.ServiceCode;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ActSuppliesRoleMapper;
@@ -56,6 +59,16 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     @Override
     public int insertActSuppliesRole(ActSuppliesRole actSuppliesRole)
     {
+        String roleName = actSuppliesRole.getRoleName();
+        int countByRoleName = actSuppliesRoleMapper.countByRoleName(roleName);
+        if(countByRoleName > 0){
+            String message = "添加规则失败，规则名称已被占用";
+            System.out.println(message);
+            throw new ServiceException(ServiceCode.ERR_CONFLICT,message);
+        }
+        ActSuppliesRole actSuppliesRole1 = new ActSuppliesRole();
+        BeanUtils.copyProperties(actSuppliesRole,actSuppliesRole1);
+
         actSuppliesRole.setCreateTime(DateUtils.getNowDate());
         return actSuppliesRoleMapper.insertActSuppliesRole(actSuppliesRole);
     }
@@ -69,6 +82,15 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     @Override
     public int updateActSuppliesRole(ActSuppliesRole actSuppliesRole)
     {
+        String roleName = actSuppliesRole.getRoleName();
+        int countByRoleName = actSuppliesRoleMapper.countByRoleName(roleName);
+        if(countByRoleName > 0){
+            String message = "修改规则失败，新的规则名称已被占用";
+            System.out.println(message);
+            throw new ServiceException(ServiceCode.ERR_CONFLICT,message);
+        }
+        ActSuppliesRole actSuppliesRole2 = new ActSuppliesRole();
+        BeanUtils.copyProperties(actSuppliesRole,actSuppliesRole2);
         actSuppliesRole.setUpdateTime(DateUtils.getNowDate());
         return actSuppliesRoleMapper.updateActSuppliesRole(actSuppliesRole);
     }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java

@@ -2,13 +2,19 @@ package com.ruoyi.system.service.impl;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.ActSupplies;
+import com.ruoyi.system.ex.ServiceException;
 import com.ruoyi.system.mapper.ActSuppliesMapper;
 import com.ruoyi.system.service.IActSuppliesService;
+import com.ruoyi.system.web.ServiceCode;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.sql.rowset.serial.SerialException;
 import java.util.List;
 
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
 /**
  * 物料总分类管理Service业务层处理
  * 
@@ -16,6 +22,7 @@ import java.util.List;
  * @date 2023-07-11
  */
 @Service
+
 public class ActSuppliesServiceImpl implements IActSuppliesService 
 {
     @Autowired
@@ -54,6 +61,16 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
     @Override
     public int insertActSupplies(ActSupplies actSupplies)
     {
+        String suppliesName= actSupplies.getSuppliesName();
+        int countBySuppliesName = actSuppliesMapper.countBySuppliesName(suppliesName);
+        if(countBySuppliesName > 0){
+            String message = "添加物料总分类管理失败，名称已被占用！";
+            System.out.println(message);
+            throw new ServiceException(ServiceCode.ERR_CONFLICT,message);
+        }
+        ActSupplies actSupplies1 = new ActSupplies();
+        BeanUtils.copyProperties(actSupplies,actSupplies1);
+
         actSupplies.setCreateTime(DateUtils.getNowDate());
         return actSuppliesMapper.insertActSupplies(actSupplies);
     }
@@ -67,6 +84,15 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
     @Override
     public int updateActSupplies(ActSupplies actSupplies)
     {
+        String suppliesName= actSupplies.getSuppliesName();
+        int countBySuppliesName = actSuppliesMapper.countBySuppliesName(suppliesName);
+        if(countBySuppliesName > 0) {
+            String message = "修改物料总分类管理失败，新的名称已被占用！";
+            System.out.println(message);
+            throw new ServiceException(ServiceCode.ERR_CONFLICT, message);
+        }
+        ActSupplies actSupplies1 = new ActSupplies();
+        BeanUtils.copyProperties(actSupplies,actSupplies1);
         actSupplies.setUpdateTime(DateUtils.getNowDate());
         return actSuppliesMapper.updateActSupplies(actSupplies);
     }

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesConverMapper.xml

@@ -34,11 +34,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="roleId"    column="role_id"    />
         <result property="detailName"    column="detail_name"    />
 
-        <result property="detailMH"    column="detail_m_h"    />
-        <result property="detailML"    column="detail_m_l"    />
-        <result property="detailYH"    column="detail_y_h"    />
-        <result property="detailYL"    column="detail_y_l"    />
-
         <result property="detailContent"    column="detail_content"    />
         <result property="convertStatus" column="convert_status" />
         <result property="status"    column="status"    />
@@ -60,6 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <resultMap type="com.ruoyi.system.domain.ActOperation" id="ActOperationResult">
+        <result property="id"    column="id"    />
+        <result property="suppliesName"    column="supplies_name"    />
+        <result property="detaliesName"    column="details_name"    />
+    </resultMap>
+
     <select id="templiteList" parameterType="com.ruoyi.system.domain.ActSuppliesTemplate" resultMap="SuppliesTemplateResult">
         select id, det_id, template_name from act_supplies_template where status = 0
     </select>
@@ -69,17 +70,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="roleList" parameterType="Integer" resultMap="ActSuppliesRoleResult">
-        select id, temp_id, role_name from act_supplies_role where temp_id = #{id} and status = 0
+        select id, temp_id, role_name from act_supplies_role where status = 0 and temp_id = #{id}
     </select>
 
     <select id="roleListid" parameterType="Integer" resultMap="ActSuppliesRoleDetailResult">
-        select id, role_id, detail_name, detail_content, convert_status from act_supplies_role_detail where role_id = #{id} and status = 0
+        select id, role_id, detail_name, detail_content, convert_status from act_supplies_role_detail where status = 0  and role_id = #{id}
     </select>
 
     <select id="selectSuppliesname" parameterType="String" resultMap="ActSuppliesResult">
         select id, supplies_name from act_supplies where id=(select sid from act_supplies_details where details_name = #{name})
     </select>
 
+    <select id="converSupplies" parameterType="java.util.List" resultMap="ActOperationResult">
+
+        select id ,supplies_name, b.details_name from act_supplies a ,(
+        SELECT sid ,details_name
+        FROM act_supplies_details
+        WHERE details_name IN
+        <foreach item="name" collection="list" open="(" separator="," close=")">
+            #{name}
+        </foreach>
+        ) b where a.id = b.sid
 
+    </select>
 
-</mapper>
+</mapper>
\ No newline at end of file

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesMapper.xml

@@ -17,10 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+
     <sql id="selectActSuppliesVo">
         select id, pid, supplies_name, order_num, status, create_by, create_time, update_by, update_time from act_supplies
     </sql>
 
+    <select id="countBySuppliesName" resultType="int">
+        select count(*) from act_supplies where supplies_name=#{suppliesName}
+    </select>
     <select id="selectActSuppliesList" parameterType="ActSupplies" resultMap="ActSuppliesResult">
         select a.id,a.pid,b.supplies_name fname,a.supplies_name,a.status from act_supplies a left join act_supplies b on a.pid =b.id
         <where>  

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleDetailMapper.xml

@@ -8,11 +8,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="roleId"    column="role_id"    />
         <result property="detailName"    column="detail_name"    />
-        <result property="detailMH"    column="detail_m_h"    />
-        <result property="detailML"    column="detail_m_l"    />
-        <result property="detailYH"    column="detail_y_h"    />
-        <result property="detailYL"    column="detail_y_l"    />
+<!--        <result property="detailMH"    column="detail_m_h"    />-->
+<!--        <result property="detailML"    column="detail_m_l"    />-->
+<!--        <result property="detailYH"    column="detail_y_h"    />-->
+<!--        <result property="detailYL"    column="detail_y_l"    />-->
         <result property="detailContent"    column="detail_content"    />
+        <result property="detailYS" column="detail_y_s"/>
         <result property="convertStatus" column="convert_status" />
         <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
@@ -76,10 +77,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roleId != null">role_id,</if>
             <if test="detailName != null">detail_name,</if>
 
-            <if test="detailMH != null">detail_m_h,</if>
-            <if test="detailML != null">detail_m_l,</if>
-            <if test="detailYH != null">detail_y_h,</if>
-            <if test="detailYL != null">detail_y_l,</if>
+<!--            <if test="detailMH != null">detail_m_h,</if>-->
+<!--            <if test="detailML != null">detail_m_l,</if>-->
+<!--            <if test="detailYH != null">detail_y_h,</if>-->
+<!--            <if test="detailYL != null">detail_y_l,</if>-->
             <if test="detailYS != null">detail_y_s,</if>
 
 
@@ -96,10 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roleId != null">#{roleId},</if>
             <if test="detailName != null">#{detailName},</if>
 
-            <if test="detailMH != null">#{detailMH},</if>
-            <if test="detailML != null">#{detailML},</if>
-            <if test="detailYH != null">#{detailYH},</if>
-            <if test="detailYL != null">#{detailYL},</if>
+<!--            <if test="detailMH != null">#{detailMH},</if>-->
+<!--            <if test="detailML != null">#{detailML},</if>-->
+<!--            <if test="detailYH != null">#{detailYH},</if>-->
+<!--            <if test="detailYL != null">#{detailYL},</if>-->
             <if test="detailYS != null">#{detailYS},</if>
 
 
@@ -122,10 +123,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="detailContent != null">detail_content = #{detailContent},</if>
             <if test="convertStatus != null">convert_status = #{convertStatus},</if>
 
-            <if test="detailMH != null">detail_m_h = #{detailMH},</if>
-            <if test="detailML != null">detail_m_l = #{detailML},</if>
-            <if test="detailYH != null">detail_y_h = #{detailYH},</if>
-            <if test="detailYL != null">detail_y_l = #{detailYL},</if>
+<!--            <if test="detailMH != null">detail_m_h = #{detailMH},</if>-->
+<!--            <if test="detailML != null">detail_m_l = #{detailML},</if>-->
+<!--            <if test="detailYH != null">detail_y_h = #{detailYH},</if>-->
+<!--            <if test="detailYL != null">detail_y_l = #{detailYL},</if>-->
             <if test="detailYS != null">detail_y_s = #{detailYS},</if>
 
             <if test="status != null">status = #{status},</if>

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleMapper.xml

@@ -33,6 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="findall" resultType="Integer">
         select role_id from act_supplies_role_detail GROUP BY role_id
     </select>
+    <select id="countByRoleName" resultType="int">
+        select count(*) from act_supplies_role where role_name=#{roleName}
+    </select>
+
+
 
     <sql id="selectActSuppliesRoleVo">
         select id, temp_id, role_name, status, create_by, create_time, update_by, update_time from act_supplies_role

ruoyi-ui/package.json

@@ -5,9 +5,9 @@
   "author": "若依",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve",
+    "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build",
+    "build:stage": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },
@@ -36,6 +36,9 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "dependencies": {
+    "@vue/cli-plugin-babel": "4.4.6",
+    "@vue/cli-plugin-eslint": "4.4.6",
+    "@vue/cli-service": "4.4.6",
     "@riophae/vue-treeselect": "0.4.0",
     "af-table-column": "^1.0.3",
     "axios": "0.21.0",
@@ -52,7 +55,7 @@
     "js-cookie": "2.2.1",
     "jsencrypt": "3.0.0-rc.1",
     "luckyexcel": "^1.0.1",
-    "luckysheet": "^2.1.13",
+
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
@@ -65,12 +68,54 @@
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
-    "xlsx": "^0.17.5"
+    "xlsx": "^0.17.5",
+    "babel-eslint": "10.1.0",
+    "chalk": "4.1.0",
+    "connect": "3.6.6",
+    "eslint": "7.15.0",
+    "eslint-plugin-vue": "7.2.0",
+    "lint-staged": "10.5.3",
+    "runjs": "4.4.2",
+    "sass": "1.32.0",
+    "sass-loader": "10.1.0",
+    "script-ext-html-webpack-plugin": "2.1.5",
+    "svg-sprite-loader": "5.1.1",
+    "vue-template-compiler": "2.6.12"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
     "@vue/cli-plugin-eslint": "4.4.6",
     "@vue/cli-service": "4.4.6",
+    "@riophae/vue-treeselect": "0.4.0",
+    "af-table-column": "^1.0.3",
+    "axios": "0.21.0",
+    "clipboard": "2.0.6",
+    "core-js": "3.8.1",
+    "echarts": "4.9.0",
+    "element-ui": "2.15.0",
+    "exceljs": "^4.3.0",
+    "file-saver": "^2.0.5",
+    "fuse.js": "6.4.3",
+    "highlight.js": "9.18.5",
+    "jquery": "^3.7.0",
+    "js-beautify": "1.13.0",
+    "js-cookie": "2.2.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "luckyexcel": "^1.0.1",
+
+    "nprogress": "0.2.0",
+    "quill": "1.3.7",
+    "screenfull": "5.0.2",
+    "scriptjs": "^2.5.9",
+    "sortablejs": "1.10.2",
+    "vue": "2.6.12",
+    "vue-append": "^2.2.0",
+    "vue-count-to": "1.0.13",
+    "vue-cropper": "0.5.5",
+    "vue-router": "3.4.9",
+    "vuedraggable": "2.24.3",
+    "vuex": "3.6.0",
+    "xlsx": "^0.17.5",
     "babel-eslint": "10.1.0",
     "chalk": "4.1.0",
     "connect": "3.6.6",

ruoyi-ui/public/demoData/demoFeature.js

+
+// Features specially written for demo
+
+(function() {
+
+    // language
+    function language(params) {
+        
+        var lang = navigator.language||navigator.userLanguage;//常规浏览器语言和IE浏览器
+        lang = lang.substr(0, 2);//截取lang前2位字符
+
+        return lang;
+
+    }
+    // Tencent Forum Link Button
+    function supportButton() {
+        const text = language() === 'zh' ? '反馈' : 'Forum';
+        const link = language() === 'zh' ? 'https://support.qq.com/product/288322' : 'https://groups.google.com/g/luckysheet';
+
+        document.querySelector("body").insertAdjacentHTML('beforeend', '<a id="container" href="'+ link +'" target="_blank" style="z-index:2;width:50px;height:50px;line-height:50px;position:fixed;right:40px;bottom:86px;border-radius:50px;cursor:pointer;background:rgb(71,133,249);color:#fff;text-align:center;text-decoration:none;">'+ text +'</a>');
+    }
+    
+    supportButton()
+
+    /**
+     * Get url parameters
+     */
+    function getRequest() {
+        var vars = {};
+        var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi,    
+        function(m,key,value) {
+          vars[key] = value;
+        });
+        return vars;
+    }
+
+    window.luckysheetDemoUtil = {
+        language:language,
+        getRequest:getRequest
+    }
+    
+})()
\ No newline at end of file

ruoyi-ui/public/index.html

@@ -6,25 +6,24 @@
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon4.ico">
-    <!--<link rel='stylesheet' href='./luckysheet/plugins/css/pluginsCss.css' />
-    <link rel='stylesheet' href='./luckysheet/plugins/plugins.css' />
-    <link rel='stylesheet' href='./luckysheet/css/luckysheet.css' />
-    <link rel='stylesheet' href='./luckysheet/assets/iconfont/iconfont.css' />-->
+    <link rel='stylesheet' href='<%= BASE_URL %>./plugins/css/pluginsCss.css' />
+    <link rel='stylesheet' href='<%= BASE_URL %>./plugins/plugins.css' />
+    <link rel='stylesheet' href='<%= BASE_URL %>./css/luckysheet.css' />
+    <link rel='stylesheet' href='<%= BASE_URL %>./assets/iconfont/iconfont.css' />
     <!--<link rel='stylesheet' href='./luckysheet/expendPlugins/chart/chartmix.css' />-->
-    <!--<script src="./luckysheet/plugins/js/jquery.min.js"></script>-->
-
-    <!--<script src="./luckysheet/plugins/js/plugin.js"></script>
-    <script src="./luckysheet/plugins/js/luckysheet.umd.js"></script>-->
+    <script src="<%= BASE_URL %>./jquery.min.js"></script>
+    <script src="<%= BASE_URL %>./plugins/js/plugin.js"></script>
+    <script src="<%= BASE_URL %>./luckysheet.umd.js"></script>
     <!--<script src="./luckysheet/expendPlugins/chart/chartmix.umd.min.js"></script>-->
 
 
-    <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/css/pluginsCss.css' />
+<!--    <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/css/pluginsCss.css' />
     <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/plugins.css' />
     <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/css/luckysheet.css' />
     <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/assets/iconfont/iconfont.css' />
     <script src="./luckysheet/plugins/js/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/js/plugin.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/luckysheet.umd.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/luckysheet.umd.js"></script>-->
 
     <title><%= webpackConfig.name %></title>
 	  <style>

ruoyi-ui/public/luckysheet/LuckyExcel.vue

-<template>
-  <div class="document">
-    <input style="font-size:16px;" type="file" @change="uploadExcel" />
-    <a href="javascript:void(0)" @click="downloadExcel">Download source xlsx file</a>
-    <div :id="id" ref="luckysheetContainer" class="luckysheetContainer"></div>
-  </div>
-</template>
-
-<script>
-  import $script from 'scriptjs'//用于引入css和js
-  //导入库export.js 这个文件是es6的，不能在普通的HTML文件直接引入js文件（虽然都是js文件，但是有区别，具体请百度es6与es5）！需要把es6转es5才可以直接引入使用！
-  import {exportExcel} from './exportExcel'//文件链接第一节的资料中
-  export default {
-    name: "LuckyExcel",
-    props: {
-      leTitle: {
-        type: String,
-        default: ''
-      },
-      leData: {
-        type: Array,
-        default: [{name:'Sheet1'}],
-      },
-      disabled: {
-        type: Boolean,
-        default: false
-      },
-      id:{
-        type:String,
-        default:'luckysheetContainer'
-      }
-    },
-    data() {
-      return {
-        luckySheet: null,
-      };
-    },
-    created() {
-      this.load();
-    },
-    mounted() {
-
-    },
-    methods: {
-      /**
-       * 加载编辑器
-       */
-      load(){
-        this.$nextTick(() => {
-          // 设置全局变量，因为 editormd 依赖 jquery
-          window.$ = window.jQuery = $;
-          // 异步加载并执行
-          $.getScript('/luckysheet/plugins/js/plugin.js', () => {
-            $script('/luckysheet/luckysheet.umd.js', () => {
-              if(this.disabled){
-                this.createROLuckyExcel();
-              }else{
-                this.createLuckyExcel();
-              };
-            });
-          });
-          // 加载css
-          $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/css/pluginsCss.css'));
-          $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/plugins.css'));
-          $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/css/luckysheet.css'));
-          $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/assets/iconfont/iconfont.css'));
-        });
-      },
-      /**
-       * 只读版luckyExcel 创建
-       */
-      createROLuckyExcel(){
-        if(this.luckySheet) this.luckySheet.destroy();
-        this.$nextTick(() => {
-          let _this = this;
-          $(function () {
-            luckysheet.create({
-              container: _this.id, //容器的ID
-              title:  _this.leTitle?_this.leTitle:'未命名文档', // 工作簿名称
-              lang: "zh", // 设定表格语言 国际化设置，允许设置表格的语言，支持中文("zh")和英文("en")
-              allowCopy: false, // 是否允许拷贝
-              showtoolbar: false, // 是否显示工具栏
-              showinfobar: false, // 是否显示顶部信息栏
-              showsheetbar: false, // 是否显示底部sheet页按钮
-              showstatisticBar: false, // 是否显示底部计数栏
-              sheetBottomConfig: false, // sheet页下方的添加行按钮和回到顶部按钮配置
-              allowEdit: false, // 是否允许前台编辑
-              enableAddRow: false, // 允许增加行
-              enableAddCol: false, // 允许增加列
-              userInfo: false, // 右上角的用户信息展示样式
-              showRowBar: false, // 是否显示行号区域
-              showColumnBar: false, // 是否显示列号区域
-              sheetFormulaBar: false, // 是否显示公式栏
-              enableAddBackTop: false,//返回头部按钮
-              rowHeaderWidth: 0,//纵坐标
-              columnHeaderHeight: 0,//横坐标
-              showstatisticBarConfig: {
-                count:false,
-                view:false,
-                zoom:false,
-              },
-              showsheetbarConfig: {
-                add: false, //新增sheet
-                menu: false, //sheet管理菜单
-                sheet: false, //sheet页显示
-              },
-              hook: {
-                cellMousedown:this.cellMousedown,//绑定鼠标事件
-              },
-              forceCalculation: true,//强制计算公式
-              data:_this.leData,
-            });
-            _this.luckySheet = luckysheet;
-          });
-        });
-      },
-      /**
-       * luckyExcel 创建
-       */
-      createLuckyExcel() {
-        this.$nextTick(() => {
-          // 创建编辑器实例
-          let _this = this;
-          $(function () {
-            luckysheet.create({
-              container:  _this.id,
-              data:_this.leData,
-              title:  _this.leTitle?_this.leTitle:'未命名文档', // 工作簿名称
-              lang: "zh", // 设定表格语言 国际化设置，允许设置表格的语言，支持中文("zh")和英文("en")
-              showinfobar: false,
-            });
-            _this.luckySheet = luckysheet;
-          });
-        });
-      },
-      /**
-       * wangEditor 销毁
-       */
-      destroyLuckyExcel() {
-        if(this.luckySheet){
-          this.luckySheet.destroy();
-          this.luckySheet = null;
-        };
-      },
-      /**
-       * 获取 luckyExcel 数据
-       */
-      getLuckysheetData() {
-        return this.luckySheet.getAllSheets();
-      },
-      /**
-       * 获取 luckyExcel 数据
-       */
-      luckyExcelExitEditMode() {
-        if(this.luckySheet){
-          return this.luckySheet.exitEditMode();
-        };
-      },
-      uploadExcel(evt){
-        let _this=this;
-        const files = evt.target.files;
-        if(files==null || files.length==0){
-          alert("No files wait for import");
-          return;
-        }
-
-        let name = files[0].name;
-        let suffixArr = name.split("."), suffix = suffixArr[suffixArr.length-1];
-        if(suffix!="xlsx"){
-          alert("Currently only supports the import of xlsx files");
-          return;
-        }
-        LuckyExcel.transformExcelToLucky(files[0], function(exportJson, luckysheetfile){
-
-          if(exportJson.sheets==null || exportJson.sheets.length==0){
-            alert("Failed to read the content of the excel file, currently does not support xls files!");
-            return;
-          }
-          _this.luckySheet.destroy();
-          console.log('exportJson.sheets',exportJson.sheets)
-          _this.luckySheet.create({
-            container: _this.id, //luckysheet is the container id
-            showinfobar:false,
-            data:exportJson.sheets,
-            title:exportJson.info.name,
-            userInfo:exportJson.info.name.creator
-          });
-        });
-      },
-      downloadExcel(){
-        exportExcel(luckysheet.getAllSheets(),"下载")
-        console.log('luckysheet.getAllSheets()s',luckysheet.getAllSheets());
-      }
-    }
-  };
-</script>
-
-<style src="./LuckyExcel.scss" lang="scss" scoped></style>
-<style lang="scss" >
-  .luckysheet-cols-menu{
-    z-index: 9004 !important;
-  }
-  .luckysheet-input-box{
-    z-index: 3000 !important;
-  }
-  .luckysheet-wa-editor{
-    z-index: 2005 !important;
-  }
-  #luckysheet-icon-morebtn-div{
-    z-index: 3000 !important;
-  }
-  .luckysheet-modal-dialog-slider{
-    z-index: 2005 !important;
-  }
-  .chartSetting{
-    z-index: 3000 !important;
-  }
-</style>
-
-//LuckyExcel.scss
-.document{
-position: relative;
-width:100%;
-height: 100%;
--webkit-animation-fill-mode: none;
-animation-fill-mode: none;
-.luckysheetContainer{
-margin:0px;
-padding:0px;
-position:absolute;
-width:100%;
-left: 0px;
-top: 0px;
-bottom:0px;
-}
-}