fate
/
fate-modules-firm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改格式

master
sikadi 2023-11-28 13:36:16 +08:00
parent a935361792
commit 538fdd8da9
3 changed files with 66 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java
View File

@ -48,7 +48,7 @@ public class Firm extends BaseEntity {
@TableField("firm_right")
private Integer firmRight;
@Excel(name = "逻辑删")
@Excel(name = "逻辑删除")
@TableField("firm_staus")
private Integer firmStaus;
@ -74,7 +74,7 @@ public class Firm extends BaseEntity {
@Excel(name = "企业类型")
@TableField("firm_type")
private Integer firmType;
private String firmType;
@Excel(name = "负责人")
@TableField("firm_head")

2
fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java
View File

@ -70,7 +70,7 @@ public class FirmRequest {
@Excel(name = "类型")
@TableField("firm_type")
private Integer firmType;
private String firmType;
@Excel(name = "企业负责人")
@TableField("firm_head")

106
fate-firm-server/src/main/java/com/fate/firm/service/impl/FirmServiceImpl.java
View File

@ -56,7 +56,7 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
if(StringUtils.isEmpty(firm.getFirmHead())){
throw new RuntimeException("企业的否则人不能为空");
}
if(0 == firm.getFirmType()){
if(StringUtils.isEmpty(firm.getFirmType())){
throw new RuntimeException("没有添加类型");
}
//存储用户的id
@ -79,71 +79,83 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
**/
@Override
public Result updateFirm(Firm firm) {
// 检查企业公司名是否为空
if(StringUtils.isEmpty(firm.getFirmName())){
throw new RuntimeException("企业的公司名不能为空");
}
// 检查企业地址是否为空
if(StringUtils.isEmpty(firm.getFirmAddress())){
throw new RuntimeException("企业的地址不能为空");
}
// 检查企业电话是否为空
if(StringUtils.isEmpty(firm.getFirmPhone())){
throw new RuntimeException("企业的电话不能为空");
}
// 检查企业否则人是否为空
if(StringUtils.isEmpty(firm.getFirmHead())){
throw new RuntimeException("企业的否则人不能为空");
}
if(0 == firm.getFirmType()){
// 检查企业类型是否为空
if( StringUtils.isEmpty(firm.getFirmType())){
throw new RuntimeException("没有添加类型");
}
// 获取当前用户的用户ID
Long userid = SecurityUtils.getLoginUser().getUserid();
// 设置更新人和更新时间
firm.setUpdateBy(userid.toString());
firm.setUpdateTime(new Date());
// 更新企业信息至数据库
int i = firmMapper.updateById(firm);
// 返回是否更新成功的Result对象
return i > 0 ? Result.success("成功") : Result.error("失败");
}
/**
* 是否管理员查询
* @author: ZhuoXin
* @date: 2023/11/21 13:45
* @param: [firm]
* @return: java.util.List<com.fate.firm.domain.Firm>
**/
@Override
public List<Firm> listSel(Firm firm) {
LambdaQueryWrapper<Firm> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(firm.getFirmAddress())) {
queryWrapper.like(Firm::getFirmAddress, firm.getFirmAddress());
}
if (StringUtils.isNotEmpty(firm.getFirmPhone())) {
queryWrapper.like(Firm::getFirmPhone, firm.getFirmPhone());
}
if (StringUtils.isNotEmpty(firm.getFirmName())) {
queryWrapper.like(Firm::getFirmName, firm.getFirmName());
}
if (StringUtils.isNotEmpty(firm.getFirmHead())) {
queryWrapper.like(Firm::getFirmHead, firm.getFirmHead());
}
// 逻辑删除 不显示状态为2的
queryWrapper.eq(Firm::getFirmTombstone,1);
List<SysRole> roles = SecurityUtils.getLoginUser().getSysUser().getRoles();
int role = 0;
for (SysRole item : roles) {
role = Math.toIntExact(item.getRoleId());
if(1 == role){
break;
}
}
// 获取角色的id
if( 1 != role){
queryWrapper.eq(Firm::getCreateBy,role);
}
List<Firm> list = firmMapper.selectList(queryWrapper);
return list;
/**
* 是否管理员查询
* @author: ZhuoXin
* @date: 2023/11/21 13:45
* @param: [firm]
* @return: java.util.List<com.fate.firm.domain.Firm>
**/
@Override
public List<Firm> listSel(Firm firm) {
LambdaQueryWrapper<Firm> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(firm.getFirmAddress())) {
queryWrapper.like(Firm::getFirmAddress, firm.getFirmAddress());
}
if (StringUtils.isNotEmpty(firm.getFirmPhone())) {
queryWrapper.like(Firm::getFirmPhone, firm.getFirmPhone());
}
if (StringUtils.isNotEmpty(firm.getFirmName())) {
queryWrapper.like(Firm::getFirmName, firm.getFirmName());
}
if (StringUtils.isNotEmpty(firm.getFirmHead())) {
queryWrapper.like(Firm::getFirmHead, firm.getFirmHead());
}
// 逻辑删除 不显示状态为2的
queryWrapper.eq(Firm::getFirmTombstone, 1);
List<SysRole> roles = SecurityUtils.getLoginUser().getSysUser().getRoles();
int role = 0;
for (SysRole item : roles) {
role = Math.toIntExact(item.getRoleId());
if (1 == role) {
break;
}
}
// 获取角色的id
if (1 != role) {
queryWrapper.eq(Firm::getCreateBy, role);
}
List<Firm> list = firmMapper.selectList(queryWrapper);
return list;
}
/**
* 提交与驳回
* @author: ZhuoXin
@ -153,21 +165,29 @@ public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements Fi
**/
@Override
public Result updateStatus(Firm firm) {
// 获取当前登录用户的角色列表
List<SysRole> roles = SecurityUtils.getLoginUser().getSysUser().getRoles();
// 初始化角色为0
int role = 0;
// 遍历角色列表，找到第一个角色为1的项，并将其角色ID赋值给role
for (SysRole item : roles) {
role = Math.toIntExact(item.getRoleId());
if(1 == role){
break;
}
}
// 获取当前登录用户ID
Long userId = SecurityUtils.getUserId();
// 将当前登录用户ID设置为更新人和更新时间
firm.setUpdateBy(userId.toString());
firm.setUpdateTime(new Date());
// 插入新的Firm数据
int insert = firmMapper.insert(firm);
// 返回插入结果，插入成功返回"成功"，插入失败返回"失败"
return insert > 0 ? Result.success("成功") : Result.error("失败");
}
/**
* 删除数据
* @author: ZhuoXin