wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
DirectionOfMind 2021-01-25 09:27:37 +08:00
parent 0f77df89a4
commit b10514ca66
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
View File

@ -209,7 +209,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
break; break;
case TRANSFER: case TRANSFER:
info.setEquipmentState(state); info.setEquipmentState(state);
info.setUser(EquipmentState.TRANSFER.getName()); //info.setUser(EquipmentState.TRANSFER.getName());
equipmentInfoMapper.updateCoverEquipmentInfoById(info); equipmentInfoMapper.updateCoverEquipmentInfoById(info);
//出库增加日志操作 //出库增加日志操作
addRecord(info,infoDto); addRecord(info,infoDto);

4
src/main/resources/mapper/app/ResultDetailMapper.xml
View File

@ -217,10 +217,12 @@
</select> </select>
<select id="listRecord" resultType="com.lz.modules.app.dto.ResultDto"> <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 SELECT d.id,d.target,process_rate from lz_result_record r LEFT JOIN lz_result_detail d
on r.id = d.record_id on r.id = d.record_id
where r.is_delete = 0 and d.is_delete=0 and d.staff_id = #{staffId} 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> </select>
</mapper> </mapper>