ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev-考勤

Browse Source
This commit is contained in:
aikai 2024-04-17 16:49:47 +08:00
commit 4c780ef8e6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java
View File

@ -335,7 +335,10 @@ public class LogStatisticsServiceImpl implements LogStatisticsService {
@Override @Override
public List<LogStatisticsModelVO> getNeedWriteHistory(NeedWriteHistoryDTO dto) { public List<LogStatisticsModelVO> getNeedWriteHistory(NeedWriteHistoryDTO dto) {
List<String> dateList = DateUtils.betweenDayList(dto.getBeginTime(), dto.getEndTime()); List<String> dateList = new ArrayList<>();
if (dto.getBeginTime() != null && dto.getEndTime() != null) {
dateList = DateUtils.betweenDayList(dto.getBeginTime(), dto.getEndTime());
}
dto.setUserId(SecurityFrameworkUtils.getLoginUserId()); dto.setUserId(SecurityFrameworkUtils.getLoginUserId());
// 这里将区间转换为具体的日期 因为mysql BETWEEN 会导致索引失效 // 这里将区间转换为具体的日期 因为mysql BETWEEN 会导致索引失效
return logStatisticsMapper.getNeedWriteHistory(dto, dateList); return logStatisticsMapper.getNeedWriteHistory(dto, dateList);

2
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml
View File

@ -137,7 +137,7 @@
</foreach> </foreach>
</if> </if>
<if test="dto.type != null"> <if test="dto.type != null">
AND b.type = #{dto.type} AND a.type = #{dto.type}
</if> </if>
</where> </where>
</select> </select>