diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/IMesDefectRecordDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/IMesDefectRecordDao.java index 32c4e2a..c41ae9a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/IMesDefectRecordDao.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/IMesDefectRecordDao.java @@ -13,5 +13,5 @@ import java.util.List; **/ public interface IMesDefectRecordDao { - List queryMesDefectRecordGroupBy(String organizeCode, Integer count); + List queryMesDefectRecordGroupBy(String organizeCode, Integer count, String createDateTimeStart, String createDateTimeEnd); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDefectRecordDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDefectRecordDaoImpl.java index e7b9957..3d732e4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDefectRecordDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDefectRecordDaoImpl.java @@ -1,10 +1,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.daoimpl; import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesDefectRecordDao; -import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesWorkOrderDao; import cn.estsh.i3plus.ext.mes.pojo.model.MesDefectRecordModel; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,7 +29,7 @@ public class MesDefectRecordDaoImpl implements IMesDefectRecordDao { @Override - public List queryMesDefectRecordGroupBy(String organizeCode, Integer count) { + public List queryMesDefectRecordGroupBy(String organizeCode, Integer count, String createDateTimeStart, String createDateTimeEnd) { StringBuffer hql = new StringBuffer("select mdr.part_no ,mp.part_type_code mdr.sides ,mdr.defect_location_code ,mdr.defect_code "); hql.append(" from mes_defect_record as mdr"); @@ -41,6 +39,9 @@ public class MesDefectRecordDaoImpl implements IMesDefectRecordDao { hql.append(" and mdr.is_deleted = :isDeleted "); hql.append(" and mdr.is_valid = :isValid "); hql.append(" and mdr.nc_type = 0 "); + hql.append(" and sap.create_date_time >= :createDateTimeStart"); + hql.append(" and sap.create_date_time <= :createDateTimeEnd"); + hql.append(" group by mdr.part_no ,mp.part_type_code mdr.sides ,mdr.defect_location_code ,mdr.defect_code "); hql.append(" having count() > " + count); @@ -49,6 +50,8 @@ public class MesDefectRecordDaoImpl implements IMesDefectRecordDao { query.setParameter("organizeCode", organizeCode); query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + query.setParameter("createDateTimeStart", createDateTimeStart); + query.setParameter("createDateTimeEnd", createDateTimeEnd); List list = query.getResultList(); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java index fa76a96..f3cb373 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java @@ -4,7 +4,9 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService; import cn.estsh.i3plus.ext.mes.api.base.IMesDefectAlarmConfigService; import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesDefectRecordDao; import cn.estsh.i3plus.ext.mes.pojo.model.MesDefectRecordModel; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesDefect; @@ -19,6 +21,7 @@ import org.springframework.stereotype.Service; import java.util.List; + @Service @Slf4j public class MesDefectAlarmConfigService extends BaseMesService implements IMesDefectAlarmConfigService { @@ -56,8 +59,10 @@ public class MesDefectAlarmConfigService extends BaseMesService modelList = defectRecordDao.queryMesDefectRecordGroupBy(org, Integer.parseInt(count)); + List modelList = defectRecordDao.queryMesDefectRecordGroupBy(org, Integer.parseInt(count), createDateTimeStart, createDateTimeEnd); for (MesDefectRecordModel model : modelList) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);