ajax 8 місяців тому
батько
коміт
559d46ac1a

+ 6 - 0
fms-admin/src/main/java/com/fms/system/controller/FailureRecordTController.java

@@ -66,6 +66,12 @@ public class FailureRecordTController extends BaseController {
         FailureRecordT failureRecordT = new FailureRecordT();
         failureRecordT.setBatchName(batchName);
         failureRecordT.setQuantity(failureList.size());
+        Integer maxIndex = failureRecordTService.findMaxIndexRecord();
+        if (maxIndex == null) {
+            failureRecordT.setIndex(1);
+        } else {
+            failureRecordT.setIndex(maxIndex + 1);
+        }
         failureRecordTService.insertFailureRecordT(failureRecordT);
 
         String operName = getUsername();

+ 10 - 0
fms-admin/src/main/java/com/fms/system/domain/FailureRecordT.java

@@ -31,6 +31,16 @@ public class FailureRecordT extends BaseEntity
     @Excel(name = "备注")
     private String remark;
 
+    private Integer index;
+
+    public Integer getIndex() {
+        return index;
+    }
+
+    public void setIndex(Integer index) {
+        this.index = index;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

+ 11 - 8
fms-admin/src/main/java/com/fms/system/mapper/FailureRecordTMapper.java

@@ -5,15 +5,15 @@ import com.fms.system.domain.FailureRecordT;
 
 /**
  * 故障记录总Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2024-09-06
  */
-public interface FailureRecordTMapper 
+public interface FailureRecordTMapper
 {
     /**
      * 查询故障记录总
-     * 
+     *
      * @param id 故障记录总主键
      * @return 故障记录总
      */
@@ -21,7 +21,7 @@ public interface FailureRecordTMapper
 
     /**
      * 查询故障记录总列表
-     * 
+     *
      * @param failureRecordT 故障记录总
      * @return 故障记录总集合
      */
@@ -29,7 +29,7 @@ public interface FailureRecordTMapper
 
     /**
      * 新增故障记录总
-     * 
+     *
      * @param failureRecordT 故障记录总
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface FailureRecordTMapper
 
     /**
      * 修改故障记录总
-     * 
+     *
      * @param failureRecordT 故障记录总
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface FailureRecordTMapper
 
     /**
      * 删除故障记录总
-     * 
+     *
      * @param id 故障记录总主键
      * @return 结果
      */
@@ -53,9 +53,12 @@ public interface FailureRecordTMapper
 
     /**
      * 批量删除故障记录总
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteFailureRecordTByIds(Long[] ids);
+
+    Integer findMaxIndexRecord();
+
 }

+ 11 - 8
fms-admin/src/main/java/com/fms/system/service/IFailureRecordTService.java

@@ -5,15 +5,15 @@ import com.fms.system.domain.FailureRecordT;
 
 /**
  * 故障记录总Service接口
- * 
+ *
  * @author ruoyi
  * @date 2024-09-06
  */
-public interface IFailureRecordTService 
+public interface IFailureRecordTService
 {
     /**
      * 查询故障记录总
-     * 
+     *
      * @param id 故障记录总主键
      * @return 故障记录总
      */
@@ -21,7 +21,7 @@ public interface IFailureRecordTService
 
     /**
      * 查询故障记录总列表
-     * 
+     *
      * @param failureRecordT 故障记录总
      * @return 故障记录总集合
      */
@@ -29,7 +29,7 @@ public interface IFailureRecordTService
 
     /**
      * 新增故障记录总
-     * 
+     *
      * @param failureRecordT 故障记录总
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IFailureRecordTService
 
     /**
      * 修改故障记录总
-     * 
+     *
      * @param failureRecordT 故障记录总
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IFailureRecordTService
 
     /**
      * 批量删除故障记录总
-     * 
+     *
      * @param ids 需要删除的故障记录总主键集合
      * @return 结果
      */
@@ -53,9 +53,12 @@ public interface IFailureRecordTService
 
     /**
      * 删除故障记录总信息
-     * 
+     *
      * @param id 故障记录总主键
      * @return 结果
      */
     public int deleteFailureRecordTById(Long id);
+
+    Integer findMaxIndexRecord();
+
 }

+ 13 - 8
fms-admin/src/main/java/com/fms/system/service/impl/FailureRecordTServiceImpl.java

@@ -10,19 +10,19 @@ import com.fms.system.service.IFailureRecordTService;
 
 /**
  * 故障记录总Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2024-09-06
  */
 @Service
-public class FailureRecordTServiceImpl implements IFailureRecordTService 
+public class FailureRecordTServiceImpl implements IFailureRecordTService
 {
     @Autowired
     private FailureRecordTMapper failureRecordTMapper;
 
     /**
      * 查询故障记录总
-     * 
+     *
      * @param id 故障记录总主键
      * @return 故障记录总
      */
@@ -34,7 +34,7 @@ public class FailureRecordTServiceImpl implements IFailureRecordTService
 
     /**
      * 查询故障记录总列表
-     * 
+     *
      * @param failureRecordT 故障记录总
      * @return 故障记录总
      */
@@ -46,7 +46,7 @@ public class FailureRecordTServiceImpl implements IFailureRecordTService
 
     /**
      * 新增故障记录总
-     * 
+     *
      * @param failureRecordT 故障记录总
      * @return 结果
      */
@@ -59,7 +59,7 @@ public class FailureRecordTServiceImpl implements IFailureRecordTService
 
     /**
      * 修改故障记录总
-     * 
+     *
      * @param failureRecordT 故障记录总
      * @return 结果
      */
@@ -72,7 +72,7 @@ public class FailureRecordTServiceImpl implements IFailureRecordTService
 
     /**
      * 批量删除故障记录总
-     * 
+     *
      * @param ids 需要删除的故障记录总主键
      * @return 结果
      */
@@ -84,7 +84,7 @@ public class FailureRecordTServiceImpl implements IFailureRecordTService
 
     /**
      * 删除故障记录总信息
-     * 
+     *
      * @param id 故障记录总主键
      * @return 结果
      */
@@ -93,4 +93,9 @@ public class FailureRecordTServiceImpl implements IFailureRecordTService
     {
         return failureRecordTMapper.deleteFailureRecordTById(id);
     }
+
+    @Override
+    public Integer findMaxIndexRecord() {
+        return failureRecordTMapper.findMaxIndexRecord();
+    }
 }

+ 8 - 1
fms-admin/src/main/resources/mapper/system/FailureRecordTMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="FailureRecordT" id="FailureRecordTResult">
         <result property="id"    column="id"    />
+        <result property="index"    column="index"    />
         <result property="batchName"    column="batch_name"    />
         <result property="quantity"    column="quantity"    />
         <result property="remark"    column="remark"    />
@@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFailureRecordTVo">
-        select id, batch_name, quantity,remark create_by, create_time, update_by, update_time from failure_record_t
+        select id, batch_name, quantity,remark create_by, create_time, update_by, update_time, `index` from failure_record_t
     </sql>
 
     <select id="selectFailureRecordTList" parameterType="FailureRecordT" resultMap="FailureRecordTResult">
@@ -25,12 +26,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="batchName != null  and batchName != ''"> and batch_name like concat('%', #{batchName}, '%')</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
         </where>
+        order by `index`
     </select>
 
     <select id="selectFailureRecordTById" parameterType="Long" resultMap="FailureRecordTResult">
         <include refid="selectFailureRecordTVo"/>
         where id = #{id}
     </select>
+    <select id="findMaxIndexRecord" resultType="java.lang.Integer">
+        select MAX(`index`) from failure_record_t
+    </select>
 
     <insert id="insertFailureRecordT" parameterType="FailureRecordT" useGeneratedKeys="true" keyProperty="id">
         insert into failure_record_t
@@ -42,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="index != null">`index`,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="batchName != null">#{batchName},</if>
@@ -51,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="index != null">#{index},</if>
          </trim>
     </insert>
 

+ 1 - 0
fms-ui/src/views/system/failureRecord/index.vue

@@ -54,6 +54,7 @@
 
     <el-table v-loading="loading" :data="failureRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="排序" align="center" prop="index"/>
       <el-table-column label="故障记录批次名称" align="center" prop="batchName"/>
       <el-table-column label="数据数量" align="center" prop="quantity"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">