Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager/src/main/java/com/mortals/xhx/common/code/SourceEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 事项来源 (0.政务网，1.自定义)枚举类
+*
+* @author zxfei
+*/
+public enum SourceEnum {
+    政务网(0, "政务网"),
+    自定义(1, "自定义");
+    private Integer value;
+    private String desc;
+
+    SourceEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static SourceEnum getByValue(Integer value) {
+        for (SourceEnum sourceEnum : SourceEnum.values()) {
+            if (sourceEnum.getValue() == value) {
+                return sourceEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (SourceEnum item : SourceEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -7,6 +7,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.common.code.MatterSourceEnum;
+import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.matter.dao.MatterDao;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
@@ -46,7 +47,6 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     protected void findAfter(MatterEntity entity, PageInfo pageInfo, Context context, List<MatterEntity> list) throws AppException {
         for (MatterEntity matterEntity : list) {
             matterEntity.setDatumCount(matterEntity.getMatterDatumList().size());
-
             matterEntity.getMatterDatumList().forEach(matterDatumEntity -> {
                 matterDatumEntity.setMatterName(matterEntity.getMatterName());
                 matterDatumEntity.setMatterNo(matterEntity.getMatterNo());
@@ -119,7 +119,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             matterEntity.setEnglishName(sheetMatterEntity.getEnglishName());
             matterEntity.setMatterNo(sheetMatterEntity.getMatterNo());
             matterEntity.setMatterFullName(sheetMatterEntity.getMatterName());
-            matterEntity.setSource(MatterSourceEnum.AUTO.getValue());
+            matterEntity.setSource(SourceEnum.政务网.getValue());
             matterEntity.setCreateUserId(this.getContextUserId(context));
             matterEntity.setCreateTime(new Date());
             return matterEntity;