fix:消毒记录导出 feat:消毒记录新增消毒地点筛选项

“mitao”

2026-01-14 ce8e86e7045a6eadc2f06d3cd1af90d22b04fdd0

fix:消毒记录导出
feat:消毒记录新增消毒地点筛选项

 src/main/java/cn/besteam/modules/medical/controller/MwDisinfectRecordController.java

@@ -83,9 +83,9 @@
        writer.setColumnWidth(1, 25);
        writer.setColumnWidth(2, 25);
        writer.setColumnWidth(3, 25);
        writer.setColumnWidth(5, 25);
        writer.setColumnWidth(4, 50);
        writer.setColumnWidth(5, 25);
        writer.setColumnWidth(4, 25);
        writer.setColumnWidth(5, 50);
        writer.setColumnWidth(6, 25);

        // 设置表头别名
        writer.setHeaderAlias(headerMapDisinfectRecord);

 src/main/java/cn/besteam/modules/medical/dto/MwDisinfectRecordSeacherDto.java

@@ -18,6 +18,9 @@
    @ApiModelProperty("消毒方式")
    private Integer disinfectTypeId;

    @ApiModelProperty("消毒地点")
    private String disinfectAddress;

    @ApiModelProperty("开始时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date startTime;

 src/main/java/cn/besteam/modules/medical/mapper/xml/MwDisinfectRecordMapper.xml

@@ -18,6 +18,9 @@
            <if test="dto.disinfectTypeId!=null">
                and dr.disinfect_type_id = #{dto.disinfectTypeId}
            </if>
            <if test="dto.disinfectAddress != null and dto.disinfectAddress != ''">
                and da.name like concat('%', #{dto.disinfectAddress}, '%')
            </if>
            <if test="dto.startTime !=null">
                <![CDATA[
                  and date_format( dr.disinfect_time, '%Y-%m-%d %H:%i:%s' ) >= date_format( #{dto.startTime} , '%Y-%m-%d %H:%i:%s' )
@@ -47,6 +50,9 @@
            <if test="dto.disinfectTypeId!=null">
                and dr.disinfect_type_id = #{dto.disinfectTypeId}
            </if>
            <if test="dto.disinfectAddress != null and dto.disinfectAddress != ''">
                and da.name like concat('%', #{dto.disinfectAddress}, '%')
            </if>
            <if test="dto.startTime !=null">
                <![CDATA[
                  and date_format( dr.disinfect_time, '%Y-%m-%d %H:%i:%s' ) >= date_format( #{dto.startTime} , '%Y-%m-%d %H:%i:%s' )

 src/main/java/cn/besteam/modules/medical/vo/MwDisinfectRecordExportVO.java

@@ -40,4 +40,9 @@
     * 消毒人员
     */
    private String disinfectUserName;

    /**
     * 消毒地点
     */
    private String disinfectAddress;
}