From b10514ca6683f86bd80d7b5baba0c3cb4fca3e82 Mon Sep 17 00:00:00 2001
From: DirectionOfMind <3182967682@qq.com>
Date: Mon, 25 Jan 2021 09:27:37 +0800
Subject: [PATCH] fix

---
 .../equipment/service/impl/EquipmentInfoServiceImpl.java      | 2 +-
 src/main/resources/mapper/app/ResultDetailMapper.xml          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
index 6ea03e6c..e2da0222 100644
--- a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
+++ b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
@@ -209,7 +209,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 					break;
 				case TRANSFER:
 					info.setEquipmentState(state);
-					info.setUser(EquipmentState.TRANSFER.getName());
+					//info.setUser(EquipmentState.TRANSFER.getName());
 					equipmentInfoMapper.updateCoverEquipmentInfoById(info);
 					//出库增加日志操作
 					addRecord(info,infoDto);
diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml
index 3dac7408..07a75fa4 100644
--- a/src/main/resources/mapper/app/ResultDetailMapper.xml
+++ b/src/main/resources/mapper/app/ResultDetailMapper.xml
@@ -217,10 +217,12 @@
     </select>
 
     <select id="listRecord" resultType="com.lz.modules.app.dto.ResultDto">
+        SELECT @rownum:=@rownum+1 as 'index',b.* from (select @rownum:=0) a,(
         SELECT d.id,d.target,process_rate from lz_result_record r LEFT JOIN lz_result_detail d
         on r.id = d.record_id
         where r.is_delete = 0 and d.is_delete=0 and d.staff_id = #{staffId}
-        and r.flow_process &lt;4
+        and r.flow_process &lt; 4
+        ) b
     </select>
 </mapper>