linwei
2024-02-23 7e8b0e04d5b1cd492555517e30491ed6008f7b55
取保候审优化
3 files modified
38 ■■■■ changed files
src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java 5 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml 17 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/vo/TaskVO.java 16 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java
@@ -22,10 +22,12 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.apache.commons.beanutils.BeanUtils;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.task.dto.TaskBailReportingEventDTO;
import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
@@ -58,7 +60,8 @@
    @ApiOperation(value = "详情", notes = "传入taskBailReportingEvent")
    public R<TaskBailReportingEventVO> detail(TaskBailReportingEventEntity taskBailReportingEvent) {
        TaskBailReportingEventEntity detail = taskBailReportingEventService.getOne(Condition.getQueryWrapper(taskBailReportingEvent));
        return R.data(TaskBailReportingEventWrapper.build().entityVO(detail));
        TaskBailReportingEventVO copy = BeanUtil.copy(detail, TaskBailReportingEventVO.class);
        return R.data(copy);
    }
    /**
     * 取保候审任务 分页
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -182,13 +182,17 @@
        jt.source,
        jt.is_deleted,
        jt.house_code,
        jt.report_type
        jt.report_type,
        jtbre.start_time startTimes,
        jtbre.reach_time,
        jtbre.return_time
        FROM
        jczz_task jt
        LEFT JOIN jczz_house jh ON jt.house_code=jh.house_code and jh.is_deleted = 0
        LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0
        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
        LEFT JOIN blade_region br on br.code = jg.community_code
        LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id
        <where>
            <if test="task.roleName != null and task.roleName != ''">
                <if test="task.roleName=='wgy'">
@@ -350,11 +354,15 @@
    <select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
        SELECT
        jt.* ,
        jda.address_name
        jda.address_name,
        jtbre.start_time startTimes,
        jtbre.reach_time,
        jtbre.return_time
        FROM
        jczz_task jt
        LEFT JOIN jczz_doorplate_address jda ON jt.house_code = jda.address_code
        LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
        LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id
        <where>
            <if test="task.reportType != null and task.reportType != '' and task.reportType == 1">
                AND jt.report_type = #{task.reportType}
@@ -405,7 +413,10 @@
        jt.source,
        jt.is_deleted,
        jt.house_code,
        jt.report_type
        jt.report_type,
        jtbre.start_time startTimes,
        jtbre.reach_time,
        jtbre.return_time
        FROM
        jczz_task jt
        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
src/main/java/org/springblade/modules/task/vo/TaskVO.java
@@ -16,10 +16,14 @@
 */
package org.springblade.modules.task.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.task.entity.TaskEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
 * 任务表 视图实体类
@@ -70,4 +74,16 @@
    private String frontType;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date startTimes;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date reachTime;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date returnTime;
}