-修改定点测厚相关

master/src/main/java/com/ruoyi/project/sems/controller/TMeasureRecordController.java

@@ -260,6 +260,8 @@ public class TMeasureRecordController extends BaseController {
                         entity.setMeasureValue(Double.parseDouble(cellValue));
                     } else if (j == 6) {//时间
                         entity.setMeasureDate(sdf.parse(cellValue));
+                    } else if (j == 7) {//记录人
+                        entity.setRecorder(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId);

master/src/main/java/com/ruoyi/project/sems/domain/TMeasureRecord.java

@@ -1,7 +1,5 @@
 package com.ruoyi.project.sems.domain;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -11,6 +9,8 @@ import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+
 /**
  * 测厚记录对象 t_measure_record
  *
@@ -74,6 +74,17 @@ public class TMeasureRecord extends BaseEntity
     @TableField(exist = false)
     private String measureNo;
 
+    /** 记录人 */
+    @Excel(name = "记录人")
+    private String recorder;
+
+    public String getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(String recorder) {
+        this.recorder = recorder;
+    }
 
     public String getPlantCode() {
         return plantCode;

master/src/main/resources/mybatis/sems/TMeasureRecordMapper.xml

@@ -14,11 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="measureId"    column="measure_id"    />
         <result property="measureValue"    column="measure_value"    />
         <result property="measureDate"    column="measure_date"    />
+        <result property="recorder"    column="recorder"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTMeasureRecordVo">
-        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.measure_id, d.measure_value, d.measure_date  from t_measure_record d
+        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.measure_id, d.measure_value, d.measure_date,d.recorder  from t_measure_record d
     </sql>
 
     <select id="selectTMeasureRecordList" parameterType="TMeasureRecord" resultMap="TMeasureRecordResult">
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="measureId != null">measure_id,</if>
             <if test="measureValue != null">measure_value,</if>
             <if test="measureDate != null">measure_date,</if>
+            <if test="recorder != null">recorder,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -63,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="measureId != null">#{measureId},</if>
             <if test="measureValue != null">#{measureValue},</if>
             <if test="measureDate != null">#{measureDate},</if>
+            <if test="recorder != null">#{recorder},</if>
          </trim>
     </insert>
 
@@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="measureId != null">measure_id = #{measureId},</if>
             <if test="measureValue != null">measure_value = #{measureValue},</if>
             <if test="measureDate != null">measure_date = #{measureDate},</if>
+            <if test="recorder != null">recorder= #{recorder},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/views/sems/thickness/index.vue

@@ -834,6 +834,16 @@
                  <span v-else>{{scope.row.measureDate}}</span>
                </template>
              </el-table-column>
+             <el-table-column
+               prop="recorder"
+               header-align="center"
+               align="center"
+               :label="$t('记录人')">
+               <template slot-scope="scope">
+                 <el-input v-if="scope.row.isEdit" v-model="scope.row.recorder"></el-input>
+                 <span v-else>{{scope.row.recorder}}</span>
+               </template>
+             </el-table-column>
            </el-table>
          </template>
 

ui/src/views/sems/thickness/record.vue

@@ -3,7 +3,7 @@
     :title="$t('测厚记录')"
     :close-on-click-modal="false"
     :visible.sync="visible"
-    width="30%"
+    width="40%"
     @close="closeDialog">
 
     <el-row :gutter="10" class="mb8">
@@ -36,6 +36,12 @@
           <span v-else>{{ parseTime(scope.row.measureDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('记录人')" align="center" prop="recorder" width="120">
+        <template slot-scope="scope">
+          <el-input v-if="scope.row.isEdit" v-model="scope.row.recorder"></el-input>
+          <span v-else>{{scope.row.recorder}}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('操作')" align="center"  width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button  type="text" size="small" v-if="scope.row.isEdit" @click="save(scope.row)">{{ $t('保存') }}</el-button>