bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug

This commit is contained in:
mashuai 2024-05-06 18:20:45 +08:00
parent c0394d1f59
commit 75d2b02422
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java
View File

@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* @author c liu * @author c liu
* @date 2023/12/11 * @date 2023/12/11
@ -134,4 +136,9 @@ public class RepairTask {
@ApiModelProperty(value = "维修时间") @ApiModelProperty(value = "维修时间")
@Excel(name = "维修时间",sort = 16) @Excel(name = "维修时间",sort = 16)
private String updateTime; private String updateTime;
/** 导出选中列表 */
@ApiModelProperty(value = "导出选中列表")
private List<Long> dataCondition;
} }

6
sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
View File

@ -178,6 +178,12 @@
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
</if> </if>
<if test="dataCondition != null and dataCondition.size()>0">
AND rd.task_id in
<foreach collection="dataCondition" item="taskId" index="index" open="(" separator="," close=")">
#{taskId}
</foreach>
</if>
ORDER BY ORDER BY
tt.create_time DESC tt.create_time DESC
</select> </select>