创建人统一处理

digital-management-system/src/main/java/com/zehong/system/domain/track/TProductStoreLog.java

@@ -28,9 +28,7 @@ public class TProductStoreLog extends BaseEntity
     /** $column.columnComment */
     private Long createId;
 
-    private String nickName;
-
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -67,14 +65,6 @@ public class TProductStoreLog extends BaseEntity
         return createId;
     }
 
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

digital-management-system/src/main/java/com/zehong/system/service/impl/project/TProductProjectServiceImpl.java

 package com.zehong.system.service.impl.project;
 
-import java.util.List;
 import com.zehong.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zehong.system.mapper.project.TProductProjectMapper;
+import com.zehong.common.utils.SecurityUtils;
 import com.zehong.system.domain.project.TProductProject;
+import com.zehong.system.mapper.project.TProductProjectMapper;
 import com.zehong.system.service.project.ITProductProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 项目资料Service业务层处理
@@ -54,6 +56,7 @@ public class TProductProjectServiceImpl implements ITProductProjectService
     public int insertTProductProject(TProductProject tProductProject)
     {
         tProductProject.setCreateTime(DateUtils.getNowDate());
+        tProductProject.setCreateId(SecurityUtils.getLoginUser().getUser().getUserId());
         return tProductProjectMapper.insertTProductProject(tProductProject);
     }
 

digital-management-system/src/main/resources/mapper/project/TProductProjectMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProductProjectVo">
-        select id, title, number, cate_id, content, starttime, endtime, file_url, username, tel, status, create_time, create_id from t_product_project
+        select id, title, number, cate_id, content, starttime, endtime, file_url, username, tel, status, create_time, create_id, <include refid="Common.createBy"/> from t_product_project
     </sql>
 
     <select id="selectTProductProjectList" parameterType="TProductProject" resultMap="TProductProjectResult">

digital-management-system/src/main/resources/mapper/track/TCommonMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="Common">
+    
+    <sql id="createBy">
+        (select nick_name from sys_user where user_id = create_id) as createBy
+    </sql>
+</mapper>
\ No newline at end of file

digital-management-system/src/main/resources/mapper/track/TProductDrawingMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProductDrawingVo">
-        select id, title, drawing_no, model, version, cate_id, content, source, file_url, create_time, create_id from t_product_drawing
+        select id, title, drawing_no, model, version, cate_id, content, source, file_url, create_time, create_id,<include refid="Common.createBy"/> from t_product_drawing
     </sql>
 
     <select id="selectTProductDrawingList" parameterType="TProductDrawing" resultMap="TProductDrawingResult">

digital-management-system/src/main/resources/mapper/track/TProductMarkDetailMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProductMarkDetailVo">
-        select id, mark_id, orders, title, content, img_url, create_time, create_id from t_product_mark_detail
+        select id, mark_id, orders, title, content, img_url, create_time, create_id, <include refid="Common.createBy"/> from t_product_mark_detail
     </sql>
 
     <select id="selectTProductMarkDetailList" parameterType="TProductMarkDetail" resultMap="TProductMarkDetailResult">

digital-management-system/src/main/resources/mapper/track/TProductMarkMapper.xml

@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProductMarkVo">
-        select id, title, content, create_time, create_id from t_product_mark
+        select id, title, content, create_time, create_id, <include refid="Common.createBy"/> from t_product_mark
     </sql>
 
     <select id="selectTProductMarkList" parameterType="TProductMark" resultMap="TProductMarkResult">

digital-management-system/src/main/resources/mapper/track/TProductStoreLogMapper.xml

@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProductStoreLogVo">
-        select id, store_id, `number`, create_time, create_id, (select nick_name from sys_user where user_id = create_id)as nickName from t_product_store_log
+        select id, store_id, `number`, create_time, create_id, <include refid="Common.createBy"/> from t_product_store_log
     </sql>
 
     <select id="selectTProductStoreLogList" parameterType="TProductStoreLog" resultMap="TProductStoreLogResult">

digital-management-system/src/main/resources/mapper/track/TProductStoreMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTProductStoreVo">
-        select id, title, plan_no, specs, total, content, supplier, username, tel, address, create_time, create_id from t_product_store
+        select id, title, plan_no, specs, total, content, supplier, username, tel, address, create_time, create_id, <include refid="Common.createBy"/> from t_product_store
     </sql>
 
     <select id="selectTProductStoreList" parameterType="TProductStore" resultMap="TProductStoreResult">

digital-management-web/src/views/project/info/components/DetailInfo.vue

@@ -66,6 +66,20 @@
             <span v-else>-</span>
           </el-form-item>
         </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="创建时间">
+            <span v-if="detailInfo.createTime">{{ detailInfo.createTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="创建人">
+            <span v-if="detailInfo.createBy">{{ detailInfo.createBy }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
   </el-dialog>

digital-management-web/src/views/project/info/index.vue

@@ -105,6 +105,7 @@
       </el-table-column>
       <el-table-column label="项目状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

digital-management-web/src/views/track/draw/components/DetailInfo.vue

@@ -60,6 +60,20 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="创建时间">
+            <span v-if="detailInfo.createTime">{{ detailInfo.createTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="创建人">
+            <span v-if="detailInfo.createBy">{{ detailInfo.createBy }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
       </el-row>
     </el-form>
   </el-dialog>

digital-management-web/src/views/track/draw/index.vue

@@ -105,6 +105,7 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

digital-management-web/src/views/track/mark/detail/components/DetailInfo.vue

@@ -16,6 +16,20 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="创建时间">
+            <span v-if="detailInfo.createTime">{{ detailInfo.createTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="创建人">
+            <span v-if="detailInfo.createBy">{{ detailInfo.createBy }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="24">
           <el-form-item label="装配描述">
             <span v-if="detailInfo.content">{{ detailInfo.content }}</span>

digital-management-web/src/views/track/mark/detail/index.vue

@@ -77,6 +77,7 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

digital-management-web/src/views/track/mark/index.vue

@@ -64,6 +64,7 @@
       <el-table-column label="模板名称" align="center" prop="title" />
       <el-table-column label="模板描述" align="center" prop="content" show-overflow-tooltip/>
       <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

digital-management-web/src/views/track/store/components/DetailInfo.vue

@@ -64,6 +64,20 @@
             <span v-else>-</span>
           </el-form-item>
         </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="创建时间">
+            <span v-if="detailInfo.createTime">{{ detailInfo.createTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="创建人">
+            <span v-if="detailInfo.createBy">{{ detailInfo.createBy }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
   </el-dialog>

digital-management-web/src/views/track/store/components/RecordInfo.vue

 <template>
     <div style="margin-bottom: 20px">
       <el-table v-loading="loading" :data="recordList">
-        <el-table-column label="操作人" align="center" prop="nickName" />
+        <el-table-column label="操作人" align="center" prop="createBy" />
         <el-table-column label="数量" align="center" prop="number" />
         <el-table-column label="操作时间" align="center" prop="createTime" />
       </el-table>

digital-management-web/src/views/track/store/index.vue

@@ -102,13 +102,8 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="详细地址" align="center" prop="address" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span v-if="scope.row.address">{{ scope.row.address }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button