From e280aa45e5abcfd0d0cf6225a119df3d634af9a1 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 24 Nov 2022 09:47:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86,=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0=E5=B1=9E=E6=80=A7?= =?UTF-8?q?,=20=E4=BB=BB=E5=8A=A1=E7=9C=8B=E6=9D=BF=E5=85=B3=E8=81=94IP=20?= =?UTF-8?q?2022=E5=B9=B411=E6=9C=8824=E6=97=A5=20=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/heai/modules/taskmanage/dto/TaskDto.java | 3 +++ .../com/heai/modules/taskmanage/entity/TaskDetailEntity.java | 4 ++++ .../com/heai/modules/taskmanage/entity/TaskListEntity.java | 3 +++ src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java | 1 + src/main/resources/mapper/taskmanage/TaskDatailDao.xml | 4 ++++ 5 files changed, 15 insertions(+) diff --git a/src/main/java/com/heai/modules/taskmanage/dto/TaskDto.java b/src/main/java/com/heai/modules/taskmanage/dto/TaskDto.java index 4b85b9b..beb7b9a 100644 --- a/src/main/java/com/heai/modules/taskmanage/dto/TaskDto.java +++ b/src/main/java/com/heai/modules/taskmanage/dto/TaskDto.java @@ -1,5 +1,7 @@ package com.heai.modules.taskmanage.dto; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.heai.modules.taskmanage.entity.TaskDetailEntity; import lombok.Data; @@ -40,6 +42,7 @@ public class TaskDto { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date taskStartDate; + @TableField(fill = FieldFill.INSERT) private Date createdDate; private String createdBy; diff --git a/src/main/java/com/heai/modules/taskmanage/entity/TaskDetailEntity.java b/src/main/java/com/heai/modules/taskmanage/entity/TaskDetailEntity.java index 2a38b16..8d40fa3 100644 --- a/src/main/java/com/heai/modules/taskmanage/entity/TaskDetailEntity.java +++ b/src/main/java/com/heai/modules/taskmanage/entity/TaskDetailEntity.java @@ -1,5 +1,7 @@ package com.heai.modules.taskmanage.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -28,10 +30,12 @@ public class TaskDetailEntity implements Serializable { private String status; + @TableField(fill = FieldFill.INSERT) private Date createdDate; private String createdBy; + @TableField(fill = FieldFill.UPDATE) private Date updatedDate; private String updatedBy; diff --git a/src/main/java/com/heai/modules/taskmanage/entity/TaskListEntity.java b/src/main/java/com/heai/modules/taskmanage/entity/TaskListEntity.java index 01883d4..95a5dc8 100644 --- a/src/main/java/com/heai/modules/taskmanage/entity/TaskListEntity.java +++ b/src/main/java/com/heai/modules/taskmanage/entity/TaskListEntity.java @@ -1,5 +1,7 @@ package com.heai.modules.taskmanage.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -48,6 +50,7 @@ public class TaskListEntity implements Serializable { private Date activeDate; + @TableField(fill = FieldFill.INSERT) private Date createdDate; private String createdBy; diff --git a/src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java b/src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java index 91c642b..91fd4a9 100644 --- a/src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java +++ b/src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java @@ -27,6 +27,7 @@ public class TaskListVo { private Date endDate; private Date finishStartDate; private Date finishEndDate; + private String ipAddress; } diff --git a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml index 59035f8..3e75830 100644 --- a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml +++ b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml @@ -37,8 +37,12 @@ left join task_list tl on td.task_id = tl.id AND td.site = tl.site left join users u on td.site = u.site and u.userId = td.responsible_person left join users u2 on td.site = u2.site and u2.userId = tl.task_initiator + LEFT JOIN report_mapping_ipaddress rmi on rmi.department = td.department td.site = #{site} + + and rmi.ipaddress like #{ipAddress} + and tl.created_by like #{taskInitiator}