Browse Source

LY 修改离职日期

ly 3 years ago
parent
commit
be5d6448d1

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

@@ -216,7 +216,7 @@ public class TMeasureRecordController extends BaseController {
                     }else if (j == 2) {//单位内编号
                     }else if (j == 2) {//单位内编号
                         entity.setTagno(cellValue);
                         entity.setTagno(cellValue);
                     }else if (j == 3) {//侧厚部位
                     }else if (j == 3) {//侧厚部位
-                        entity.setTagno(cellValue);
+                        entity.setPosition(cellValue);
                     } else if (j == 4) {//检测编号
                     } else if (j == 4) {//检测编号
                         entity.setMeasureNo(cellValue);
                         entity.setMeasureNo(cellValue);
                     } else if (j == 5) {//数值
                     } else if (j == 5) {//数值

+ 2 - 2
master/src/main/resources/mybatis/sems/TMeasureThicknessMapper.xml

@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id from t_measure_thickness
         select id from t_measure_thickness
             <where>
             <where>
                 del_flag = 0
                 del_flag = 0
-                <if test="tagNo != null  and tagNo != ''"> and tagno = #{tagNo}</if>
+                <if test="tagno != null  and tagno != ''"> and tagno = #{tagno}</if>
                 <if test="position != null  and position != ''"> and position = #{position}</if>
                 <if test="position != null  and position != ''"> and position = #{position}</if>
             </where>
             </where>
 
 
@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unitCode != null  and unitCode != ''"> and unit_code = #{unitCode}</if>
             <if test="unitCode != null  and unitCode != ''"> and unit_code = #{unitCode}</if>
-            <if test="tagNo != null  and tagNo != ''"> and tagno = #{tagNo}</if>
+            <if test="tagno != null  and tagno != ''"> and tagno = #{tagno}</if>
             <if test="position != null  and position != ''"> and position = #{position}</if>
             <if test="position != null  and position != ''"> and position = #{position}</if>
             <if test="measureNo != null  and measureNo != ''"> and measure_no = #{measureNo}</if>
             <if test="measureNo != null  and measureNo != ''"> and measure_no = #{measureNo}</if>
         </where>
         </where>