diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxBadStatisticsReportFormService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxBadStatisticsReportFormService.java index 744a890..344024b 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxBadStatisticsReportFormService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxBadStatisticsReportFormService.java @@ -1,37 +1,20 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi.jx; import cn.estsh.i3plus.ext.mes.api.base.jx.IJxRepairJudgeTypeService; -import cn.estsh.i3plus.ext.mes.api.busi.ISxBadStatisticsReportFormService; import cn.estsh.i3plus.ext.mes.api.busi.jx.IJxBadStatisticsReportFormService; -import cn.estsh.i3plus.ext.mes.apiservice.dao.ISxRepairRecordDao; -import cn.estsh.i3plus.ext.mes.pojo.bean.MesBadCell; -import cn.estsh.i3plus.ext.mes.pojo.bean.MesBadCellDetail; import cn.estsh.i3plus.ext.mes.pojo.bean.MesOutPutStatistics; import cn.estsh.i3plus.ext.mes.pojo.bean.MesRepairRecordExt; import cn.estsh.i3plus.ext.mes.pojo.model.BadStatisticsReportModel; import cn.estsh.i3plus.ext.mes.pojo.model.BadStatisticsReportParamModel; -import cn.estsh.i3plus.ext.mes.pojo.model.ProjectBadPerformanceReportModel; -import cn.estsh.i3plus.ext.mes.pojo.model.SxRepairRecordReportModel; -import cn.estsh.i3plus.ext.mes.pojo.model.jx.JxOqcCheckStatisticsReportModel; import cn.estsh.i3plus.ext.mes.pojo.model.jx.JxProjectBadPerformanceReportModel; import cn.estsh.i3plus.ext.mes.pojo.model.jx.SxDynamicAttributeModel; -import cn.estsh.i3plus.ext.mes.pojo.repository.MesBadCellDetailRepository; -import cn.estsh.i3plus.ext.mes.pojo.repository.MesBadCellRepository; import cn.estsh.i3plus.ext.mes.pojo.repository.MesOutPutStatisticsRepository; import cn.estsh.i3plus.ext.mes.pojo.repository.MesRepairRecordExtRepository; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtEnumUtil; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; -import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.MathOperation; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.bean.ListPager; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.common.PagerHelper; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.impp.framework.boot.auth.AuthUtil; -import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java index fc6e39d..d5bb969 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java @@ -5435,4 +5435,37 @@ public class MesExtEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DIVULGE_CHECK_RESULT { + + OK(10, "OK"), + NG(20, "NG"); + + private int value; + private String description; + + DIVULGE_CHECK_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + }