From 263c8ee4f6f8cbb1228a1d5c13258ea8d4309350 Mon Sep 17 00:00:00 2001 From: Administrator <test@dy.com> Date: 星期四, 22 五月 2025 09:24:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java index 9631ca3..43f2229 100644 --- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java +++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java @@ -1,8 +1,11 @@ package com.dy.pmsGlobal.daoSta; +import cn.hutool.json.JSONObject; import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -22,10 +25,13 @@ StaDeviceProductionLog selectByPrimaryKey(Long id); - List<StaDeviceProductionLog> selectByEquipNo(String equipNo); + List<StaDeviceProductionLog> selectByDeviceNo(String deviceNo); + + List<StaDeviceProductionLog> selectProductLog(@Param("deviceNo") String deviceNo,@Param("startTime") Date startTime,@Param("endTime") Date endTime); int updateByPrimaryKeySelective(StaDeviceProductionLog record); int updateByPrimaryKey(StaDeviceProductionLog record); + List<JSONObject> queryTopError(@Param("startTime") Date startTime,@Param("endTime") Date endTime); } -- Gitblit v1.8.0