Update 优化样品流转记录

SERVER/ChickenFarmV3/vb-modules/vb-device/src/main/java/cn/vber/device/core/enums/TaskTypeEnum.java

@@ -9,9 +9,13 @@ public enum TaskTypeEnum {
     MAINTENANCE_MANAGEMENT(1),
 
     /**
-     * 清洁消毒
+     * 清洁
      */
-    CLEANING_SANITIZATION(2);
+    CLEANING(2),
+    /**
+     * 消毒
+     */
+    DISINFECTION(3);
 
     private final Integer type;
 
@@ -39,7 +43,7 @@ public enum TaskTypeEnum {
     public String getName() {
         return switch (this) {
             case MAINTENANCE_MANAGEMENT -> "设备保养";
-            case CLEANING_SANITIZATION -> "清洁消毒";
+            case CLEANING -> "清洁消毒";
             default -> null;
         };
     }

SERVER/ChickenFarmV3/vb-modules/vb-device/src/main/java/cn/vber/device/core/enums/WorkOrderTypeEnum.java

@@ -13,9 +13,13 @@ public enum WorkOrderTypeEnum {
      */
     MAINTENANCE_MANAGEMENT(2),
     /**
-     * 清洁消毒
+     * 清洁
      */
-    CLEANING_SANITIZATION(3);
+    CLEANING(3),
+    /**
+     * 消毒
+     */
+    DISINFECTION(4);
 
 
     private final Integer type;
@@ -45,7 +49,8 @@ public enum WorkOrderTypeEnum {
         return switch (this) {
             case FAULT_REPAIR -> "设备维修";
             case MAINTENANCE_MANAGEMENT -> "设备保养";
-            case CLEANING_SANITIZATION -> "清洁消毒";
+            case CLEANING -> "清洁";
+            case DISINFECTION -> "消毒";
             default -> null;
         };
     }
@@ -54,7 +59,8 @@ public enum WorkOrderTypeEnum {
         return switch (this) {
             case FAULT_REPAIR -> "r";
             case MAINTENANCE_MANAGEMENT -> "m";
-            case CLEANING_SANITIZATION -> "c";
+            case CLEANING -> "c";
+            case DISINFECTION -> "d";
             default -> null;
         };
     }

SERVER/ChickenFarmV3/vb-modules/vb-device/src/main/java/cn/vber/device/service/impl/DeviceOrderServiceImpl.java

@@ -220,8 +220,10 @@ public class DeviceOrderServiceImpl implements IDeviceOrderService {
     private WorkOrderTypeEnum getOrderType(Integer taskType) {
         return taskType == TaskTypeEnum.MAINTENANCE_MANAGEMENT.getType()
                 ? WorkOrderTypeEnum.MAINTENANCE_MANAGEMENT
-                : taskType == TaskTypeEnum.CLEANING_SANITIZATION.getType()
-                ? WorkOrderTypeEnum.CLEANING_SANITIZATION
+                : taskType == TaskTypeEnum.CLEANING.getType()
+                ? WorkOrderTypeEnum.CLEANING
+                : taskType == TaskTypeEnum.DISINFECTION.getType()
+                ? WorkOrderTypeEnum.DISINFECTION
                 : WorkOrderTypeEnum.MAINTENANCE_MANAGEMENT;
     }
 

SERVER/ChickenFarmV3/vb-modules/vb-experiment/src/main/java/cn/vber/experiment/service/impl/SampleServiceImpl.java

@@ -174,7 +174,7 @@ public class SampleServiceImpl implements ISampleService, SampleService {
     @Override
     public List<SampleFlowVo> queryFlowLogs(Long id) {
         LambdaQueryWrapper<SampleFlow> lqw = Wrappers.lambdaQuery();
-        lqw.eq(SampleFlow::getSampleId, id);
+        lqw.eq(SampleFlow::getSampleId, id).orderByDesc(SampleFlow::getId);
         return flowMapper.selectVoList(lqw);
     }
 
@@ -187,9 +187,10 @@ public class SampleServiceImpl implements ISampleService, SampleService {
         if (sample == null) {
             throw new ServiceException("查询个体不存在");
         }
-        SampleFlow lastFlow = flowMapper.selectList(new LambdaQueryWrapper<SampleFlow>()
+        SampleFlow lastFlow = flowMapper.selectOne(new LambdaQueryWrapper<SampleFlow>()
+                .eq(SampleFlow::getSampleId, id)
                 .eq(SampleFlow::getHandler, LoginHelper.getUserId())
-                .orderByDesc(SampleFlow::getId)).get(0);
+                .orderByDesc(SampleFlow::getId).last("limit 1"));
         if (lastFlow != null && DateUtils.getNowDate().before(DateUtils.addHours(lastFlow.getHandleTime(), 1))) {
             return sample;
         }

UI/VB.VUE/src/views/experiment/sample/_sample.vue

@@ -602,9 +602,9 @@ function handlePreviewPdf(file: string) {
 			:close-btn-class="'btn btn-danger'"
 			append-to-body>
 			<template #body>
-				<el-table :data="flowData" :show-header="false">
+				<el-table :data="flowData" stripe :show-header="false">
 					<!-- <el-table-column label="序号" type="index" width="60" align="center"></el-table-column> -->
-					<el-table-column label="序号" width="100" prop="id" align="center"></el-table-column>
+					<el-table-column label="序号" width="100" type="index" align="center"></el-table-column>
 					<el-table-column label="操作人" prop="handlerName" align="center"></el-table-column>
 					<el-table-column label="操作时间" prop="handleTime" align="center">
 						<template #default="{ row }">