Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改模板

Browse Source
This commit is contained in:
huangdeliang 2020-09-23 20:07:36 +08:00
parent da4155f00d
commit 3deb40bac9
12 changed files with 87 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -190,6 +190,7 @@
<module>ruoyi-quartz</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>ruoyi-custom</module>
</modules>
<packaging>pom</packaging>

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOrderController.java
View File

@ -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")

15
ruoyi-custom/pom.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-custom</artifactId>
</project>

3
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java
View File

@ -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<OSFileStore> fsArray = fileSystem.getFileStores();
List<OSFileStore> fsArray = Arrays.asList(fileSystem.getFileStores());
for (OSFileStore fs : fsArray)
{
long free = fs.getUsableSpace();

2
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View File

@ -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;

12
ruoyi-generator/src/main/resources/vm/sql/sql.vm
View File

@ -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', '');
values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', '${author}', '${datetime}', '${author}', '${datetime}', '');

9
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java
View File

@ -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)

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.system.domain.SysOrder;
* 销售订单Mapper接口
*
* @author wonder
* @date 2020-09-22
* @date 2020-09-23
*/
public interface SysOrderMapper
{

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.system.domain.SysOrder;
* 销售订单Service接口
*
* @author wonder
* @date 2020-09-22
* @date 2020-09-23
*/
public interface ISysOrderService
{

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java
View File

@ -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

82
ruoyi-ui/src/views/system/order/index.vue
View File

@ -1,32 +1,15 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户ID" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户昵称" prop="nickName">
<el-input
v-model="queryParams.nickName"
placeholder="请输入用户昵称"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="金额" prop="amount">
<el-input
v-model="queryParams.amount"
placeholder="请输入金额"
clearable
size="small"
@keyup.enter.native="handleQuery"
<el-form-item label="业务员" prop="userId">
<el-select v-model="queryParams.userId" placeholder="请选择业务员" clearable size="small">
<el-option
v-for="dict in userIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="成交日期" prop="saleTime">
<el-date-picker clearable size="small" style="width: 200px"
@ -36,8 +19,8 @@
placeholder="选择成交日期">
</el-date-picker>
</el-form-item>
<el-form-item label="销售渠道ID" prop="channelId">
<el-select v-model="queryParams.channelId" placeholder="请选择销售渠道ID" clearable size="small">
<el-form-item label="销售渠道" prop="channelId">
<el-select v-model="queryParams.channelId" placeholder="请选择销售渠道" clearable size="small">
<el-option
v-for="dict in channelIdOptions"
:key="dict.dictValue"
@ -97,7 +80,6 @@
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="orderId" />
<el-table-column label="用户ID" align="center" prop="userId" />
<el-table-column label="用户昵称" align="center" prop="nickName" />
<el-table-column label="金额" align="center" prop="amount" />
<el-table-column label="成交日期" align="center" prop="saleTime" width="180">
@ -105,7 +87,7 @@
<span>{{ parseTime(scope.row.saleTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="销售渠道ID" align="center" prop="channelId" :formatter="channelIdFormat" />
<el-table-column label="销售渠道" align="center" prop="channelId" :formatter="channelIdFormat" />
<el-table-column label="创建者" align="center" prop="createBy" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -139,8 +121,15 @@
<!-- 添加或修改销售订单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户ID" />
<el-form-item label="业务员" prop="userId">
<el-select v-model="form.userId" placeholder="请选择业务员">
<el-option
v-for="dict in userIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" />
@ -156,8 +145,8 @@
placeholder="选择成交日期">
</el-date-picker>
</el-form-item>
<el-form-item label="销售渠道ID" prop="channelId">
<el-select v-model="form.channelId" placeholder="请选择销售渠道ID">
<el-form-item label="销售渠道" prop="channelId">
<el-select v-model="form.channelId" placeholder="请选择销售渠道">
<el-option
v-for="dict in channelIdOptions"
:key="dict.dictValue"
@ -203,15 +192,15 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 销售渠道ID字典
// 业务员字典
userIdOptions: [],
// 销售渠道字典
channelIdOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
userId: null,
nickName: null,
amount: null,
saleTime: null,
channelId: null,
},
@ -219,17 +208,26 @@ export default {
form: {},
// 表单校验
rules: {
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
userId: [
{ required: true, message: "业务员不能为空", trigger: "change" }
],
amount: [
{ required: true, message: "金额不能为空", trigger: "blur" }
],
saleTime: [
{ required: true, message: "成交日期不能为空", trigger: "blur" }
],
channelId: [
{ required: true, message: "销售渠道ID不能为空", trigger: "change" }
{ required: true, message: "销售渠道不能为空", trigger: "change" }
],
}
};
},
created() {
this.getList();
this.getDicts("sys_saller").then(response => {
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);
},

8
sql/ry_20200920.sql
View File

@ -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 '创建者',