|
@@ -1915,19 +1915,18 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
List<CountUserNumVo> countUserNumVoList = null;
|
|
List<CountUserNumVo> countUserNumVoList = null;
|
|
|
int type = countUserDto.getType();
|
|
int type = countUserDto.getType();
|
|
|
if (type == 1) {
|
|
if (type == 1) {
|
|
|
|
|
+ if (StringUtils.isNotEmpty(startTime1) && startTime1.split(" ")[0].equals(endTime1.split(" ")[0])) {
|
|
|
|
|
|
|
|
- if (StringUtils.isNotEmpty(startTime1) && startTime1.split("")[0].equals(endTime1.split("")[0])) {
|
|
|
|
|
countUserNumVoList = sysPartnerMapper.queryDeptByTimes(userId,countUserDto);
|
|
countUserNumVoList = sysPartnerMapper.queryDeptByTimes(userId,countUserDto);
|
|
|
}else {
|
|
}else {
|
|
|
countUserNumVoList = sysPartnerMapper.queryDeptByTime(userId,countUserDto);
|
|
countUserNumVoList = sysPartnerMapper.queryDeptByTime(userId,countUserDto);
|
|
|
}
|
|
}
|
|
|
}else {
|
|
}else {
|
|
|
List<String> deptIds = sysUsers.stream().map(SysUser::getDeptId).collect(Collectors.toList());
|
|
List<String> deptIds = sysUsers.stream().map(SysUser::getDeptId).collect(Collectors.toList());
|
|
|
- if (StringUtils.isNotEmpty(startTime1) && startTime1.split("")[0].equals(endTime1.split("")[0])){
|
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(startTime1) && startTime1.split(" ")[0].equals(endTime1.split(" ")[0])){
|
|
|
|
|
|
|
|
countUserNumVoList = sysPartnerMapper.queryUserByTimes(deptIds,countUserDto);
|
|
countUserNumVoList = sysPartnerMapper.queryUserByTimes(deptIds,countUserDto);
|
|
|
}else {
|
|
}else {
|
|
|
-
|
|
|
|
|
countUserNumVoList = sysPartnerMapper.queryUserByTime(deptIds,countUserDto);
|
|
countUserNumVoList = sysPartnerMapper.queryUserByTime(deptIds,countUserDto);
|
|
|
}
|
|
}
|
|
|
|
|
|