From 459878db2dc49cdf03411e664d9de92d318f80a2 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Wed, 20 Apr 2022 10:13:29 +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=20=E4=BA=BA?=
 =?UTF-8?q?=E5=90=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/entity/ProjectLibraryBase.java  |  4 ++--
 .../project/entity/ProjectRelatedPersonnel.java     |  4 ++--
 .../project/mapper/xml/ProjectLibraryBaseMapper.xml | 13 ++++---------
 .../mapper/xml/ProjectRelatedPersonnelMapper.xml    |  8 ++++----
 .../service/impl/ProjectLibraryBaseServiceImpl.java |  6 +++---
 .../impl/ProjectRelatedPersonnelServiceImpl.java    |  6 +++---
 6 files changed, 18 insertions(+), 23 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 ff8c3555a..27f61bfe9 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
@@ -70,7 +70,7 @@ public class ProjectLibraryBase implements Serializable {
     private java.lang.String attestationPlan;
 
     /**创建人*/
-    private java.lang.String createUserId;
+    private java.lang.String createBy;
     @TableField(exist = false)
     private java.lang.String createUserName;
 
@@ -80,7 +80,7 @@ public class ProjectLibraryBase implements Serializable {
     private java.util.Date createTime;
 
     /**更新人*/
-    private java.lang.String updateUserId;
+    private java.lang.String updateBy;
     @TableField(exist = false)
     private java.lang.String updateUserName;
 
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 bbfb9df16..7751ac096 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
@@ -63,7 +63,7 @@ public class ProjectRelatedPersonnel implements Serializable {
     private java.lang.String remark;
 
     /**创建人*/
-    private java.lang.String createUserId;
+    private java.lang.String createBy;
 
     /**创建日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -71,7 +71,7 @@ public class ProjectRelatedPersonnel implements Serializable {
     private java.util.Date createTime;
 
     /**更新人*/
-    private java.lang.String updateUserId;
+    private java.lang.String updateBy;
 
     /**更新日期*/
     @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/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index e3a07ba6d..e8406aa03 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
@@ -14,9 +14,9 @@
         <result column="ipd_info" property="ipdInfo" />
         <result column="vehicle_development_plan" property="vehicleDevelopmentPlan" />
         <result column="attestation_plan" property="attestationPlan" />
-        <result column="create_user_id" property="createUserId" />
+        <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
-        <result column="update_user_id" property="updateUserId" />
+        <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
 
     </resultMap>
@@ -36,18 +36,13 @@
             plb.ipd_info,
             plb.vehicle_development_plan,
             plb.attestation_plan,
-            plb.create_user_id,
-            createuser.username as create_user_name,
+            plb.create_by,
             plb.create_time,
-            plb.update_user_id,
-            updateuser.username as update_user_name,
+            plb.update_by,
             plb.update_time
         from project_library_base as plb
         left join project_name_info as pni on  plb.project_name=pni.id
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
-        left join sys_user as createuser on plb.create_user_id=createuser.id
-        left join sys_user as updateuser on plb.update_user_id=updateuser.id
-
     </sql>
 
     <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
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 63c8d1611..2b4549ca0 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
@@ -3,9 +3,9 @@
 <mapper namespace="com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper">
     <resultMap id="ProjectRelatedPersonnelResultMap" type="com.jero.modules.project.entity.ProjectRelatedPersonnel">
         <id column="id" property="id" />
-        <result column="create_user_id" property="createUserId" />
+        <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
-        <result column="update_user_id" property="updateUserId" />
+        <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="project_id" property="projectId" />
         <result column="duty_territory" property="dutyTerritory" />
@@ -22,9 +22,9 @@
             prp.engineering_interface_person,
             prp.certification_engineer,
             prp.remark,
-            prp.create_user_id,
+            prp.create_by,
             prp.create_time,
-            prp.update_user_id,
+            prp.update_by,
             prp.update_time
     </sql>
     <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index f9c406904..ca28d3a3d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -54,8 +54,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		projectLibraryBase.setCreateTime(now);
 		projectLibraryBase.setUpdateTime(now);
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		projectLibraryBase.setCreateUserId(sysUser.getId());
-		projectLibraryBase.setUpdateUserId(sysUser.getId());
+		projectLibraryBase.setCreateBy(sysUser.getUsername());
+		projectLibraryBase.setUpdateBy(sysUser.getUsername());
 		save(projectLibraryBase);
 
 		//查标签内容里的责任领域数据
@@ -80,7 +80,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		Date now = new Date();
 		projectLibraryBase.setUpdateTime(now);
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		projectLibraryBase.setUpdateUserId(sysUser.getId());
+		projectLibraryBase.setUpdateBy(sysUser.getUsername());
 		saveOrUpdate(projectLibraryBase);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index 371526409..1e4494efe 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -50,8 +50,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		projectRelatedPersonnel.setCreateTime(now);
 		projectRelatedPersonnel.setUpdateTime(now);
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		projectRelatedPersonnel.setCreateUserId(sysUser.getId());
-		projectRelatedPersonnel.setUpdateUserId(sysUser.getId());
+		projectRelatedPersonnel.setCreateBy(sysUser.getUsername());
+		projectRelatedPersonnel.setUpdateBy(sysUser.getUsername());
 		save(projectRelatedPersonnel);
 	}
 
@@ -77,7 +77,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		Date now = new Date();
 		projectRelatedPersonnel.setUpdateTime(now);
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		projectRelatedPersonnel.setUpdateUserId(sysUser.getId());
+		projectRelatedPersonnel.setUpdateBy(sysUser.getUsername());
 		saveOrUpdate(projectRelatedPersonnel);
 	}