chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chujinwang:3592c071a52b922e930732040b3e9dc6c38ad4f4
Branches Tags
chujinwang:master
..
compare: chujinwang:5a56ad3c759ed359454421bc8b665c65b990b3c4
Branches Tags
chujinwang:master

2 Commits
3592c071a5 ... 5a56ad3c75

Author SHA1 Message Date
mashuanghui 5a56ad3c75 Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud 2024-08-20 14:22:01 +08:00
mashuanghui 52eebe3d52 查询修改 2024-08-20 14:21:54 +08:00
10 changed files with 89 additions and 26 deletions
Show Stats Expand all files Collapse all files

5
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java
View File

@ -22,18 +22,19 @@ public class ProjectQuery extends CommonParam {
/**
* 项目联系人
*/
@Condition(name = "project_concat", type = Condition.ConditionType.like,tableName = "wrk_info")
private String projectConcat;
/**
* 联系人手机号
*/
@Condition(name = "project_phone", type = Condition.ConditionType.like,tableName = "wrk_info")
private String projectPhone;
/**
* 所属部门
*/
@Condition(name = "dept_id",type = Condition.ConditionType.eq,tableName = "wrk_info")
private Long deptId;
@Condition(name = "user_id", type = Condition.ConditionType.in,tableName = "wrk_info")
private List<Long> userIds ;
/**
* 创建时间
*/

15
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java
View File

@ -16,6 +16,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.function.BiConsumer;
/**
* 终端信息表(st_terminal)表控制层
@ -38,6 +40,10 @@ public class TerminalController {
@GetMapping("/page")
@RequiresPermissions("ins:terminal:page")
public AjaxResult pageList(@Validated TerminalQuery query) {
List<String> createTimes = query.getCreateTimes();
List<String> inspectionTime = query.getInspectionTime();
query.setCreateTimes(extendTimeRange(createTimes, " 00:00:00", " 23:59:59"));
query.setInspectionTime(extendTimeRange(inspectionTime, " 00:00:00", " 23:59:59"));
return AjaxResult.success(terminalService.pageList(query));
}
@ -109,4 +115,13 @@ public class TerminalController {
public AjaxResult delTerminal(@RequestBody @Validated Delete delete){
return AjaxResult.success(terminalService.removeBatchByIds(delete.getIds()));
}
private List<String> extendTimeRange(List<String> timeList, String prefix, String suffix) {
if (timeList != null && timeList.size() >= 2) {
String startTime = timeList.get(0) + prefix;
String endTime = timeList.get(1) + suffix;
timeList.set(0, startTime);
timeList.set(1, endTime);
}
return timeList;
}
}

15
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoTerminalRecordController.java
View File

@ -10,6 +10,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 工单终端信息(wrk_info_terminal_record)表控制层
@ -36,7 +37,19 @@ public class WrkInfoTerminalRecordController {
public AjaxResult minePageList(@Validated TerminalQuery query) {
// 获取当前用户的
query.setUserId(SecurityUtils.getUserId());
List<String> createTimes = query.getCreateTimes();
List<String> inspectionTime = query.getInspectionTime();
query.setCreateTimes(extendTimeRange(createTimes, " 00:00:00", " 23:59:59"));
query.setInspectionTime(extendTimeRange(inspectionTime, " 00:00:00", " 23:59:59"));
return AjaxResult.success(terminalRecordService.minePageList(query));
}
private List<String> extendTimeRange(List<String> timeList, String prefix, String suffix) {
if (timeList != null && timeList.size() >= 2) {
String startTime = timeList.get(0) + prefix;
String endTime = timeList.get(1) + suffix;
timeList.set(0, startTime);
timeList.set(1, endTime);
}
return timeList;
}
}

18
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java
View File

@ -21,6 +21,7 @@ import com.chushang.common.core.exception.utils.AssertUtil;
import com.chushang.common.core.util.DateUtils;
import com.chushang.common.core.util.IPUtils;
import com.chushang.common.core.util.SpringUtils;
import com.chushang.common.core.util.StringUtils;
import com.chushang.common.core.web.Result;
import com.chushang.common.dict.utils.DictUtils;
import com.chushang.common.excel.utils.ExcelUtils;
@ -58,6 +59,7 @@ import com.chushang.oss.entity.dto.UploadBytesDTO;
import com.chushang.oss.entity.vo.FileSourceVo;
import com.chushang.oss.feign.RemoteOssService;
import com.chushang.security.utils.SecurityUtils;
import com.chushang.system.entity.dto.ListUserDTO;
import com.chushang.system.feign.RemoteDeptService;
import com.chushang.task.entity.dto.CreateTaskDTO;
import com.chushang.task.enums.ServiceEnum;
@ -78,6 +80,7 @@ import java.io.IOException;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
@ -796,8 +799,20 @@ public class WrkInfoServiceImpl extends ServiceImpl<WrkInfoMapper, WrkInfo> impl
public PageResult empData(ProjectQuery projectQuery) {
CommonParam commonParam = CommonParam.buildPageRequest();
Page<WrkInfo> page = new Page<>(commonParam.getPage(), commonParam.getLimit());
if (StringUtils.isNotEmpty(projectQuery.getProjectPhone()) || StringUtils.isNotEmpty(projectQuery.getProjectConcat())){
ListUserDTO listUserDTO = new ListUserDTO();
listUserDTO.setPhone(projectQuery.getProjectPhone());
listUserDTO.setNickName(projectQuery.getProjectConcat());
listUserDTO.setNickName(projectQuery.getProjectConcat());
List<SysUser> sysUsers = userFeignService.getSysUsers(listUserDTO).getData();
if (CollectionUtil.isNotEmpty(sysUsers)){
projectQuery.setUserIds(sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList()));
}
}
WrapperUtils.buildSql(projectQuery);
List<EmployeeVO> employeeVOList = baseMapper.empData(projectQuery, page);
Set<Long> deptIds = employeeVOList.stream().map(EmployeeVO::getDeptId).collect(Collectors.toSet());
Set<Long> userIds = employeeVOList.stream().map(EmployeeVO::getUserId).collect(Collectors.toSet());
// 查询全部部门
@ -812,11 +827,10 @@ public class WrkInfoServiceImpl extends ServiceImpl<WrkInfoMapper, WrkInfo> impl
// 查询全部工单
for (EmployeeVO employeeVO:employeeVOList){
employeeVO.setDeptName(deptNameMap.get(employeeVO.getDeptId()));
employeeVO.setProjectConcat(userNameByIds.get(employeeVO.getUserId()) == null ?"admin":userNameByIds.get(employeeVO.getUserId()).getNickName());
employeeVO.setProjectPhone(userNameByIds.get(employeeVO.getUserId())== null ? "17638147107":userNameByIds.get(employeeVO.getUserId()).getPhone());
employeeVO.setDeptName(deptNameMap.get(employeeVO.getDeptId()));
}
return new PageResult(employeeVOList,page.getTotal(),page.getSize(),page.getCurrent());
}

3
chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml
View File

@ -304,9 +304,6 @@
THEN 1 ELSE 0 END) as aduitNum
FROM wrk_info
where del_state = 0
<if test="query.projectConcat != null and query.projectConcat != ''">
AND project_concat = #{query.projectConcat}
</if>
<if test="1 == 1">
${query.sqlParam.get('sqlWhere')}
</if>

2
chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListUserDTO.java
View File

@ -24,6 +24,8 @@ public class ListUserDTO extends CommonParam {
private Integer status;
private String phone;
private String nickName;
private List<LocalDateTime> createTimes;
}

15
chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteUserService.java
View File

@ -2,18 +2,14 @@ package com.chushang.system.feign;
import com.chushang.common.core.constant.SecurityConstants;
import com.chushang.common.core.web.Result;
import com.chushang.security.entity.po.DataScopeEntity;
import com.chushang.security.entity.po.SysUser;
import com.chushang.security.entity.vo.LoginUser;
import com.chushang.system.constants.SystemConstants;
import com.chushang.security.entity.po.SysUser;
import com.chushang.system.entity.dto.ListUserDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -62,4 +58,7 @@ public interface RemoteUserService {
@GetMapping("/querynamebyid")
Map<Long, SysUser> getUserNameByIds(@RequestParam(value = "userIds") Set<Long> userIds,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/user/list")
Result<List<SysUser>> getSysUsers(@RequestBody ListUserDTO listUser) ;
}

22
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java
View File

@ -4,19 +4,23 @@ import cn.hutool.core.collection.CollectionUtil;
import com.chushang.common.core.util.StringUtils;
import com.chushang.common.core.web.AjaxResult;
import com.chushang.common.core.web.Result;
import com.chushang.common.mybatis.utils.PageResult;
import com.chushang.security.entity.po.DataScopeEntity;
import com.chushang.security.annotation.InnerAuth;
import com.chushang.security.entity.po.SysDept;
import com.chushang.security.entity.vo.LoginUser;
import com.chushang.security.entity.po.DataScopeEntity;
import com.chushang.security.entity.po.SysUser;
import com.chushang.security.entity.vo.LoginUser;
import com.chushang.system.entity.dto.ListUserDTO;
import com.chushang.system.feign.RemoteUserService;
import com.chushang.system.service.*;
import com.chushang.system.service.ISysPermissionService;
import com.chushang.system.service.ISysPostService;
import com.chushang.system.service.ISysRoleService;
import com.chushang.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -97,6 +101,12 @@ public class RemoteUserController implements RemoteUserService {
return Map.of();
}
@PostMapping(value = "/user/list")
public Result<List<SysUser>> getSysUsers(ListUserDTO listUser) {
List<SysUser> list = sysUserService.getSysUsers(listUser);
return list == null ? Result.failed("未查询到数据") : Result.ok(list);
}
@GetMapping(value = "/empData")
@InnerAuth

8
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserService.java
View File

@ -5,13 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chushang.common.core.exception.ResultException;
import com.chushang.common.core.web.AjaxResult;
import com.chushang.security.utils.SecurityUtils;
import com.chushang.system.entity.dto.ListUserDTO;
import com.chushang.security.entity.po.SysUser;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.Cacheable;
import com.chushang.system.entity.dto.ListUserDTO;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
@ -98,4 +96,6 @@ public interface ISysUserService extends IService<SysUser> {
Map<String, Long> getIdByUsernames(Collection<String> userNames);
Map<String, Long> getIdByNicknames(Collection<String> nickNames);
List<SysUser> getSysUsers(ListUserDTO listUser);
}

12
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java
View File

@ -263,6 +263,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
.toMap(SysUser::getNickName, SysUser::getUserId, (v1, v2) -> v1));
}
@Override
public List<SysUser> getSysUsers(ListUserDTO listUser) {
List<SysUser> list = list(new LambdaQueryWrapper<SysUser>()
.like(StringUtils.isNotEmpty(listUser.getPhone()),SysUser::getPhone, listUser.getPhone()).
like(StringUtils.isNotEmpty(listUser.getUsername()),SysUser::getUsername, listUser.getUsername()).
like(StringUtils.isNotEmpty(listUser.getNickName()),SysUser::getNickName, listUser.getNickName()));
if (CollUtil.isEmpty(list)) {
return null;
}
return list;
}
private void checkUsernameUnique(String username) {
long count = count(new LambdaQueryWrapper<SysUser>()