Skip to content

T
tasktime
提交 69a5eeb8 authored 作者: 任建彩's avatar 任建彩
浏览文件
操作

优化

上级 b2cf57e7
隐藏空白字符变更
内嵌 并排
正在显示 包含 66 行增加 和 29 行删除
olive-console/src/main/java/com/zrqx/olive/project/dao/CustomerDao.java
浏览文件 @ 69a5eeb8
......@@ -13,7 +13,7 @@ import com.zrqx.olive.project.request.QueryCustomerRequest;
@Mapper
public interface CustomerDao extends BaseMapper<Customer> {
@Select("<script>"
+ "SELECT * FROM t_customer where 1=1 "
+ "SELECT id,develop_num,px,status,DATE_FORMAT(upload_time,'%Y-%m-%d %H:%i:%s') upload_time FROM t_customer where 1=1 "
// 客户名称
+ "<if test = 'form.customer!=\"\" and form.customer!=null '> "
+ "AND customer like concat('%',#{form.customer},'%') "
......
olive-console/src/main/java/com/zrqx/olive/project/dao/TeamMemberRelationDao.java
浏览文件 @ 69a5eeb8
......@@ -16,7 +16,7 @@ import com.zrqx.olive.project.vo.TeamMemberVo;
@Mapper
public interface TeamMemberRelationDao extends BaseMapper<TeamMemberRelation> {
@Select("<script>"
+ "SELECT t2.id,t2.real_name account,t4.department_name,t1.role_name,DATE_FORMAT(t1.upload_time,'%Y-%m-%d') upload_time "
+ "SELECT t1.id mid,t2.id,t2.real_name,t4.department_name,t1.role_name,DATE_FORMAT(t1.upload_time,'%Y-%m-%d') upload_time,t1.team_id "
+ "from t_team_member_relation t1 "
+ "INNER JOIN eb_system_admin t2 on t1.account_id=t2.id "
+ "INNER JOIN sys_department t4 on t2.department_id=t4.id where 1=1"
......
olive-console/src/main/java/com/zrqx/olive/project/service/impl/CustomerServiceImpl.java
浏览文件 @ 69a5eeb8
package com.zrqx.olive.project.service.impl;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -59,6 +60,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, Customer> imp
customer.setCustomer(form.getCustomer());
customer.setPx(form.getPx());
customer.setStatus(form.getStatus());
customer.setUploadTime(new Date());
mapper.insert(customer);
}else {
Customer customer = mapper.selectById(form.getId());
......
olive-console/src/main/java/com/zrqx/olive/project/service/impl/TeamMemberRelationServiceImpl.java
浏览文件 @ 69a5eeb8
......@@ -60,15 +60,19 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
for (UpdateTeamMemberRequest request : list) {
if(request.getId()==null) {
TeamMemberRelation relation = new TeamMemberRelation();
relation.setAccountId(relation.getAccountId());
relation.setAccountId(request.getAccountId());
relation.setRoleName(request.getRoleName());
relation.setProjectId(request.getProjectId());
relation.setTeamId(request.getTeamId());
relation.setDepartmentId(request.getDepartmentId());
QueryWrapper<Team> qw = new QueryWrapper<Team>();
qw.eq("department_id", request.getDepartmentId());
qw.eq("project_id", request.getProjectId());
Team team = teamDao.selectOne(qw);
relation.setTeamId(team.getId());
relationDao.insert(relation);
}else {
TeamMemberRelation relation = new TeamMemberRelation();
relation.setAccountId(relation.getAccountId());
relation.setAccountId(request.getAccountId());
relation.setRoleName(request.getRoleName());
relation.setProjectId(request.getProjectId());
relation.setTeamId(request.getTeamId());
......
olive-console/src/main/java/com/zrqx/olive/project/vo/TeamMemberListVo.java
浏览文件 @ 69a5eeb8
......@@ -9,6 +9,8 @@ import lombok.Data;
public class TeamMemberListVo {
@ApiModelProperty("成员id，新增时不需要填写")
private String mid;
@ApiModelProperty("用户id，新增时不需要填写")
private Integer id;
@ApiModelProperty(value = "部门名称" )
private String departmentName;
......
olive-console/src/main/java/com/zrqx/olive/system/controller/SystemRoleController.java
浏览文件 @ 69a5eeb8
......@@ -64,8 +64,8 @@ public class SystemRoleController {
*/
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<SystemRole>> getList(@Validated SystemRoleSearchRequest request, @Validated PageParamRequest pageParamRequest){
CommonPage<SystemRole> systemRoleCommonPage = CommonPage.restPage(systemRoleService.getList(request, pageParamRequest));
public CommonResult<CommonPage<SystemRoleRequest>> getList(@Validated SystemRoleSearchRequest request, @Validated PageParamRequest pageParamRequest){
CommonPage<SystemRoleRequest> systemRoleCommonPage = CommonPage.restPage(systemRoleService.getList(request, pageParamRequest));
return CommonResult.success(systemRoleCommonPage);
}
......
olive-console/src/main/java/com/zrqx/olive/system/request/SystemRoleRequest.java
浏览文件 @ 69a5eeb8
package com.zrqx.olive.system.request;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -7,6 +9,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
......@@ -30,6 +34,9 @@ import javax.validation.constraints.NotNull;
public class SystemRoleRequest {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "身份管理id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "身份管理名称", required = true)
@NotNull(message = "身份管理名称不能为空")
private String roleName;
......@@ -45,4 +52,10 @@ public class SystemRoleRequest {
@ApiModelProperty(value = "状态", required = true)
private Boolean status;
@ApiModelProperty(value = "创建时间")
private String createTime;
@ApiModelProperty(value = "修改时间")
private String updateTime;
}
olive-console/src/main/java/com/zrqx/olive/system/request/SystemRoleSearchRequest.java
浏览文件 @ 69a5eeb8
......@@ -37,9 +37,9 @@ public class SystemRoleSearchRequest {
@ApiModelProperty(value = "状态")
private Boolean status;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/*
* @ApiModelProperty(value = "创建时间") private Date createTime;
*
* @ApiModelProperty(value = "修改时间") private Date updateTime;
*/
}
olive-console/src/main/java/com/zrqx/olive/system/service/SystemRoleService.java
浏览文件 @ 69a5eeb8
package com.zrqx.olive.system.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.common.PageParamRequest;
import com.zrqx.olive.category.vo.CategoryTreeVo;
import com.zrqx.olive.system.model.SystemRole;
import com.zrqx.olive.system.request.SystemRoleRequest;
import com.zrqx.olive.system.request.SystemRoleSearchRequest;
import com.zrqx.olive.system.response.SystemAdminResponse;
import com.zrqx.olive.system.vo.SystemButtonVo;
import java.util.List;
/**
* SystemRoleService 接口
* +----------------------------------------------------------------------
......@@ -24,7 +25,7 @@ import java.util.List;
*/
public interface SystemRoleService extends IService<SystemRole> {
List<SystemRole> getList(SystemRoleSearchRequest request, PageParamRequest pageParamRequest);
List<SystemRoleRequest> getList(SystemRoleSearchRequest request, PageParamRequest pageParamRequest);
/**
* 根据id集合获取对应权限列表
......
olive-console/src/main/java/com/zrqx/olive/system/service/impl/SystemAdminServiceImpl.java
浏览文件 @ 69a5eeb8
......@@ -26,6 +26,7 @@ import com.zrqx.olive.system.model.SystemRole;
import com.zrqx.olive.system.request.SystemAdminAddRequest;
import com.zrqx.olive.system.request.SystemAdminLoginRequest;
import com.zrqx.olive.system.request.SystemAdminRequest;
import com.zrqx.olive.system.request.SystemRoleRequest;
import com.zrqx.olive.system.request.SystemRoleSearchRequest;
import com.zrqx.olive.system.response.SystemAdminResponse;
import com.zrqx.olive.system.response.SystemGroupDataAdminLoginBannerResponse;
......@@ -140,7 +141,7 @@ public class SystemAdminServiceImpl extends ServiceImpl<SystemAdminDao, SystemAd
List<SystemAdminResponse> systemAdminResponses = new ArrayList<>();
PageParamRequest pageRole = new PageParamRequest();
pageRole.setLimit(999);
List<SystemRole> roleList = systemRoleService.getList(new SystemRoleSearchRequest(), pageRole);
List<SystemRoleRequest> roleList = systemRoleService.getList(new SystemRoleSearchRequest(), pageRole);
for (SystemAdmin admin : systemAdmins) {
SystemAdminResponse sar = new SystemAdminResponse();
BeanUtils.copyProperties(admin, sar);
......@@ -150,9 +151,9 @@ public class SystemAdminServiceImpl extends ServiceImpl<SystemAdminDao, SystemAd
List<Integer> roleIds = CrmebUtil.stringToArrayInt(admin.getRoles());
List<String> roleNames = new ArrayList<>();
for (Integer roleId : roleIds) {
List<SystemRole> hasRoles = roleList.stream().filter(e -> e.getId().equals(roleId)).collect(Collectors.toList());
List<SystemRoleRequest> hasRoles = roleList.stream().filter(e -> e.getId().equals(roleId)).collect(Collectors.toList());
if(hasRoles.size()> 0){
roleNames.add(hasRoles.stream().map(SystemRole::getRoleName).collect(Collectors.joining(",")));
roleNames.add(hasRoles.stream().map(SystemRoleRequest::getRoleName).collect(Collectors.joining(",")));
}
}
sar.setRoleNames(StringUtils.join(roleNames,","));
......
olive-console/src/main/java/com/zrqx/olive/system/service/impl/SystemRoleServiceImpl.java
浏览文件 @ 69a5eeb8
package com.zrqx.olive.system.service.impl;
import cn.hutool.core.util.ObjectUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
......@@ -9,26 +19,21 @@ import com.constants.Constants;
import com.exception.CrmebException;
import com.github.pagehelper.PageHelper;
import com.utils.CrmebUtil;
import com.utils.DateUtils;
import com.zrqx.olive.category.model.Category;
import com.zrqx.olive.category.service.CategoryService;
import com.zrqx.olive.category.vo.CategoryTreeVo;
import com.zrqx.olive.system.dao.SystemRoleDao;
import com.zrqx.olive.system.model.SystemAdmin;
import com.zrqx.olive.system.model.SystemRole;
import com.zrqx.olive.system.request.SystemRoleRequest;
import com.zrqx.olive.system.request.SystemRoleSearchRequest;
import com.zrqx.olive.system.response.SystemAdminResponse;
import com.zrqx.olive.system.service.SystemAdminService;
import com.zrqx.olive.system.service.SystemRoleService;
import com.zrqx.olive.system.vo.SystemButtonVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import cn.hutool.core.util.ObjectUtil;
/**
* SystemRoleServiceImpl 接口实现
......@@ -64,15 +69,24 @@ public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleDao, SystemRole
* @return List<SystemRole>
*/
@Override
public List<SystemRole> getList(SystemRoleSearchRequest request, PageParamRequest pageParamRequest) {
public List<SystemRoleRequest> getList(SystemRoleSearchRequest request, PageParamRequest pageParamRequest) {
PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
List<SystemRoleRequest> systemAdminResponses = new ArrayList<>();
LambdaQueryWrapper<SystemRole> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(null != request.getStatus())
lambdaQueryWrapper.eq(SystemRole::getStatus, request.getStatus());
if(null != request.getRoleName())
lambdaQueryWrapper.like(SystemRole::getRoleName, request.getRoleName());
lambdaQueryWrapper.orderByAsc(SystemRole::getId);
return dao.selectList(lambdaQueryWrapper);
List<SystemRole> list = dao.selectList(lambdaQueryWrapper);
for (SystemRole admin : list) {
SystemRoleRequest sar = new SystemRoleRequest();
BeanUtils.copyProperties(admin, sar);
sar.setCreateTime(DateUtils.dateTimeToStr(admin.getCreateTime()));
sar.setUpdateTime(DateUtils.dateTimeToStr(admin.getUpdateTime()));
systemAdminResponses.add(sar);
}
return systemAdminResponses;
}
/**
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论