通用EXCEl导出MODEL

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -127,8 +127,8 @@ public class AndonHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
-//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
-//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(andonAlarmCause, result);
 
         return result;
@@ -394,7 +394,7 @@ public class AndonHqlPack {
     public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
         DdlPackBean result = new DdlPackBean();
 
-//        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
 
         getStringBuilderPack(andonAlarmDetailType, result);

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java

@@ -246,7 +246,8 @@ public class AndonEnumUtil {
         QUALITY("QUALITY_ALARM","质量"),
         EQUIP("EQUMENT_ALARM","设备"),
         PROCESS("ROUTING_ALARM","工艺"),
-        CHECK("OTHER_ALARM","其他");
+        CHECK("OTHER_ALARM","其他"),
+        FIX_ERROR("FIX_ERROR", "设备故障");
 
         private String value;
         private String description;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-06-20 18:50
+ * @Modify:
+ **/
+@Data
+public class ExportDataModel {
+
+    private String className;
+
+    private String exportData;
+
+}