基础分类增加查询方法

src/main/java/com/scpyun/platform/jilinsscgsdp/bean/entity/MaterialImp.java

@@ -6,9 +6,9 @@ import lombok.Data;
 @Data
 public class MaterialImp {
 
-    private String category_Code;
+    private String category_code;
     @ExcelProperty(value = "分类名称", index = 0)
-    private String category_Name;
+    private String category_name;
     @ExcelProperty(value = "用品编码", index = 1)
     private String material_code;
     @ExcelProperty(value = "用品名称", index = 2)

src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyDmLeaveTypeServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Api("请假类型管理")
@@ -21,6 +22,14 @@ public class KeyDmLeaveTypeServiceImpl {
     private static final String SUCCESS = "success";
     private final String namespace = "com.scpyun.platform.standard.jilinsscgsdp.keyDmLeaveType.";
 
+    @ApiOperation(value = "查询请假类型", desc = "查询请假类型")
+    public List<Map<String, Object>> findList(Map<String,Object> map) {
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        return commonService.findList(namespace + "findList", map);
+    }
+
     @ApiOperation(value = "查询请假类型列表", desc = "分页查询请假类型")
     public Page<Map<String, Object>> selectList(Page<Map<String,Object>> map) {
         if (map == null) {

src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyDmMaterialCategoryServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Api("办公用品分类管理")
@@ -21,6 +22,14 @@ public class KeyDmMaterialCategoryServiceImpl {
     private static final String SUCCESS = "success";
     private final String namespace = "com.scpyun.platform.standard.jilinsscgsdp.keyDmMaterialCategory.";
 
+    @ApiOperation(value = "查询办公用品分类", desc = "查询办公用品分类")
+    public List<Map<String, Object>> findList(Map<String, Object> map) {
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        return commonService.findList(namespace + "findList", map);
+    }
+
     @ApiOperation(value = "查询办公用品分类列表", desc = "分页查询办公用品分类")
     public Page<Map<String, Object>> selectList(Page<Map<String, Object>> map) {
         if (map == null) {

src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyDmUserCategoryServiceImpl.java

@@ -22,6 +22,15 @@ public class KeyDmUserCategoryServiceImpl {
     private static final String SUCCESS = "success";
     private final String namespace = "com.scpyun.platform.standard.jilinsscgsdp.keyDmUserCategory.";
 
+    @ApiOperation(value = "查询人员分类", desc = "查询人员分类")
+    public List<Map<String, Object>> findList(Map<String,Object> map) {
+        if (map == null) {
+            map = new HashMap<>();
+        }
+
+        return commonService.findList(namespace + "findList", map);
+    }
+
     @ApiOperation(value = "查询人员分类列表", desc = "分页查询人员分类")
     public Page<Map<String, Object>> selectList(Page<Map<String,Object>> map) {
         if (map == null) {

src/main/java/com/scpyun/platform/jilinsscgsdp/utils/MaterialFileListener.java

@@ -2,8 +2,11 @@ package com.scpyun.platform.jilinsscgsdp.utils;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
+import com.scpyun.base.core.utils.StringUtils;
 import com.scpyun.base.core.utils.UUIDUtil;
+import com.scpyun.base.core.utils.validator.IdcardUtil;
 import com.scpyun.base.db.service.CommonService;
+import com.scpyun.platform.jilinsscgsdp.bean.entity.KeyPersonImp;
 import com.scpyun.platform.jilinsscgsdp.bean.entity.MaterialImp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,18 +30,46 @@ public class MaterialFileListener extends AnalysisEventListener<MaterialImp> {
     private Map<String,Object> param;
     private List<String> errInfo = new ArrayList<>();
 
+
+    private String catgoryNamespace = "com.scpyun.platform.standard.jilinsscgsdp.keyDmMaterialCategory.";
+    private String materialNamespace = "com.scpyun.platform.standard.jilinsscgsdp.keyDmMaterial.";
+
+    private Map<String, Map> catgoryMap = new HashMap<>();
+    private Map<String, Map> materialMap = new HashMap<>();
+    private int sortNo = 0;
+
+
     public MaterialFileListener(CommonService commonService, String namespace, Map<String,Object> param) {
         this.commonService = commonService;
         this.namespace = namespace;
         this.param = param;
         //获取所有办公用品分类信息
+        List<Map<String, Object>> catgoryLisit = commonService.findList(catgoryNamespace + "findList", param);
+        catgoryLisit.forEach(item -> {
+            catgoryMap.put(String.valueOf(item.get("category_name")), item);
+        });
+        int tempsortNo = 0;
         //获取所有办公用品信息，后续根据办公用品编码来判断更新或插入
+        List<Map<String, Object>> materialLisit = commonService.findList(materialNamespace + "findList", param);
+        materialLisit.forEach(item -> {
+            catgoryMap.put(String.valueOf(item.get("material_code")), item);
+            Integer sort =  (Integer)item.get("sort_no");
+            if (sort != null) {
+
+            }
+        });
     }
 
     @Override
     public void invoke(MaterialImp data, AnalysisContext context) {
         try {
+            // 这里可以添加数据校验逻辑
+            if (isValidProduct(data)) {
                 cached.add(data);
+            } else {
+                errorCount.incrementAndGet(); // 失败计数增加
+            }
+
             if (cached.size() >= BATCH_COUNT) {
                 saveBatch();
                 cached.clear();
@@ -58,25 +89,51 @@ public class MaterialFileListener extends AnalysisEventListener<MaterialImp> {
     }
 
     private void saveBatch() {
+        if (cached.isEmpty()) {
+            return;
+        }
+
         for (MaterialImp m : cached) {
             try {
-                Map<String,Object> q = new HashMap<>();
-                q.put("material_code", m.getMaterial_code());
-                Map<String,Object> exists = commonService.getObject(namespace + "getByCode", q);
                 Map<String,Object> row = new HashMap<>();
-                row.put("category_Code", m.getCategory_Code());
-                row.put("category_Name", m.getCategory_Name());
+
+                Map<String, Object> exists = materialMap.get(m.getMaterial_code());
+                if(StringUtils.isNotEmpty(m.getCategory_name())) {
+                    Map<String, Object> catgory = catgoryMap.get(m.getCategory_code());
+                    if(catgory!=null) {
+                        row.put("category_Code", String.valueOf(catgory.get("category_code")));
+                        row.put("category_Name", m.getCategory_name());
+                    }
+                }
+
+                double min = 0L;
+                double max = 0L;
+                int can_borrow = 1;
+                double unit_price = 0L;
+                if(m.getMin_stock()!=null) {
+                    min = m.getMin_stock();
+                }
+                if(m.getMax_stock()!=null) {
+                    max = m.getMax_stock();
+                }
+                if(!new Integer(1).equals(m.getCan_borrow())) {
+                    can_borrow = 0;
+                }
+                if(m.getUnit_price()!=null) {
+                    unit_price = m.getUnit_price();
+                }
+
                 row.put("material_code", m.getMaterial_code());
                 row.put("material_name", m.getMaterial_name());
                 row.put("material_spec", m.getMaterial_spec());
                 row.put("unit", m.getUnit());
-                row.put("unit_price", m.getUnit_price());
+                row.put("unit_price", unit_price);
                 row.put("storage_location", m.getStorage_location());
-                row.put("min_stock", m.getMin_stock());
-                row.put("max_stock", m.getMax_stock());
-                row.put("can_borrow", m.getCan_borrow());
+                row.put("min_stock", min);
+                row.put("max_stock", max);
+                row.put("can_borrow", can_borrow);
                 row.put("material_desc", m.getMaterial_desc());
-                row.put("order_no", 0);
+                row.put("order_no", sortNo++);
                 if (exists == null) {
                     row.put("id", UUIDUtil.getUUID());
                     commonService.insert(namespace + "insert", row);
@@ -93,6 +150,17 @@ public class MaterialFileListener extends AnalysisEventListener<MaterialImp> {
         }
     }
 
+    /**
+     * 数据校验方法
+     */
+    private boolean isValidProduct(MaterialImp data) {
+        //用品编码、名称
+        return data.getMaterial_code() != null &&
+                !data.getMaterial_code().trim().isEmpty() &&
+                data.getMaterial_name() != null &&
+                !data.getMaterial_name().trim().isEmpty(); //
+    }
+
     public Map<String,Object> getResult() {
         Map<String,Object> r = new HashMap<>();
         r.put("insert", insertCount.get());