Commit 45bdd4df authored by 刘林's avatar 刘林

fix(JG):车用气瓶-后端修改

parent f16c64a0
...@@ -27,7 +27,7 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat ...@@ -27,7 +27,7 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
List<Map<String, Object>> selectEquipList(@Param("id")Long id); List<Map<String, Object>> selectEquipList(@Param("id")Long id);
@MapKey("records") @MapKey("records")
List<Map<String, Object>> queryForUnitVesselEquipment(@Param("records")List<String> records); List<Map<String, Object>> queryForUnitVesselEquipment(@Param("sequenceNbr") Long sequenceNbr, @Param("records")List<String> records);
Long countVesselCylinderIsUsedNumber(@Param("vehicleId") Long vehicleId, @Param("records") List<String> records); Long countVesselCylinderIsUsedNumber(@Param("vehicleId") Long vehicleId, @Param("records") List<String> records);
} }
...@@ -239,6 +239,7 @@ ...@@ -239,6 +239,7 @@
<select id="queryForUnitVesselEquipment" resultType="java.util.Map"> <select id="queryForUnitVesselEquipment" resultType="java.util.Map">
<include refid="page-list-vessel"/> <include refid="page-list-vessel"/>
WHERE ri."EQU_CATEGORY" = '2300' and jui."DATA_SOURCE" = 'jg' and ri.whether_vehicle_cylinder = 1 WHERE ri."EQU_CATEGORY" = '2300' and jui."DATA_SOURCE" = 'jg' and ri.whether_vehicle_cylinder = 1
and ui.sequence_nbr = #{sequenceNbr}
and jui.record in and jui.record in
<foreach collection="records" item="record" open="(" close=")" separator=","> <foreach collection="records" item="record" open="(" close=")" separator=",">
#{record} #{record}
......
...@@ -459,7 +459,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -459,7 +459,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
List<JgVehicleInformationEq> vehicleInformationEqList = jgVehicleInformationEqService.getBaseMapper().selectList(vehicleInfoEqWrapper); List<JgVehicleInformationEq> vehicleInformationEqList = jgVehicleInformationEqService.getBaseMapper().selectList(vehicleInfoEqWrapper);
vo.setEquipmentLists( vo.setEquipmentLists(
this.baseMapper.queryForUnitVesselEquipment( this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,
vehicleInformationEqList.stream() vehicleInformationEqList.stream()
.map(JgVehicleInformationEq::getEquId) .map(JgVehicleInformationEq::getEquId)
.collect(Collectors.toList()) .collect(Collectors.toList())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment