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-18 09:40:20 +08:00
commit 03e7fdad43
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/dto/statistics/NeedWriteHistoryDTO.java
View File

@ -19,8 +19,8 @@ public class NeedWriteHistoryDTO {
private Integer type; private Integer type;
@Schema(description = "开始时间 格式yyyy-MM-dd") @Schema(description = "开始时间 格式yyyy-MM-dd")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
private Date beginTime; private Date beginTime;
@Schema(description = "结束时间 格式yyyy-MM-dd") @Schema(description = "结束时间 格式yyyy-MM-dd")

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java
View File

@ -39,6 +39,6 @@ public class LogInstancePageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
@Schema(description = "未读", example = "0") @Schema(description = "已读、未读 | 0：未读、1：已读", example = "0")
private Integer unRead; private Integer readStatus;
} }

4
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
View File

@ -115,8 +115,8 @@
and a.create_time <= #{reqVO.createTime[1]} and a.create_time <= #{reqVO.createTime[1]}
</if> </if>
</if> </if>
<if test="reqVO.unRead != null"> <if test="reqVO.readStatus != null">
and e.read_status = 0 and e.read_status = #{reqVO.readStatus}
</if> </if>
<if test="pagingType == 0"> <if test="pagingType == 0">
and a.start_user_id != #{userId} and a.start_user_id != #{userId}