linwei
2024-02-03 b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc
消防检查优化
3 files modified
20 ■■■■ changed files
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml 11 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -514,9 +514,6 @@
                        #{code}
                    </foreach>
                </when>
                <otherwise>
                    and jg.grid_code in ('')
                </otherwise>
            </choose>
        </if>
        order by jp.create_time desc,jp.id desc
src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java
@@ -92,5 +92,11 @@
    @ApiModelProperty(value = "地址编码", example = "")
    private String addressName;
    @ApiModelProperty(value = "开始时间", example = "")
    private String startTime;
    @ApiModelProperty(value = "结束时间", example = "")
    private String endTime;
}
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -196,6 +196,13 @@
            <if test="taskPalce.taskName != null  and taskPalce.taskName != ''">and task_name = #{taskPalce.taskName}
            </if>
            <if test="taskPalce.startTime!=null and taskPalce.startTime!=''">
                and jtpr.create_time&gt;=#{taskPalce.startTime}
            </if>
            <if test="taskPalce.endTime!=null and taskPalce.endTime!=''">
                and jtpr.create_time&lt;=#{taskPalce.endTime}
            </if>
            <if test="taskPalce.placeName!=null and taskPalce.placeName!=''">
                and jp.place_name like concat('%',#{taskPalce.placeName},'%')
            </if>
@@ -323,10 +330,10 @@
            and jp.nine_type = bd.dict_key
            and br.town_code =#{code}
            <if test="taskPlaceRectification.startTime!=null and taskPlaceRectification.startTime!=''">
                and create_time&gt;=#{taskPlaceRectification.startTime}
                and jpc.create_time&gt;=#{taskPlaceRectification.startTime}
            </if>
            <if test="taskPlaceRectification.endTime!=null and taskPlaceRectification.endTime!=''">
                and create_time&lt;=#{taskPlaceRectification.endTime}
                and jpc.create_time&lt;=#{taskPlaceRectification.endTime}
            </if>
        </where>
        ) number