Browse Source

获取上报记录查询出多条bug

feature/dangjian
zhangyuan 3 years ago
parent
commit
abc72bc2c2
  1. 2
      esua-epdc/epdc-cloud-gateway-shibei
  2. 11
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemGridPlatformDao.java
  3. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  4. 13
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml

2
esua-epdc/epdc-cloud-gateway-shibei

@ -1 +1 @@
Subproject commit 98ecba0e2072cd1819f37e3ba3ba12e95d65ea51
Subproject commit 8cd538d06bde3502713af17ba3b645eb944180ec

11
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemGridPlatformDao.java

@ -55,6 +55,17 @@ public interface ItemGridPlatformDao extends BaseDao<ItemGridPlatformEntity> {
*/
List<ItemGridPlatformDTO> getOneOfGridPlatformItemNotEnd(@Param("referenceId") String referenceId);
/**
* 查询最近一条有记录的数据
*
* @param referenceId
* @return com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity
* @author zhy
* @date 2022/10/14 13:26
*/
ItemGridPlatformEntity getOneOfGridPlatformItemByReferenceId(@Param("referenceId") String referenceId);
/**
*
* 根据任务号查询上报信息

5
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@ -1768,10 +1768,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
private ItemGridPlatformEntity getReport(String id) {
QueryWrapper<ItemGridPlatformEntity> wrapper = new QueryWrapper<>();
wrapper.eq("REFERENCE_ID", id);
ItemGridPlatformEntity gridEntity = itemGridPlatformDao.selectOne(wrapper);
return gridEntity;
return itemGridPlatformDao.getOneOfGridPlatformItemByReferenceId(id);
}
/**

13
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml

@ -48,6 +48,19 @@
CREATED_TIME
</select>
<select id="getOneOfGridPlatformItemByReferenceId" resultType="com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity">
SELECT
*
FROM
epdc_item_grid_platform
WHERE
DEL_FLAG = '0'
AND REFERENCE_ID = #{referenceId}
ORDER BY
CREATED_TIME DESC
LIMIT 1
</select>
<select id="selectOneOfItemGridPlatformByTaskId" resultType="com.elink.esua.epdc.dto.item.ItemGridPlatformDTO">
SELECT
ID,

Loading…
Cancel
Save