925116093-qq.com
/
javacodeadmin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

202505241722

This commit is contained in:
张潘 2025-05-24 17:22:32 +08:00
parent a957a3e0d5
commit 0a9592f7a2
11 changed files with 132 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java
View File

@ -2,6 +2,9 @@ package com.ruoyi.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.system.domain.Users;
import com.ruoyi.system.service.IUsersService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -33,7 +36,8 @@ public class UserAddressController extends BaseController
{
@Autowired
private IUserAddressService userAddressService;
@Autowired
private IUsersService usersService;
/**
* 查询用户收货地址列表
*/
@ -43,6 +47,13 @@ public class UserAddressController extends BaseController
{
startPage();
List<UserAddress> list = userAddressService.selectUserAddressList(userAddress);
for(UserAddress userAddress1:list){
Users users = usersService.selectUsersById(userAddress1.getUid());
if(users!=null){
userAddress1.setUname(users.getName());
}
}
return getDataTable(list);
}

11
ruoyi-system/src/main/java/com/ruoyi/system/controller/WorkerSignController.java
View File

@ -2,6 +2,9 @@ package com.ruoyi.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.system.domain.Users;
import com.ruoyi.system.service.IUsersService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -33,6 +36,8 @@ public class WorkerSignController extends BaseController
{
@Autowired
private IWorkerSignService workerSignService;
@Autowired
private IUsersService usersService;
/**
* 查询师傅签到记录列表
@ -43,6 +48,12 @@ public class WorkerSignController extends BaseController
{
startPage();
List<WorkerSign> list = workerSignService.selectWorkerSignList(workerSign);
for (WorkerSign workerSign1:list){
Users users = usersService.selectUsersById(Long.valueOf(workerSign1.getUid()));
if(users!=null){
workerSign1.setUname(users.getName());
}
}
return getDataTable(list);
}

12
ruoyi-system/src/main/java/com/ruoyi/system/domain/UserAddress.java
View File

@ -24,6 +24,9 @@ public class UserAddress extends BaseEntity
@Excel(name = "用户")
private Long uid;
/** 用户 */
@Excel(name = "用户姓名")
private String uname;
/** 收货人 */
@Excel(name = "收货人")
private String name;
@ -63,6 +66,15 @@ public class UserAddress extends BaseEntity
/** $column.columnComment */
private Date deletedAt;
public String getUname() {
return uname;
}
public void setUname(String uname) {
this.uname = uname;
}
public void setId(Long id)
{
this.id = id;

12
ruoyi-system/src/main/java/com/ruoyi/system/domain/WorkerSign.java
View File

@ -24,6 +24,10 @@ public class WorkerSign extends BaseEntity
@Excel(name = "师傅")
private String uid;
/** 师傅 */
@Excel(name = "师傅")
private String uname;
/** 签到日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "签到日期", width = 30, dateFormat = "yyyy-MM-dd")
@ -37,6 +41,14 @@ public class WorkerSign extends BaseEntity
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private Date updatedAt;
public String getUname() {
return uname;
}
public void setUname(String uname) {
this.uname = uname;
}
public void setId(Long id)
{
this.id = id;

1
ruoyi-system/src/main/resources/mapper/system/UsersMapper.xml
View File

@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdAt != null "> and created_at = #{createdAt}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
</where>
order by id desc
</select>
<select id="selectUsersById" parameterType="Long" resultMap="UsersResult">

1
ruoyi-ui/src/api/system/UserAddress.js
View File

@ -25,6 +25,7 @@ export function addUserAddress(data) {
data: data
})
}
// 获取接单记录列表
export function getUserDataList(type) {
return request({

44
ruoyi-ui/src/api/system/UsersWorker.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询用户列表列表
export function listUsersWorker(query) {
return request({
url: '/system/UsersWorker/list',
method: 'get',
params: query
})
}
// 查询用户列表详细
export function getUsersWorker(id) {
return request({
url: '/system/UsersWorker/' + id,
method: 'get'
})
}
// 新增用户列表
export function addUsersWorker(data) {
return request({
url: '/system/UsersWorker',
method: 'post',
data: data
})
}
// 修改用户列表
export function updateUsersWorker(data) {
return request({
url: '/system/UsersWorker',
method: 'put',
data: data
})
}
// 删除用户列表
export function delUsersWorker(id) {
return request({
url: '/system/UsersWorker/' + id,
method: 'delete'
})
}

6
ruoyi-ui/src/api/system/WorkerSign.js
View File

@ -26,6 +26,12 @@ export function addWorkerSign(data) {
})
}
export function getUserDataList(type) {
return request({
url: '/system/transfer/getUsersDataList/'+type,
method: 'get'
})
}
// 修改师傅签到记录
export function updateWorkerSign(data) {
return request({

6
ruoyi-ui/src/views/system/UserAddress/index.vue
View File

@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户" prop="uid">
<el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
<el-form-item label="师傅" prop="uid">
<el-select v-model="queryParams.uid" placeholder="请选择师傅" clearable filterable>
<el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -96,7 +96,7 @@
<el-table v-loading="loading" :data="UserAddressList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="用户" align="center" prop="uid" />
<el-table-column label="用户" align="center" prop="uname" />
<el-table-column label="收货人" align="center" prop="name" />
<el-table-column label="电话" align="center" prop="phone" />
<el-table-column label="具体地址" align="center" prop="info" />

10
ruoyi-ui/src/views/system/Users/index.vue
View File

@ -1,6 +1,9 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="昵称" prop="name">
<el-input
v-model="queryParams.name"
@ -252,7 +255,7 @@
</template>
<script>
import { listUsers, getUsers, delUsers, addUsers, updateUsers } from "@/api/system/users"
import { listUsers, getUsers, delUsers, addUsers, updateUsers,getUserDataList } from "@/api/system/users"
export default {
name: "Users",
@ -271,6 +274,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
userDataList: [],
// 用户列表表格数据
usersList: [],
// 弹出层标题
@ -281,6 +285,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
type: '1',
name: null,
phone: null,
status: null,
@ -303,6 +308,7 @@ export default {
},
created() {
this.getList()
},
methods: {
/** 查询用户列表列表 */
@ -371,6 +377,8 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()

51
ruoyi-ui/src/views/system/WorkerSign/index.vue
View File

@ -1,13 +1,10 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="师傅" prop="uid">
<el-input
v-model="queryParams.uid"
placeholder="请输入师傅"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="用户" prop="uid">
<el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
<el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="签到日期" prop="time">
<el-date-picker clearable
@ -17,22 +14,8 @@
placeholder="请选择签到日期">
</el-date-picker>
</el-form-item>
<el-form-item label="${comment}" prop="createdAt">
<el-date-picker clearable
v-model="queryParams.createdAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item label="${comment}" prop="updatedAt">
<el-date-picker clearable
v-model="queryParams.updatedAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -87,23 +70,19 @@
<el-table v-loading="loading" :data="WorkerSignList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="师傅" align="center" prop="uid" />
<el-table-column label="ID" align="center" width="55" prop="id" />
<el-table-column label="师傅" align="center" prop="uname" />
<el-table-column label="签到日期" align="center" prop="time" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="${comment}" align="center" prop="createdAt" width="180">
<el-table-column label="记录日期" align="center" prop="createdAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="${comment}" align="center" prop="updatedAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -172,7 +151,7 @@
</template>
<script>
import { listWorkerSign, getWorkerSign, delWorkerSign, addWorkerSign, updateWorkerSign } from "@/api/system/WorkerSign"
import { listWorkerSign, getWorkerSign, delWorkerSign, addWorkerSign, updateWorkerSign,getUserDataList } from "@/api/system/WorkerSign"
export default {
name: "WorkerSign",
@ -190,6 +169,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
userDataList: [],
// 师傅签到记录表格数据
WorkerSignList: [],
// 弹出层标题
@ -220,6 +201,7 @@ export default {
},
created() {
this.getList()
this.getuserDataList();
},
methods: {
/** 查询师傅签到记录列表 */
@ -263,6 +245,11 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
getuserDataList(){
getUserDataList("2").then(response => {
this.userDataList = response.data
})
},
/** 新增按钮操作 */
handleAdd() {
this.reset()