diff --git a/pom.xml b/pom.xml index ae52711d0..6da773646 100644 --- a/pom.xml +++ b/pom.xml @@ -190,6 +190,7 @@ ruoyi-quartz ruoyi-generator ruoyi-common + ruoyi-custom pom diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOrderController.java index fa3355625..0e19fd8d9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOrderController.java @@ -24,7 +24,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * 销售订单Controller * * @author wonder - * @date 2020-09-22 + * @date 2020-09-23 */ @RestController @RequestMapping("/system/order") @@ -100,4 +100,4 @@ public class SysOrderController extends BaseController { return toAjax(sysOrderService.deleteSysOrderByIds(orderIds)); } -} \ No newline at end of file +} diff --git a/ruoyi-custom/pom.xml b/ruoyi-custom/pom.xml new file mode 100644 index 000000000..c11ec1aad --- /dev/null +++ b/ruoyi-custom/pom.xml @@ -0,0 +1,15 @@ + + + + ruoyi + com.ruoyi + 3.1.0 + + 4.0.0 + + ruoyi-custom + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java index 30a1957eb..0cda2f64b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java @@ -1,6 +1,7 @@ package com.ruoyi.framework.web.domain; import java.net.UnknownHostException; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Properties; @@ -189,7 +190,7 @@ public class Server private void setSysFiles(OperatingSystem os) { FileSystem fileSystem = os.getFileSystem(); - List fsArray = fileSystem.getFileStores(); + List fsArray = Arrays.asList(fileSystem.getFileStores()); for (OSFileStore fs : fsArray) { long free = fs.getUsableSpace(); diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index 0be5fbb6e..04d653e86 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -1,6 +1,8 @@ package com.ruoyi.generator.util; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashSet; import java.util.List; import org.apache.velocity.VelocityContext; diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-generator/src/main/resources/vm/sql/sql.vm index d4196645a..82bec6ac5 100644 --- a/ruoyi-generator/src/main/resources/vm/sql/sql.vm +++ b/ruoyi-generator/src/main/resources/vm/sql/sql.vm @@ -1,22 +1,22 @@ -- 菜单 SQL insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '${functionName}菜单'); +values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', '${author}', '${datetime}', '${author}', '${datetime}', '${functionName}菜单'); -- 按钮父菜单ID SELECT @parentId := LAST_INSERT_ID(); -- 按钮 SQL insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); +values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', '${author}', '${datetime}', '${author}', '${datetime}', ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); +values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', '${author}', '${datetime}', '${author}', '${datetime}', ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); +values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', '${author}', '${datetime}', '${author}', '${datetime}', ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); +values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', '${author}', '${datetime}', '${author}', '${datetime}', ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); \ No newline at end of file +values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', '${author}', '${datetime}', '${author}', '${datetime}', ''); \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java index dad7bab9a..cc3e8be85 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java @@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * 销售订单对象 sys_order * * @author wonder - * @date 2020-09-22 + * @date 2020-09-23 */ public class SysOrder extends BaseEntity { @@ -20,8 +20,7 @@ public class SysOrder extends BaseEntity /** 编号 */ private Long orderId; - /** 用户ID */ - @Excel(name = "用户ID") + /** 业务员 */ private Long userId; /** 用户昵称 */ @@ -37,8 +36,8 @@ public class SysOrder extends BaseEntity @Excel(name = "成交日期", width = 30, dateFormat = "yyyy-MM-dd") private Date saleTime; - /** 销售渠道ID */ - @Excel(name = "销售渠道ID") + /** 销售渠道 */ + @Excel(name = "销售渠道") private Long channelId; public void setOrderId(Long orderId) @@ -112,4 +111,4 @@ public class SysOrder extends BaseEntity .append("remark", getRemark()) .toString(); } -} \ No newline at end of file +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java index bdb1a5b0c..2897c8264 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java @@ -7,7 +7,7 @@ import com.ruoyi.system.domain.SysOrder; * 销售订单Mapper接口 * * @author wonder - * @date 2020-09-22 + * @date 2020-09-23 */ public interface SysOrderMapper { @@ -58,4 +58,4 @@ public interface SysOrderMapper * @return 结果 */ public int deleteSysOrderByIds(Long[] orderIds); -} \ No newline at end of file +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java index 495ed8070..828b45445 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java @@ -7,7 +7,7 @@ import com.ruoyi.system.domain.SysOrder; * 销售订单Service接口 * * @author wonder - * @date 2020-09-22 + * @date 2020-09-23 */ public interface ISysOrderService { @@ -58,4 +58,4 @@ public interface ISysOrderService * @return 结果 */ public int deleteSysOrderById(Long orderId); -} \ No newline at end of file +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java index f52973a43..71973b7e9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java @@ -12,7 +12,7 @@ import com.ruoyi.system.service.ISysOrderService; * 销售订单Service业务层处理 * * @author wonder - * @date 2020-09-22 + * @date 2020-09-23 */ @Service public class SysOrderServiceImpl implements ISysOrderService @@ -93,4 +93,4 @@ public class SysOrderServiceImpl implements ISysOrderService { return sysOrderMapper.deleteSysOrderById(orderId); } -} \ No newline at end of file +} diff --git a/ruoyi-ui/src/views/system/order/index.vue b/ruoyi-ui/src/views/system/order/index.vue index 9460d9d9f..49c7370ec 100644 --- a/ruoyi-ui/src/views/system/order/index.vue +++ b/ruoyi-ui/src/views/system/order/index.vue @@ -1,32 +1,15 @@ - + @@ -139,8 +121,15 @@ - - + + + + @@ -156,8 +145,8 @@ placeholder="选择成交日期"> - - + + { + this.userIdOptions = response.data; + }); this.getDicts("sys_sale_channel").then(response => { this.channelIdOptions = response.data; }); @@ -244,7 +242,11 @@ export default { this.loading = false; }); }, - // 销售渠道ID字典翻译 + // 业务员字典翻译 + userIdFormat(row, column) { + return this.selectDictLabel(this.userIdOptions, row.userId); + }, + // 销售渠道字典翻译 channelIdFormat(row, column) { return this.selectDictLabel(this.channelIdOptions, row.channelId); }, diff --git a/sql/ry_20200920.sql b/sql/ry_20200920.sql index a220be80e..92a5dbc93 100644 --- a/sql/ry_20200920.sql +++ b/sql/ry_20200920.sql @@ -513,7 +513,9 @@ insert into sys_dict_data values(25, 8, '生成代码', '8', 'sys_oper_ty insert into sys_dict_data values(26, 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '清空操作'); insert into sys_dict_data values(27, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '正常状态'); insert into sys_dict_data values(28, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '停用状态'); -insert into sys_dict_data values(29, 1, '微信', '0', 'sys_sale_channel', '', '', 'Y', '0', 'admin', '2020-09-22 17-33-00', 'ry', '2020-09-22 17-33-00', '销售渠道'); +# insert into sys_dict_data values(29, 1, '微信', '0', 'sys_sale_channel', '', '', 'Y', '0', 'admin', '2020-09-22 17-33-00', 'ry', '2020-09-22 17-33-00', '销售渠道'); +# insert into sys_dict_data values(30, 1, 'ry', '2', 'sys_saller', '', '', 'Y', '0', 'wonder', '2020-09-22 17-33-00', 'wonder', '2020-09-22 17-33-00', '销售人员'); +# insert into sys_dict_data values(31, 2, '张三', '3', 'sys_saller', '', '', 'Y', '0', 'wonder', '2020-09-22 17-33-00', 'wonder', '2020-09-22 17-33-00', '销售人员'); -- ---------------------------- @@ -709,8 +711,8 @@ drop table if exists sys_order; create table sys_order ( order_id bigint(20) not null auto_increment comment '编号', user_id bigint(20) comment '用户ID', - nick_name varchar(30) not null comment '用户昵称', - amount int comment '金额', + nick_name varchar(30) comment '用户昵称', + amount decimal comment '金额', sale_time datetime comment '成交日期', channel_id bigint(20) comment '销售渠道ID', create_by varchar(64) default '' comment '创建者',