From 78f4e4a7061e65d221373d31d5c784a6f7241ccd Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 20 Apr 2022 18:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E8=A1=A8,=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98,=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=A1=E5=88=92=E6=9B=B4=E6=96=B0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?+=E6=9B=B4=E6=96=B0=E4=BA=BA,=E6=97=B6=E9=97=B4,=E9=83=A8?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectLibraryBase.java | 8 +++---- .../entity/ProjectRelatedPersonnel.java | 5 ++++ .../project/entity/ProjectTaskPlanning.java | 23 +++++++++++++++++++ .../mapper/xml/ProjectLibraryBaseMapper.xml | 4 ++-- .../xml/ProjectRelatedPersonnelMapper.xml | 4 +++- .../impl/ProjectTaskPlanningServiceImpl.java | 15 ++++++++++-- 6 files changed, 50 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 27f61bfe9..6bc0aea30 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -71,8 +72,6 @@ public class ProjectLibraryBase implements Serializable { /**创建人*/ private java.lang.String createBy; - @TableField(exist = false) - private java.lang.String createUserName; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -81,9 +80,10 @@ public class ProjectLibraryBase implements Serializable { /**更新人*/ private java.lang.String updateBy; - @TableField(exist = false) - private java.lang.String updateUserName; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; /**更新日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index 7751ac096..b1f046602 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -78,6 +79,10 @@ public class ProjectRelatedPersonnel implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**中英切换标志*/ @TableField(exist = false) private String cut; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java index 927c807aa..3bcf71247 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java @@ -1,10 +1,12 @@ package com.jero.modules.project.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.modules.project.vo.TimeNodeVO; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -70,7 +72,28 @@ public class ProjectTaskPlanning implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") private Date verifyDeadline; + /**创建人*/ + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; + + /**更新人*/ + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**时间List对象*/ + @TableField(exist = false) List timeNodeVOS; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index e8406aa03..a96ebddaf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -18,10 +18,9 @@ - + - select plb.id, @@ -38,6 +37,7 @@ plb.attestation_plan, plb.create_by, plb.create_time, + plb.sys_org_code, plb.update_by, plb.update_time from project_library_base as plb diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml index 2b4549ca0..5289c00c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml @@ -7,6 +7,7 @@ + @@ -25,7 +26,8 @@ prp.create_by, prp.create_time, prp.update_by, - prp.update_time + prp.update_time, + prp.sys_org_code