From cf08f9cb84e07601519e56c5554ca4cca6aa4372 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 24 七月 2024 08:59:11 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 8 +++++++-
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 9 +++++----
ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml | 9 +++++----
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 6 ++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 17 ++++++++++-------
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java | 3 ++-
6 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 61ebf1e..e31b4b4 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -46,6 +46,12 @@
@TableField("user_name")
private String userName;
+ /** 用户账号 */
+ @Excel(name = "供应商联系人")
+ @TableField("contacts")
+ private String contacts;
+
+
/** 用户昵称 */
@Excel(name = "用户名称")
@NotBlank(message = "姓名不能为空")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
index 4cba5a5..b80814c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
@@ -64,7 +64,7 @@
PageInfo<SysDept> pageInfo = new PageInfo<>(dept.getPageCurr(), dept.getPageSize());
PageInfo<SysDept> page = deptService.page(pageInfo,
- new LambdaQueryWrapper<SysDept>()
+ new LambdaQueryWrapper<SysDept>().orderByDesc(SysDept::getCreateTime)
.like(StringUtils.isNotBlank(dept.getDeptName()), SysDept::getDeptName,
dept.getDeptName()).eq(SysDept::getDelFlag, "0"));
return AjaxResult.success(page);
@@ -120,6 +120,7 @@
@RequiresPermissions("system:dept:remove")
@Log(title = "部门管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
+ @ApiOperation("删除部门管理")
public AjaxResult remove(@PathVariable Long deptId)
{
if (deptService.checkDeptExistUser(deptId))
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 915c22b..e21c333 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -275,7 +275,13 @@
@PostMapping("/getUserSupplierList")
public R<List<SysUser>> getUserSupplierList(@RequestBody getVolumeProductionRkQuery getVolumeProductionRkQuery) {
- List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().like(SysUser::getNickName, getVolumeProductionRkQuery.getSupplierName()).like(SysUser::getPhonenumber,getVolumeProductionRkQuery.getSupplierPhone()));
+ LambdaQueryWrapper<SysUser> like1 = new LambdaQueryWrapper<SysUser>();
+ if (getVolumeProductionRkQuery.getSupplierName()!=null){
+ like1.like(SysUser::getNickName, getVolumeProductionRkQuery.getSupplierName());
+ }if (getVolumeProductionRkQuery.getSupplierPhone()!=null){
+ like1.like(SysUser::getPhonenumber,getVolumeProductionRkQuery.getSupplierPhone());
+ }
+ List<SysUser> list = userService.list(like1);
return R.ok(list);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 872b010..a2dda56 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -586,7 +586,7 @@
@Override
public PageDTO<SupplierVO> getSupplierPage(SupplierQuery query) {
Page<SysUser> page = this.lambdaQuery()
- .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
+ .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber, SysUser::getContacts)
.like(StringUtils.isNotBlank(query.getNickName()
), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "02")
.eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
@@ -594,7 +594,7 @@
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
}
- return PageDTO.of(page, SupplierVO.class);
+ return PageDTO.of(page,SupplierVO.class);
}
/**
@@ -606,14 +606,17 @@
public void saveSupplier(SupplierDTO dto) {
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
- boolean b = checkPhoneUnique(user);
- if (!b) {
- throw new ServiceException("该手机号已存在");
- }
+
+
// 添加
if (StringUtils.isNull(dto.getUserId())) {
+ boolean b = checkPhoneUnique(user);
+ if (!b) {
+ throw new ServiceException("该手机号已存在");
+ }
user.setUserName(dto.getPhonenumber());
user.setUserType("02");
+ user.setContacts(dto.getContacts());
user.setCreateTime(new Date());
user.setCreateBy(SecurityUtils.getUsername());
this.save(user);
@@ -625,7 +628,7 @@
}
user.setNickName(dto.getNickName());
user.setPhonenumber(dto.getPhonenumber());
- user.setUserName(dto.getPhonenumber());
+ user.setContacts(dto.getContacts());
user.setUpdateTime(new Date());
user.setUpdateBy(SecurityUtils.getUsername());
this.updateById(user);
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index c704abd..9844837 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -22,6 +22,7 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="contacts" column="contacts" />
<result property="remark" column="remark" />
<result property="roleType" column="roleType" />
<result property="objectId" column="objectId" />
@@ -51,7 +52,7 @@
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
- d.dept_id, d.dept_name,u.province_name,u.province_code,u.city_name,u.city_code,u.county_name,u.county_code,u.town_name,u.town_code,
+ d.dept_id, d.dept_name,u.contacts,u.province_name,u.province_code,u.city_name,u.city_code,u.county_name,u.county_code,u.town_name,u.town_code,
r.role_id,
r.role_name,
r.role_key,
@@ -68,7 +69,7 @@
</sql>
<select id="selectUserList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+ select u.user_id, u.dept_id,u.contacts, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0'
<if test="phonenumber != null and phonenumber != ''">
@@ -77,7 +78,7 @@
</select>
<select id="selectAllocatedList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id,u.contacts, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -94,7 +95,7 @@
</select>
<select id="selectUnallocatedList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id,u.contacts, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
diff --git a/ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
index c704abd..9844837 100644
--- a/ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
@@ -22,6 +22,7 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="contacts" column="contacts" />
<result property="remark" column="remark" />
<result property="roleType" column="roleType" />
<result property="objectId" column="objectId" />
@@ -51,7 +52,7 @@
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
- d.dept_id, d.dept_name,u.province_name,u.province_code,u.city_name,u.city_code,u.county_name,u.county_code,u.town_name,u.town_code,
+ d.dept_id, d.dept_name,u.contacts,u.province_name,u.province_code,u.city_name,u.city_code,u.county_name,u.county_code,u.town_name,u.town_code,
r.role_id,
r.role_name,
r.role_key,
@@ -68,7 +69,7 @@
</sql>
<select id="selectUserList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+ select u.user_id, u.dept_id,u.contacts, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0'
<if test="phonenumber != null and phonenumber != ''">
@@ -77,7 +78,7 @@
</select>
<select id="selectAllocatedList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id,u.contacts, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -94,7 +95,7 @@
</select>
<select id="selectUnallocatedList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id,u.contacts, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
--
Gitblit v1.7.1