WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目库基础表,相关人员,任务计划更新创建+更新人,时间,部门

Browse Source
This commit is contained in:
xiejunyu
2022-04-20 18:01:08 +08:00
parent bf5c3788ef
commit 78f4e4a706
6 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+4 -4
View File
@@ -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")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java
+5
View File
@@ -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;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java
+23
View File
@@ -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<TimeNodeVO> timeNodeVOS;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+2 -2
View File
@@ -18,10 +18,9 @@
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
</resultMap>
<!--不行，改。哪有这么写SQL，嫌性能太好？ TODO-->
<sql id="select_item">
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
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
+3 -1
View File
@@ -7,6 +7,7 @@
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="project_id" property="projectId" />
<result column="duty_territory" property="dutyTerritory" />
<result column="law_engineer" property="lawEngineer" />
@@ -25,7 +26,8 @@
prp.create_by,
prp.create_time,
prp.update_by,
prp.update_time
prp.update_time,
prp.sys_org_code
</sql>
<select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
SELECT
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+13 -2
View File
@@ -1,16 +1,19 @@
package com.jero.modules.project.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ProjectTaskPlanning;
import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
import com.jero.modules.project.mapper.ProjectTaskPlanningMapper;
import com.jero.modules.project.service.IProjectTaskPlanningService;
import com.jero.modules.project.vo.TimeNodeVO;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
/**
@@ -32,7 +35,12 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
*/
@Override
public void add(ProjectTaskPlanning projectTaskPlanning) {
Date now = new Date();
projectTaskPlanning.setCreateTime(now);
projectTaskPlanning.setUpdateTime(now);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
projectTaskPlanning.setCreateBy(sysUser.getUsername());
projectTaskPlanning.setUpdateBy(sysUser.getUsername());
save(projectTaskPlanning);
}
@@ -44,7 +52,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
*/
@Override
public void editById(ProjectTaskPlanning projectTaskPlanning) {
Date now = new Date();
projectTaskPlanning.setUpdateTime(now);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
projectTaskPlanning.setUpdateBy(sysUser.getUsername());
saveOrUpdate(projectTaskPlanning);
}