diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysBillNoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysBillNoController.java new file mode 100644 index 000000000..a9bd137e9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysBillNoController.java @@ -0,0 +1,126 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.SysBillNo; +import com.ruoyi.system.service.ISysBillNoService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 单据号迭代信息Controller + * + * @author dalin + * @date 2020-12-15 + */ +@Controller +@RequestMapping("/SysBillNo/bill") +public class SysBillNoController extends BaseController +{ + private String prefix = "SysBillNo/bill"; + + @Autowired + private ISysBillNoService sysBillNoService; + + @RequiresPermissions("SysBillNo:bill:view") + @GetMapping() + public String bill() + { + return prefix + "/bill"; + } + + /** + * 查询单据号迭代信息列表 + */ + @RequiresPermissions("SysBillNo:bill:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysBillNo sysBillNo) + { + startPage(); + List list = sysBillNoService.selectSysBillNoList(sysBillNo); + return getDataTable(list); + } + + /** + * 导出单据号迭代信息列表 + */ + @RequiresPermissions("SysBillNo:bill:export") + @Log(title = "单据号迭代信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysBillNo sysBillNo) + { + List list = sysBillNoService.selectSysBillNoList(sysBillNo); + ExcelUtil util = new ExcelUtil(SysBillNo.class); + return util.exportExcel(list, "bill"); + } + + /** + * 新增单据号迭代信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存单据号迭代信息 + */ + @RequiresPermissions("SysBillNo:bill:add") + @Log(title = "单据号迭代信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysBillNo sysBillNo) + { + return toAjax(sysBillNoService.insertSysBillNo(sysBillNo)); + } + + /** + * 修改单据号迭代信息 + */ + @GetMapping("/edit/{fperiod}") + public String edit(@PathVariable("fperiod") String fperiod, ModelMap mmap) + { + SysBillNo sysBillNo = sysBillNoService.selectSysBillNoById(fperiod); + mmap.put("sysBillNo", sysBillNo); + return prefix + "/edit"; + } + + /** + * 修改保存单据号迭代信息 + */ + @RequiresPermissions("SysBillNo:bill:edit") + @Log(title = "单据号迭代信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysBillNo sysBillNo) + { + return toAjax(sysBillNoService.updateSysBillNo(sysBillNo)); + } + + /** + * 删除单据号迭代信息 + */ + @RequiresPermissions("SysBillNo:bill:remove") + @Log(title = "单据号迭代信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(sysBillNoService.deleteSysBillNoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js index e21e33342..94ea4617b 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js @@ -75,6 +75,7 @@ $(window).bind("load resize", function() { function syncMenuTab(dataId) { if(isLinkage) { var $dataObj = $('a[href$="' + decodeURI(dataId) + '"]'); + if ($dataObj.attr("class") != null && !$dataObj.hasClass("noactive")) { $('.nav ul').removeClass("in"); $dataObj.parents("ul").addClass("in") @@ -137,6 +138,8 @@ $(function() { // 激活指定选项卡 function setActiveTab(element) { if (!$(element).hasClass('active')) { + System.log($(element)) ; + System.log(" VVVVVVVVVVVVVVVVV "); var currentId = $(element).data('id'); syncMenuTab(currentId); // 显示tab对应的内容区 diff --git a/ruoyi-admin/src/main/resources/templates/system/bill/add.html b/ruoyi-admin/src/main/resources/templates/system/bill/add.html new file mode 100644 index 000000000..bdc17a684 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/bill/add.html @@ -0,0 +1,43 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/bill/bill.html b/ruoyi-admin/src/main/resources/templates/system/bill/bill.html new file mode 100644 index 000000000..cde2403ae --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/bill/bill.html @@ -0,0 +1,103 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/bill/edit.html b/ruoyi-admin/src/main/resources/templates/system/bill/edit.html new file mode 100644 index 000000000..cd51001be --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/bill/edit.html @@ -0,0 +1,44 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/add.html b/ruoyi-admin/src/main/resources/templates/system/menu/add.html index 39ebb7357..81184bb1e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/menu/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/menu/add.html @@ -24,6 +24,12 @@ +
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/edit.html b/ruoyi-admin/src/main/resources/templates/system/menu/edit.html index 66086cea7..9af546ca3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/menu/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/menu/edit.html @@ -25,11 +25,17 @@
-
+
` + +
+ +
` +
+
`
-
+
`
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html index 68e15d274..baf54e53c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html +++ b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html @@ -113,6 +113,12 @@ } } }, + { + field: 'billPrefix', + title: '前缀', + width: '10%', + align: "left" + }, { field: 'visible', title: '可见', diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java index a3177e6bc..b13e50702 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -40,6 +40,9 @@ public class SysMenu extends BaseEntity /** 类型:0目录,1菜单,2按钮 */ private String menuType; + /** 单据前缀编号*/ + private String billPrefix; + /** 菜单状态:0显示,1隐藏 */ private String visible; @@ -137,6 +140,16 @@ public class SysMenu extends BaseEntity this.menuType = menuType; } + public String getBillPrefix() + { + return billPrefix; + } + + public void setBillPrefix(String billPrefix) + { + this.billPrefix = billPrefix; + } + public String getVisible() { return visible; @@ -188,6 +201,7 @@ public class SysMenu extends BaseEntity .append("url", getUrl()) .append("target", getTarget()) .append("menuType", getMenuType()) + .append("billPrefix", getBillPrefix()) .append("visible", getVisible()) .append("perms", getPerms()) .append("icon", getIcon()) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java index 76d73c5cb..99bd81498 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java @@ -67,6 +67,9 @@ public class GenTable extends BaseEntity /** 界面上form的列数 1一列，2二列，3三列 4四列 */ private String formCols; + /** 单据前缀 生成 菜单脚本的时候插入 */ + private String billPrefix; + /** 生成路径（不填默认项目路径） */ private String genPath; @@ -238,6 +241,16 @@ public class GenTable extends BaseEntity this.formCols = formCols; } + public String getBillPrefix() + { + return billPrefix; + } + + public void setBillPrefix(String billPrefix) + { + this.billPrefix = billPrefix; + } + public String getGenPath() { return genPath; diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml index ca9c812f6..95ec215c5 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -56,7 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark,form_cols from gen_table + select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark, + form_cols,bill_prefix from gen_table
@@ -86,6 +86,16 @@ + +
+
+ +
+ +
+
+
+ diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-generator/src/main/resources/vm/sql/sql.vm index 8124cd27a..1cc07b223 100644 --- a/ruoyi-generator/src/main/resources/vm/sql/sql.vm +++ b/ruoyi-generator/src/main/resources/vm/sql/sql.vm @@ -1,6 +1,6 @@ -- 菜单 SQL -insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark,bill_prefix) +values('${functionName}', '${parentMenuId}', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', sysdate(), '', null, '${functionName}菜单', '${billPrefix}'); -- 按钮父菜单ID SELECT @parentId := LAST_INSERT_ID(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysBillNo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysBillNo.java new file mode 100644 index 000000000..261874e29 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysBillNo.java @@ -0,0 +1,79 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 单据号迭代信息对象 sys_bill_no + * + * @author dalin + * @date 2020-12-15 + */ +public class SysBillNo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 期间 */ + private String fperiod; + + /** 单据标识 */ + private String billName; + + /** 迭代值 */ + @Excel(name = "迭代值") + private String iterationValue; + + /** 下一个值 */ + @Excel(name = "下一个值") + private String nextValue; + + public void setFperiod(String fperiod) + { + this.fperiod = fperiod; + } + + public String getFperiod() + { + return fperiod; + } + public void setBillName(String billName) + { + this.billName = billName; + } + + public String getBillName() + { + return billName; + } + public void setIterationValue(String iterationValue) + { + this.iterationValue = iterationValue; + } + + public String getIterationValue() + { + return iterationValue; + } + public void setNextValue(String nextValue) + { + this.nextValue = nextValue; + } + + public String getNextValue() + { + return nextValue; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("fperiod", getFperiod()) + .append("billName", getBillName()) + .append("iterationValue", getIterationValue()) + .append("nextValue", getNextValue()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysBillNoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysBillNoMapper.java new file mode 100644 index 000000000..c450dce86 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysBillNoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysBillNo; + +/** + * 单据号迭代信息Mapper接口 + * + * @author dalin + * @date 2020-12-15 + */ +public interface SysBillNoMapper +{ + /** + * 查询单据号迭代信息 + * + * @param fperiod 单据号迭代信息ID + * @return 单据号迭代信息 + */ + public SysBillNo selectSysBillNoById(String fperiod); + + /** + * 查询单据号迭代信息列表 + * + * @param sysBillNo 单据号迭代信息 + * @return 单据号迭代信息集合 + */ + public List selectSysBillNoList(SysBillNo sysBillNo); + + /** + * 新增单据号迭代信息 + * + * @param sysBillNo 单据号迭代信息 + * @return 结果 + */ + public int insertSysBillNo(SysBillNo sysBillNo); + + /** + * 修改单据号迭代信息 + * + * @param sysBillNo 单据号迭代信息 + * @return 结果 + */ + public int updateSysBillNo(SysBillNo sysBillNo); + + /** + * 删除单据号迭代信息 + * + * @param fperiod 单据号迭代信息ID + * @return 结果 + */ + public int deleteSysBillNoById(String fperiod); + + /** + * 批量删除单据号迭代信息 + * + * @param fperiods 需要删除的数据ID + * @return 结果 + */ + public int deleteSysBillNoByIds(String[] fperiods); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysBillNoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysBillNoService.java new file mode 100644 index 000000000..72a9dd716 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysBillNoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysBillNo; + +/** + * 单据号迭代信息Service接口 + * + * @author dalin + * @date 2020-12-15 + */ +public interface ISysBillNoService +{ + /** + * 查询单据号迭代信息 + * + * @param fperiod 单据号迭代信息ID + * @return 单据号迭代信息 + */ + public SysBillNo selectSysBillNoById(String fperiod); + + /** + * 查询单据号迭代信息列表 + * + * @param sysBillNo 单据号迭代信息 + * @return 单据号迭代信息集合 + */ + public List selectSysBillNoList(SysBillNo sysBillNo); + + /** + * 新增单据号迭代信息 + * + * @param sysBillNo 单据号迭代信息 + * @return 结果 + */ + public int insertSysBillNo(SysBillNo sysBillNo); + + /** + * 修改单据号迭代信息 + * + * @param sysBillNo 单据号迭代信息 + * @return 结果 + */ + public int updateSysBillNo(SysBillNo sysBillNo); + + /** + * 批量删除单据号迭代信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysBillNoByIds(String ids); + + /** + * 删除单据号迭代信息信息 + * + * @param fperiod 单据号迭代信息ID + * @return 结果 + */ + public int deleteSysBillNoById(String fperiod); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysBillNoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysBillNoServiceImpl.java new file mode 100644 index 000000000..75ed45810 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysBillNoServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.SysBillNoMapper; +import com.ruoyi.system.domain.SysBillNo; +import com.ruoyi.system.service.ISysBillNoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 单据号迭代信息Service业务层处理 + * + * @author dalin + * @date 2020-12-15 + */ +@Service +public class SysBillNoServiceImpl implements ISysBillNoService +{ + @Autowired + private SysBillNoMapper sysBillNoMapper; + + /** + * 查询单据号迭代信息 + * + * @param fperiod 单据号迭代信息ID + * @return 单据号迭代信息 + */ + @Override + public SysBillNo selectSysBillNoById(String fperiod) + { + return sysBillNoMapper.selectSysBillNoById(fperiod); + } + + /** + * 查询单据号迭代信息列表 + * + * @param sysBillNo 单据号迭代信息 + * @return 单据号迭代信息 + */ + @Override + public List selectSysBillNoList(SysBillNo sysBillNo) + { + return sysBillNoMapper.selectSysBillNoList(sysBillNo); + } + + /** + * 新增单据号迭代信息 + * + * @param sysBillNo 单据号迭代信息 + * @return 结果 + */ + @Override + public int insertSysBillNo(SysBillNo sysBillNo) + { + return sysBillNoMapper.insertSysBillNo(sysBillNo); + } + + /** + * 修改单据号迭代信息 + * + * @param sysBillNo 单据号迭代信息 + * @return 结果 + */ + @Override + public int updateSysBillNo(SysBillNo sysBillNo) + { + return sysBillNoMapper.updateSysBillNo(sysBillNo); + } + + /** + * 删除单据号迭代信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSysBillNoByIds(String ids) + { + return sysBillNoMapper.deleteSysBillNoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除单据号迭代信息信息 + * + * @param fperiod 单据号迭代信息ID + * @return 结果 + */ + @Override + public int deleteSysBillNoById(String fperiod) + { + return sysBillNoMapper.deleteSysBillNoById(fperiod); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index e7228e89a..501418d49 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -13,6 +13,7 @@ + @@ -24,12 +25,12 @@ - select menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, ifnull(perms,'') as perms, icon, create_by, create_time + select menu_id, menu_name, parent_id, order_num, url, target, menu_type, bill_prefix,visible, ifnull(perms,'') as perms, icon, create_by, create_time from sys_menu - SELECT t.menu_id, t.parent_id, t.menu_name, t.order_num, t.url, t.target, t.menu_type, t.visible, t.perms, t.icon, t.remark, + SELECT t.menu_id, t.parent_id, t.menu_name, t.order_num, t.url, t.target, t.menu_type, t.bill_prefix,t.visible, t.perms, t.icon, t.remark, (SELECT menu_name FROM sys_menu WHERE menu_id = t.parent_id) parent_name FROM sys_menu t where t.menu_id = #{menuId} @@ -135,6 +136,7 @@ url = #{url}, target = #{target}, menu_type = #{menuType}, + bill_prefix = #{billPrefix}, visible = #{visible}, perms = #{perms}, icon = #{icon}, @@ -154,6 +156,7 @@ url, target, menu_type, + bill_prefix, visible, perms, icon, @@ -168,6 +171,7 @@ #{url}, #{target}, #{menuType}, + #{billPrefix}, #{visible}, #{perms}, #{icon}, diff --git a/sql/脚本/2020/12/12/生成代码添加字段.sql b/sql/脚本/2020/12/12/生成代码添加字段.sql index cb7ae7adb..6eef86640 100644 --- a/sql/脚本/2020/12/12/生成代码添加字段.sql +++ b/sql/脚本/2020/12/12/生成代码添加字段.sql @@ -1,3 +1,7 @@ -- 生成代码 alter table gen_table add form_cols char(1) default '2' COMMENT '表单列示 1单列 2两列 3三列 4四列' ; alter table gen_table_column add `is_readonly` char(1) DEFAULT 0 COMMENT '是否自读字段（0否 1是）' ; + alter table gen_table add bill_prefix char(6) default '' COMMENT '表单前缀编号' ; + -- 菜单 + alter table sys_menu add bill_prefix char(6) default '' COMMENT '表单前缀编号' ; + diff --git a/sql/脚本/2020/14/单据前缀.sql b/sql/脚本/2020/14/单据迭代计数器sql similarity index 100% rename from sql/脚本/2020/14/单据前缀.sql rename to sql/脚本/2020/14/单据迭代计数器sql