Commit 61c13642 authored by hkl's avatar hkl

feat:1.bug修复

parent 48210361
...@@ -102,9 +102,22 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC ...@@ -102,9 +102,22 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
.eq(ObjectUtil.isNotEmpty(lineAliasId), TrackBedManagement::getLineAliasId, lineAliasId) .eq(ObjectUtil.isNotEmpty(lineAliasId), TrackBedManagement::getLineAliasId, lineAliasId)
.orderByAsc(TrackBedManagement::getTrackBedCode) .orderByAsc(TrackBedManagement::getTrackBedCode)
.list(); .list();
// List<TrackBedManagement> listResult = trackBedManagementService
return Result.OK(listResult);
}
@AutoLog(value = "根据区间id查询道床列表")
@ApiOperation(value = "根据区间id查询道床列表", notes = "根据区间id查询道床列表")
@GetMapping(value = "/getTrackBedById")
public Result<List<TrackBedManagement>> getTrackBedById(String id) {
List<TrackBedManagement> listResult = trackBedManagementService.getTrackBedById(id);
return Result.OK(listResult); return Result.OK(listResult);
} }
/** /**
* 根据道床使用情况记录数据表的道床id查询对应的实用情况 * 根据道床使用情况记录数据表的道床id查询对应的实用情况
* *
......
...@@ -6,6 +6,8 @@ import org.jeecg.modules.deviceAsset.dto.TrackBedManagementDTO; ...@@ -6,6 +6,8 @@ import org.jeecg.modules.deviceAsset.dto.TrackBedManagementDTO;
import org.jeecg.modules.deviceAsset.entity.TrackBedManagement; import org.jeecg.modules.deviceAsset.entity.TrackBedManagement;
import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO; import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO;
import java.util.List;
/** /**
* <p> * <p>
* 资产管理-道床管理 Mapper 接口 * 资产管理-道床管理 Mapper 接口
...@@ -17,4 +19,6 @@ import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO; ...@@ -17,4 +19,6 @@ import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO;
public interface TrackBedManagementMapper extends BaseMapper<TrackBedManagement> { public interface TrackBedManagementMapper extends BaseMapper<TrackBedManagement> {
Page<TrackBedManagementVO> queryPageList(Page<TrackBedManagementVO> pageData, TrackBedManagementDTO dto); Page<TrackBedManagementVO> queryPageList(Page<TrackBedManagementVO> pageData, TrackBedManagementDTO dto);
List<TrackBedManagement> getTrackBedById(String id);
} }
...@@ -29,4 +29,12 @@ ...@@ -29,4 +29,12 @@
AND t3.status = 1 AND t3.status = 1
</where> </where>
</select> </select>
<select id="getTrackBedById" resultType="org.jeecg.modules.deviceAsset.entity.TrackBedManagement">
SELECT
DISTINCT t1.trak_bed_management_id,t2.*
FROM
t_ek_track_bed_management_check t1
LEFT JOIN t_da_track_bed_management t2 ON t1.trak_bed_management_id = t2.id
WHERE t1.records_master_check_id = #{id}
</select>
</mapper> </mapper>
...@@ -21,4 +21,6 @@ public interface ITrackBedManagementService extends IService<TrackBedManagement> ...@@ -21,4 +21,6 @@ public interface ITrackBedManagementService extends IService<TrackBedManagement>
Page<TrackBedManagementVO> queryPageList(Page<TrackBedManagementVO> pageData, TrackBedManagementDTO dto); Page<TrackBedManagementVO> queryPageList(Page<TrackBedManagementVO> pageData, TrackBedManagementDTO dto);
List<TrackBedManagement> queryList(); List<TrackBedManagement> queryList();
List<TrackBedManagement> getTrackBedById(String id);
} }
...@@ -31,4 +31,9 @@ public class TrackBedManagementServiceImpl extends ServiceImpl<TrackBedManagemen ...@@ -31,4 +31,9 @@ public class TrackBedManagementServiceImpl extends ServiceImpl<TrackBedManagemen
public List<TrackBedManagement> queryList() { public List<TrackBedManagement> queryList() {
return null; return null;
} }
@Override
public List<TrackBedManagement> getTrackBedById(String id) {
return this.baseMapper.getTrackBedById(id);
}
} }
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