bug修复

linwe

2023-12-25 5f96e94e5df2c64228dded65a4116f26a06f242c

bug修复

 src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java

@@ -86,7 +86,7 @@
     * 确认用户ID
     */
    @ApiModelProperty(value = "确认用户ID")
    private Integer confirmUserId;
    private Long confirmUserId;
    /**
     * 确认用户ID
     */

 src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java

@@ -114,7 +114,7 @@
    /** 确认用户ID */
    @ApiModelProperty(value = "确认用户ID", example = "")
    @TableField("confirm_user_id")
    private Integer confirmUserId;
    private Long confirmUserId;

    /** 确认用户ID */
    @ApiModelProperty(value = "确认用户ID", example = "")

 src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java

@@ -158,7 +158,7 @@
     * 确认用户ID
     */
    @ApiModelProperty(value = "确认用户ID")
    private Integer confirmUserId;
    private Long confirmUserId;
    /**
     * 确认用户ID
     */

 src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java

@@ -98,7 +98,7 @@
     * 确认人ID
     */
    @ApiModelProperty(value = "确认人ID")
    private Integer confirmUserId;
    private Long confirmUserId;
    /**
     * 确认时间
     */

 src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml

@@ -36,7 +36,43 @@


    <select id="selectTaskHotelReportingPage" resultMap="taskHotelReportingResultMap">
        select * from jczz_task_hotel_reporting where is_deleted = 0
        select  id,
        task_id,
        hotel_name,
        place_id,
        district_id,
        district_name,
        check_time,
        check_user_id,
        check_user_name,
        check_telephone,
        location,
        fire_nums,
        fire_status,
        fire_image_urls,
        sc_status,
        sc_image_urls,
        pf_flag,
        pf_name,
        pf_image_urls,
        five_must,
        uan_image_urls,
        real_name,
        confirm_time,
        confirm_user_id,
        confirm_user_name,
        sc_flag,
        confirm_notion,
        confirm_flag,
        tenant_id,
        is_deleted,
        create_time,
        update_time,
        create_user,
        create_dept,
        update_user,
        status
        from jczz_task_hotel_reporting where is_deleted = 0
        <if test="taskHotelReporting.checkUserId != null and taskHotelReporting.checkUserId != ''">
            AND check_user_id = #{taskHotelReporting.checkUserId}
        </if>

 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml

@@ -48,6 +48,9 @@
        WHERE
        jgm.user_id = #{task.userId}
        and jt.report_type in(2,3,4,5,6)
        <if test="task.communityCode != null and task.communityCode != ''">
            and jg.community_code = #{task.communityCode}
        </if>
        <if test="task.status != null and task.status != null">
            and jt.status = #{task.status}
        </if>

 src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java

@@ -30,6 +30,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * 取保候审任务 服务实现类
@@ -64,6 +65,8 @@
        Integer integer = StringUtils.isBlank(taskBailReportingEvent.getConfirmFlag()) ? null : Integer.valueOf(taskBailReportingEvent.getConfirmFlag());
        Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskBailReportingEvent.getTaskId(), integer);
        if (aLong > 0) {
            taskBailReportingEvent.setConfirmUserId(AuthUtil.getUserId());
            taskBailReportingEvent.setConfirmTime(new Date());
            return baseMapper.updateById(taskBailReportingEvent) > 0 ? true : false;
        }
        return false;

 src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java

@@ -32,6 +32,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;

import javax.annotation.Resource;
import java.util.Date;

/**
 * 校园安全检查任务表 服务实现类
@@ -67,6 +68,8 @@
        Integer integer = StringUtils.isBlank(taskCampusReportingEvent.getConfirmFlag()) ? null : Integer.valueOf(taskCampusReportingEvent.getConfirmFlag());
        Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskCampusReportingEvent.getTaskId(), integer);
        if (aLong > 0) {
            taskCampusReportingEvent.setConfirmUserId(AuthUtil.getUserId());
            taskCampusReportingEvent.setConfirmTime(new Date());
            return baseMapper.updateById(taskCampusReportingEvent) > 0 ? true : false;
        }
        return false;

 src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java

@@ -29,6 +29,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * 旅馆安全自查任务 服务实现类
@@ -64,6 +65,9 @@
    public Boolean updateHotelReporting(TaskHotelReportingEntity taskHotelReporting) {
        Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskHotelReporting.getTaskId(), taskHotelReporting.getStatus());
        if (aLong > 0) {
            taskHotelReporting.setConfirmFlag(taskHotelReporting.getStatus().toString());
            taskHotelReporting.setConfirmUserId(AuthUtil.getUserId());
            taskHotelReporting.setConfirmTime(new Date());
            return baseMapper.updateById(taskHotelReporting) > 0 ? true : false;
        }
        return false;

 src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java

@@ -29,6 +29,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * 打金店报事 服务实现类
@@ -79,6 +80,9 @@
        Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(),
            taskLabelReportingEvent.getTaskId(), taskLabelReportingEvent.getStatus());
        if (aLong > 0) {
            taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
            taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
            taskLabelReportingEvent.setConfirmTime(new Date());
            return baseMapper.updateById(taskLabelReportingEvent) > 0 ? true : false;
        }
        return false;

 src/main/java/org/springblade/modules/task/vo/TaskVO.java

@@ -39,4 +39,10 @@
    @ApiModelProperty(value = "地址")
    private String addressName;

    /**
     * 社区编码
     */
    @ApiModelProperty(value = "社区编码")
    private String communityCode;

}