Browse Source

任务管理,配置默认参数属性, 任务看板关联IP

2022年11月24日  sxm
master
[li_she] 3 years ago
parent
commit
e280aa45e5
  1. 3
      src/main/java/com/heai/modules/taskmanage/dto/TaskDto.java
  2. 4
      src/main/java/com/heai/modules/taskmanage/entity/TaskDetailEntity.java
  3. 3
      src/main/java/com/heai/modules/taskmanage/entity/TaskListEntity.java
  4. 1
      src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java
  5. 4
      src/main/resources/mapper/taskmanage/TaskDatailDao.xml

3
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;

4
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;

3
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;

1
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;
}

4
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
<where>
td.site = #{site}
<if test="ipAddress != null and ipAddress != ''">
and rmi.ipaddress like #{ipAddress}
</if>
<if test="taskInitiator != null and taskInitiator != ''">
and tl.created_by like #{taskInitiator}
</if>

Loading…
Cancel
Save