Merge remote-tracking branch 'origin/master'

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

@@ -35,19 +35,9 @@ public class SysRuleManagementController extends BaseController
     public TableDataInfo list(SysRuleManagement sysRuleManagement)
     {
         startPage();
-        List<SysRuleManagement> list = iSysRuleManagement.list();
+        List<SysRuleManagement> list = iSysRuleManagement.list(sysRuleManagement);
         return getDataTable(list);
     }
-    /**
-     * 保存规则
-     */
-    @PreAuthorize("@ss.hasPermi('system:ruleManagement:save')")
-    @Log(title = "模板详情", businessType = BusinessType.INSERT)
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody SysRuleManagement sysRuleManagement)
-    {
-        return toAjax(iSysRuleManagement.save(sysRuleManagement));
-    }
 
     /**
      * 获取规则详情详细信息
@@ -60,4 +50,38 @@ public class SysRuleManagementController extends BaseController
         return AjaxResult.success(iSysRuleManagement.selectExcelById(id));
     }
 
+    /**
+     * 新增规则
+     */
+    @PreAuthorize("@ss.hasPermi('system:ruleManagement:add')")
+    @Log(title = "规则详情", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SysRuleManagement sysRuleManagement)
+    {
+        return toAjax(iSysRuleManagement.add(sysRuleManagement));
+    }
+
+    /**
+     * 修改规则
+     */
+    @PreAuthorize("@ss.hasPermi('system:ruleManagement:edit')")
+    @Log(title = "规则详情", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SysRuleManagement sysRuleManagement)
+    {
+        return toAjax(iSysRuleManagement.updateRule(sysRuleManagement));
+    }
+
+    /**
+     * 删除规则
+     */
+    @PreAuthorize("@ss.hasPermi('system:ruleManagement:remove')")
+    @Log(title = "规则详情", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id)
+    {
+        return toAjax(iSysRuleManagement.deleteRuleById(id));
+    }
+
+
 }

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

@@ -5,8 +5,8 @@ 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.ActSuppliesTemplateService;
 import com.ruoyi.system.service.ISysSuppliesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,11 +33,12 @@ public class SysSuppliesController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:supplies:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysSupplies sysSupplies)
+    public TableDataInfo list(ActSuppliesTemplate sysSupplies)
     {
         startPage();
         List<SysSupplies> list = iSysSuppliesService.list();
         return getDataTable(list);
+
     }
     /**
      * 保存物资管理列表

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

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
\ No newline at end of file
+                        multi-statement-allow: true

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

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源  114.115.162.32   127.0.0.1    hbghgz  jDkrSt5Ts77zXWCJ
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
\ No newline at end of file
+                        multi-statement-allow: true

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

 package com.ruoyi.system.controller;
 
 
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.service.IActSuppliesConvertService;
-import com.ruoyi.system.service.IActSuppliesDetailsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -34,9 +28,9 @@ public class ActSuppliesConvertController extends BaseController{
      * */
     @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:list')")
     @GetMapping("/list")
-    public TableDataInfo  templitelist(SysSupplies sysSupplies){
+    public TableDataInfo  templitelist(ActSuppliesTemplate sysSupplies){
 
-        List<SysSupplies> list = actSuppliesConvertService.templiteList(sysSupplies);
+        List<ActSuppliesTemplate> list = actSuppliesConvertService.templiteList(sysSupplies);
         return getDataTable(list);
 
     }
@@ -48,7 +42,7 @@ public class ActSuppliesConvertController extends BaseController{
     @GetMapping("/listid/{id}")
     public TableDataInfo  templitelistid(@PathVariable("id") Integer id){
 
-        List<SysSupplies> list = actSuppliesConvertService.templiteListid(id);
+        List<ActSuppliesTemplate> list = actSuppliesConvertService.templiteListid(id);
         return getDataTable(list);
 
     }
@@ -77,5 +71,16 @@ public class ActSuppliesConvertController extends BaseController{
 
     }
 
+    /**
+     * 模板转换页面根据规则ID查询规则详情接口
+     * */
+    @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:saveSuppliesname')")
+    @GetMapping("/saveSuppliesname/{id}")
+    public AjaxResult  saveSuppliesname(@PathVariable("id") Integer id){
+
+        return AjaxResult.success(actSuppliesConvertService.selectSuppliesname(id));
+
+    }
+
 
 }

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

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.ActSuppliesTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +38,7 @@ public class ActSuppliesRoleController extends BaseController
     @ResponseBody
     public TableDataInfo saveSid(){
 
-        List<SysSupplies> options = actSuppliesRoleService.saveSid();
+        List<ActSuppliesTemplate> options = actSuppliesRoleService.saveSid();
 
         return getDataTable(options);
 

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

@@ -6,7 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.ActSuppliesTemplate;
 import com.ruoyi.system.service.ActSuppliesTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,10 +33,10 @@ public class ActSuppliesTemplateController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysSupplies sysSupplies) {
+    public TableDataInfo list(ActSuppliesTemplate sysSupplies) {
 
         startPage();
-        List<SysSupplies> list = actSuppliesTemplateService.selectSuppliesTemplateList(sysSupplies);
+        List<ActSuppliesTemplate> list = actSuppliesTemplateService.selectSuppliesTemplateList(sysSupplies);
         return getDataTable(list);
 
     }
@@ -47,9 +47,9 @@ public class ActSuppliesTemplateController extends BaseController {
     @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:export')")
     @Log(title = "Excel模板", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysSupplies sysSupplies) {
-        List<SysSupplies> list = actSuppliesTemplateService.selectSuppliesTemplateList(sysSupplies);
-        ExcelUtil<SysSupplies> util = new ExcelUtil<SysSupplies>(SysSupplies.class);
+    public void export(HttpServletResponse response, ActSuppliesTemplate sysSupplies) {
+        List<ActSuppliesTemplate> list = actSuppliesTemplateService.selectSuppliesTemplateList(sysSupplies);
+        ExcelUtil<ActSuppliesTemplate> util = new ExcelUtil<ActSuppliesTemplate>(ActSuppliesTemplate.class);
         util.exportExcel(list, "Excel模板数据");
     }
 
@@ -68,7 +68,7 @@ public class ActSuppliesTemplateController extends BaseController {
     @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:add')")
     @Log(title = "Excel模板", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody SysSupplies sysSupplies) {
+    public AjaxResult add(@RequestBody ActSuppliesTemplate sysSupplies) {
         int i = actSuppliesTemplateService.insertSuppliesTemplate(sysSupplies);
         return toAjax(i);
     }
@@ -81,7 +81,7 @@ public class ActSuppliesTemplateController extends BaseController {
     @GetMapping("/listnameid")
     public TableDataInfo listnameid() {
 
-        List<SysSupplies> sysSupplies = actSuppliesTemplateService.selectlistnameid();
+        List<ActSuppliesTemplate> sysSupplies = actSuppliesTemplateService.selectlistnameid();
 
         return getDataTable(sysSupplies);
 
@@ -94,7 +94,7 @@ public class ActSuppliesTemplateController extends BaseController {
     @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:edit')")
     @Log(title = "Excel模板", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody SysSupplies sysSupplies) {
+    public AjaxResult edit(@RequestBody ActSuppliesTemplate sysSupplies) {
         return toAjax(actSuppliesTemplateService.updateSuppliesTemplate(sysSupplies));
     }
 

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/SysSupplies.java → ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2023-07-05
  */
-public class SysSupplies extends BaseEntity
+public class ActSuppliesTemplate extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

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.SysSupplies;
+import com.ruoyi.system.domain.ActSuppliesTemplate;
 
 import java.util.List;
 
 public interface ActSuppliesConverMapper {
 
-    List<SysSupplies> templiteList(SysSupplies sysSupplies);
+    List<ActSuppliesTemplate> templiteList(ActSuppliesTemplate sysSupplies);
 
-    List<SysSupplies> templiteListid(Integer id);
+    List<ActSuppliesTemplate> templiteListid(Integer id);
 
     List<ActSuppliesRole> roleList(Integer id);
 
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
+    ActSupplies selectSuppliesname(Integer id);
 }

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

@@ -2,7 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.ActSuppliesTemplate;
 
 /**
  * 导入规则Mapper接口
@@ -60,6 +60,6 @@ public interface ActSuppliesRoleMapper
      */
     public int deleteActSuppliesRoleByIds(Integer[] ids);
 
-    List<SysSupplies> saveSid();
+    List<ActSuppliesTemplate> saveSid();
 
 }

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

 package com.ruoyi.system.mapper;
 
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.ActSuppliesTemplate;
 
 import java.util.List;
 
@@ -13,15 +13,15 @@ import java.util.List;
 public interface ActSuppliesTemplateMapper
 {
 
-    List<SysSupplies> selectSuppliesTemplateList(SysSupplies sysSupplies);
+    List<ActSuppliesTemplate> selectSuppliesTemplateList(ActSuppliesTemplate sysSupplies);
 
-    List<SysSupplies> selectSuppliesTemplateById(Long id);
+    List<ActSuppliesTemplate> selectSuppliesTemplateById(Long id);
 
-    int insertSuppliesTemplate(SysSupplies sysSupplies);
+    int insertSuppliesTemplate(ActSuppliesTemplate sysSupplies);
 
-    List<SysSupplies> selectlistnameid();
+    List<ActSuppliesTemplate> selectlistnameid();
 
-    int updateSuppliesTemplate(SysSupplies sysSupplies);
+    int updateSuppliesTemplate(ActSuppliesTemplate sysSupplies);
 
     int deleteSuppliesTemplateByIds(Long[] ids);
 

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

 package com.ruoyi.system.service;
 
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.ActSuppliesTemplate;
 
 import java.util.List;
 
@@ -13,15 +13,15 @@ import java.util.List;
 public interface ActSuppliesTemplateService
 {
 
-    List<SysSupplies> selectSuppliesTemplateList(SysSupplies sysSupplies);
+    List<ActSuppliesTemplate> selectSuppliesTemplateList(ActSuppliesTemplate sysSupplies);
 
-    List<SysSupplies> selectSuppliesTemplateById(Long id);
+    List<ActSuppliesTemplate> selectSuppliesTemplateById(Long id);
 
-    int insertSuppliesTemplate(SysSupplies sysSupplies);
+    int insertSuppliesTemplate(ActSuppliesTemplate sysSupplies);
 
-    List<SysSupplies> selectlistnameid();
+    List<ActSuppliesTemplate> selectlistnameid();
 
-    int updateSuppliesTemplate(SysSupplies sysSupplies);
+    int updateSuppliesTemplate(ActSuppliesTemplate sysSupplies);
 
     int deleteSuppliesTemplateByIds(Long[] ids);
 

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

 package com.ruoyi.system.service;
 
-import com.ruoyi.system.domain.ActSuppliesDetails;
-import com.ruoyi.system.domain.ActSuppliesRole;
-import com.ruoyi.system.domain.ActSuppliesRoleDetail;
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.*;
 
 import java.util.List;
 
 public interface IActSuppliesConvertService {
 
-    List<SysSupplies> templiteList(SysSupplies sysSupplies);
+    List<ActSuppliesTemplate> templiteList(ActSuppliesTemplate sysSupplies);
 
-    List<SysSupplies> templiteListid(Integer id);
+    List<ActSuppliesTemplate> templiteListid(Integer id);
 
     List<ActSuppliesRole> roleList(Integer id);
 
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
+    ActSupplies selectSuppliesname(Integer id);
 }

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

@@ -2,7 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.ActSuppliesTemplate;
 
 /**
  * 导入规则Service接口
@@ -60,6 +60,6 @@ public interface IActSuppliesRoleService
      */
     public int deleteActSuppliesRoleById(Integer id);
 
-    List<SysSupplies> saveSid();
+    List<ActSuppliesTemplate> saveSid();
 
 }

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

 package com.ruoyi.system.service.impl;
 
 
-import com.ruoyi.system.domain.ActSuppliesDetails;
-import com.ruoyi.system.domain.ActSuppliesRole;
-import com.ruoyi.system.domain.ActSuppliesRoleDetail;
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.ActSuppliesConverMapper;
 import com.ruoyi.system.service.IActSuppliesConvertService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,12 +16,12 @@ public class ActSuppliesConvertServiceImpl implements IActSuppliesConvertService
     private ActSuppliesConverMapper actSuppliesConverMapper;
 
     @Override
-    public List<SysSupplies> templiteList(SysSupplies sysSupplies) {
+    public List<ActSuppliesTemplate> templiteList(ActSuppliesTemplate sysSupplies) {
         return actSuppliesConverMapper.templiteList(sysSupplies);
     }
 
     @Override
-    public List<SysSupplies> templiteListid(Integer id) {
+    public List<ActSuppliesTemplate> templiteListid(Integer id) {
         return actSuppliesConverMapper.templiteListid(id);
     }
 
@@ -37,4 +34,9 @@ public class ActSuppliesConvertServiceImpl implements IActSuppliesConvertService
     public List<ActSuppliesRoleDetail> roleListid(Integer id) {
         return actSuppliesConverMapper.roleListid(id);
     }
+
+    @Override
+    public ActSupplies selectSuppliesname(Integer id) {
+        return actSuppliesConverMapper.selectSuppliesname(id);
+    }
 }

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

@@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.ActSuppliesTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ActSuppliesRoleMapper;
@@ -96,7 +96,7 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     }
 
     @Override
-    public List<SysSupplies> saveSid() {
+    public List<ActSuppliesTemplate> saveSid() {
         return actSuppliesRoleMapper.saveSid();
     }
 }

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

@@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.domain.ActSuppliesTemplate;
 import com.ruoyi.system.mapper.ActSuppliesTemplateMapper;
 import com.ruoyi.system.service.ActSuppliesTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,17 +25,17 @@ public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateServic
 
 
     @Override
-    public List<SysSupplies> selectSuppliesTemplateList(SysSupplies sysSupplies) {
+    public List<ActSuppliesTemplate> selectSuppliesTemplateList(ActSuppliesTemplate sysSupplies) {
         return actSuppliesTemplateMapper.selectSuppliesTemplateList(sysSupplies);
     }
 
     @Override
-    public List<SysSupplies> selectSuppliesTemplateById(Long id) {
+    public List<ActSuppliesTemplate> selectSuppliesTemplateById(Long id) {
         return actSuppliesTemplateMapper.selectSuppliesTemplateById(id);
     }
 
     @Override
-    public int insertSuppliesTemplate(SysSupplies sysSupplies) {
+    public int insertSuppliesTemplate(ActSuppliesTemplate sysSupplies) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         sysSupplies.setCreateBy(user.getUserName());
         sysSupplies.setCreateTime(DateUtils.getNowDate());
@@ -43,12 +43,12 @@ public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateServic
     }
 
     @Override
-    public List<SysSupplies> selectlistnameid() {
+    public List<ActSuppliesTemplate> selectlistnameid() {
         return actSuppliesTemplateMapper.selectlistnameid();
     }
 
     @Override
-    public int updateSuppliesTemplate(SysSupplies sysSupplies) {
+    public int updateSuppliesTemplate(ActSuppliesTemplate sysSupplies) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         sysSupplies.setUpdateBy(user.getUserName());
         sysSupplies.setUpdateTime(DateUtils.getNowDate());

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

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.ActSuppliesConverMapper">
 
-    <resultMap type="SysSupplies" id="SuppliesTemplateResult">
+    <resultMap type="ActSuppliesTemplate" id="SuppliesTemplateResult">
         <result property="id"    column="id"    />
         <result property="detId"    column="det_id"    />
         <result property="templateName"    column="template_name"    />
@@ -48,7 +48,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <select id="templiteList" parameterType="com.ruoyi.system.domain.SysSupplies" resultMap="SuppliesTemplateResult">
+    <resultMap type="ActSupplies" id="ActSuppliesResult">
+        <result property="id"    column="id"    />
+        <result property="pid"    column="pid"    />
+        <result property="suppliesName"    column="supplies_name"    />
+        <result property="orderNum"    column="order_num"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </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>
 
@@ -64,4 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, role_id, detail_name, detail_content, convert_status from act_supplies_role_detail where role_id = #{id} and status = 0
     </select>
 
+    <select id="selectSuppliesname" parameterType="Integer" resultMap="ActSuppliesResult">
+        select sid from act_supplies_details where id = #{id}
+    </select>
+
+
 </mapper>
\ No newline at end of file

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

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <resultMap type="com.ruoyi.system.domain.SysSupplies" id="SuppliesTemplateResult">
+    <resultMap type="com.ruoyi.system.domain.ActSuppliesTemplate" id="SuppliesTemplateResult">
         <result property="id"    column="id"    />
         <result property="detId"    column="det_id"    />
         <result property="templateName"    column="template_name"    />
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, temp_id, role_name, status, create_by, create_time, update_by, update_time from act_supplies_role
     </sql>
 
-    <select id="saveSid" parameterType="com.ruoyi.system.domain.SysSupplies" resultMap="SuppliesTemplateResult">
+    <select id="saveSid" parameterType="com.ruoyi.system.domain.ActSuppliesTemplate" resultMap="SuppliesTemplateResult">
         select id, det_id, template_name from act_supplies_template where status = 0
     </select>
 

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.ActSuppliesTemplateMapper">
 
-    <resultMap type="SysSupplies" id="SuppliesTemplateResult">
+    <resultMap type="ActSuppliesTemplate" id="SuppliesTemplateResult">
         <result property="id"    column="id"    />
         <result property="detId"    column="det_id"    />
         <result property="templateName"    column="template_name"    />

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRuleManagement.java

@@ -3,8 +3,8 @@ package com.ruoyi.system.domain;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 物资管理 sys_supplies
- * 
+ * 物资管理 sys_rule
+ *
  * @author
  * @date
  */
@@ -15,7 +15,7 @@ public class SysRuleManagement extends BaseEntity
     /** 主键 */
     private Long id;
 
-    /** 模板名称 */
+    /** 规则名称 */
     private String name;
 
     /** JSON */

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysSupplies.java

@@ -18,99 +18,49 @@ public class SysSupplies extends BaseEntity
     /** ID */
     private Long id;
 
-    /** 关联ID */
-    @Excel(name = "关联ID")
-    private Long detId;
+    /** name*/
 
-    public String getTemplateName() {
-        return templateName;
-    }
-
-    public void setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-
-    /** Excel文件名 */
-    @Excel(name = "Excel文件名")
-    private String templateName;
-
-    /** 内容 */
-    @Excel(name = "内容")
-    private String templateContent;
-
-    /** 状态 */
-    @Excel(name = "状态")
-    private Long status;
-
-    private String sname;
-    private String sysclassify;
-
-    public String getSname() {
-        return sname;
-    }
-
-    public void setSname(String sname) {
-        this.sname = sname;
-    }
+    private String name;
 
-    public String getSysclassify() {
-        return sysclassify;
-    }
+    /** name*/
 
-    public void setSysclassify(String sysclassify) {
-        this.sysclassify = sysclassify;
-    }
+    private String jsons;
 
-    public void setId(Long id)
-    {
-        this.id = id;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
-    public void setDetId(Long detId)
-    {
-        this.detId = detId;
-    }
 
-    public Long getDetId()
-    {
-        return detId;
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getTemplateContent() {
-        return templateContent;
+    public String getName() {
+        return name;
     }
 
-    public void setTemplateContent(String templateContent) {
-        this.templateContent = templateContent;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public void setStatus(Long status)
-    {
-        this.status = status;
+    public String getJsons() {
+        return jsons;
     }
 
-    public Long getStatus()
-    {
-        return status;
+    public void setJsons(String jsons) {
+        this.jsons = jsons;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("detId", getDetId())
-                .append("name", getTemplateName())
-                .append("content", getTemplateContent())
-                .append("status", getStatus())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "SysSupplies{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", jsons='" + jsons + '\'' +
+                '}';
     }
 }
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ISysRuleManagement.java

@@ -6,16 +6,21 @@ import java.util.List;
 
 /**
  * 物资管理Mapper接口
- * 
+ *
  * @author
  * @date
  */
 public interface ISysRuleManagement
 {
 
-    Integer save(SysRuleManagement s);
-
-    List<SysRuleManagement> list();
+    List<SysRuleManagement> list(SysRuleManagement sysRuleManagement);
 
     SysRuleManagement selectExcelById(Long id);
+
+    Integer add(SysRuleManagement s);
+
+
+    int updateRule(SysRuleManagement sysRuleManagement);
+
+    int deleteRuleById(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRuleManagementService.java

@@ -6,16 +6,20 @@ import java.util.List;
 
 /**
  * 物资管理Service接口
- * 
+ *
  * @author
  * @date
  */
 public interface ISysRuleManagementService
 {
 
-    List<SysRuleManagement> list();
+    List<SysRuleManagement> list( SysRuleManagement sysRuleManagement);
 
-    Integer save(SysRuleManagement s);
+    Integer add(SysRuleManagement s);
 
     SysRuleManagement selectExcelById(Long id);
+
+    int updateRule(SysRuleManagement sysRuleManagement);
+
+    int deleteRuleById(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRuleManagementImpl.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * 物资管理Service业务层处理
- * 
+ *
  * @author
  * @date
  */
@@ -21,8 +21,8 @@ public class SysRuleManagementImpl implements ISysRuleManagementService
     private ISysRuleManagement iSysRuleManagement;
 
     @Override
-    public List<SysRuleManagement> list() {
-        return iSysRuleManagement.list();
+    public List<SysRuleManagement> list(SysRuleManagement sysRuleManagement) {
+        return iSysRuleManagement.list(sysRuleManagement);
     }
 
     @Override
@@ -31,10 +31,22 @@ public class SysRuleManagementImpl implements ISysRuleManagementService
     }
 
     @Override
-    public Integer save(SysRuleManagement sysSupplies) {
-        return iSysRuleManagement.save(sysSupplies);
+    public Integer add(SysRuleManagement sysSupplies) {
+        return iSysRuleManagement.add(sysSupplies);
     }
 
+    @Override
+    public int updateRule(SysRuleManagement sysRuleManagement) {
+        return iSysRuleManagement.updateRule(sysRuleManagement);
+    }
+
+    @Override
+    public int deleteRuleById(Long id) {
+        return iSysRuleManagement.deleteRuleById(id);
+    }
+
+
+
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSuppliesServiceImpl.java

 package com.ruoyi.system.service.impl;
 
 import com.ruoyi.system.domain.SysSupplies;
-import com.ruoyi.system.mapper.ActSuppliesTemplateMapper;
 import com.ruoyi.system.mapper.ISysSuppliesMapper;
-import com.ruoyi.system.service.ActSuppliesTemplateService;
 import com.ruoyi.system.service.ISysSuppliesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-system/src/main/resources/mapper/system/SysRuleManagementMapper.xml

@@ -10,14 +10,18 @@
         <result property="jsons" column="jsons"/>
 
     </resultMap>
-    <select id="list" resultMap="SysRuleManagementResult">
+    <select id="list" parameterType="SysRuleManagement" resultMap="SysRuleManagementResult">
         select
             id,
             name,
             jsons
         from sys_rule
         where 1=1
+        <if test="name !=null">
+            and name = #{name}
+        </if>
     </select>
+
     <select id="selectExcelById" resultMap="SysRuleManagementResult">
         select
             id,
@@ -26,7 +30,8 @@
         from sys_rule
         where id = #{id}
     </select>
-    <insert id="save" parameterType="SysRuleManagement" useGeneratedKeys="true" keyProperty="id">
+    <!--新增-->
+    <insert id="add" parameterType="SysRuleManagement" useGeneratedKeys="true" keyProperty="id">
         insert into sys_rule
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
@@ -39,5 +44,17 @@
 
         </trim>
     </insert>
-
-</mapper>
\ No newline at end of file
+    <!--修改-->
+    <update id="updateRule" parameterType="SysConfig">
+        update sys_rule
+        <set>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="jsons != null and jsons != ''">jsons = #{jsons},</if>
+        </set>
+        where id = #{id}
+    </update>
+    <!--删除-->
+    <delete id="deleteRuleById" parameterType="Long">
+        delete from sys_rule where id = #{id}
+    </delete>
+</mapper>

ruoyi-ui/package.json

@@ -11,7 +11,6 @@
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },
-
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
@@ -60,6 +59,7 @@
     "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",

ruoyi-ui/src/api/ruoyi-myLuckyexcel/myluckyexcel.js

@@ -126,6 +126,45 @@ export function getRule(id) {
     method: 'get'
   })
 }
+// 新增规则详情
+export function addRuleManagement(data) {
+  return request({
+    url: '/system/ruleManagement/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改规则详情
+export function updateRuleManagement(data) {
+  return request({
+    url: '/system/ruleManagement/edit',
+    method: 'put',
+    data: data
+  })
+}
+// 删除规则详情
+export function delRuleManagement(id) {
+  return request({
+    url: '/system/ruleManagement/' + id,
+    method: 'delete'
+  })
+}
+
+
+
+
+
+
+
+// 查询模板列表
+export function listMyluckyexcel(query) {
+  return request({
+    url: '/system/supplies/list',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询模板详情详细
 export function getMyluckyexcel(id) {