修改导入事项与材料

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -480,8 +480,8 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         //eba467f81fb265befdf1f6ab041d39ab   原始admin密码
 
 
-        System.out.println(SecurityUtil.md5DoubleEncoding(" 123456 "));
-          System.out.println(SecurityUtil.md5DoubleEncoding("123"));
+        System.out.println(SecurityUtil.md5DoubleEncoding("wasd111623227!!@"));
+          System.out.println(SecurityUtil.md5DoubleEncoding("p@ssw0rd"));
         // System.out.println(SecurityUtil.md5DoubleEncoding("Qt123456@"));
 
 /*

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -32,10 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
@@ -215,10 +212,12 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
     public void doImportDataBefore(List<MatterDatumEntity> list, boolean updateSupport, Context context) throws AppException {
         super.doImportDataBefore(list, updateSupport, context);
 
-        list.stream().distinct().forEach(item -> {
-
+        Iterator<MatterDatumEntity> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            MatterDatumEntity item = iterator.next();
             if (ObjectUtils.isEmpty(item.getAreaCode())) {
                 log.info("事项名称:{},区域编码为空", item.getMatterName());
+                iterator.remove();
                 return;
             }
 
@@ -226,6 +225,7 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
                     .matterName(item.getMatterName()));
             if (ObjectUtils.isEmpty(matterEntity)) {
                 log.info("事项名称:{},不存在", item.getMatterName());
+                iterator.remove();
                 return;
             }
             //根据事项id查询材料 并且删除
@@ -236,8 +236,9 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
             item.setMatterId(matterEntity.getId());
             item.setMatterCode(matterEntity.getMatterNo());
             item.setSource(matterEntity.getSource());
+        }
+
 
-        });
 
     }
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumController.http

+POST {{baseUrl}}/matter/datum/importData
+Content-Type: multipart/form-data; boundary=WebAppBoundary
+
+--WebAppBoundary
+Content-Disposition: form-data; name="批量导入材料模板"; filename="批量导入材料模板.xlsx"
+
+< E:/批量导入材料模板.xlsx
+--WebAppBoundary--
+
+###
+
+
+###自定义导入
+POST {{baseUrl}}/matter/datum/importData
+Content-Type: multipart/form-data; boundary=WebAppBoundary
+
+--WebAppBoundary
+Content-Disposition: form-data; name="file"; filename="批量导入材料模板.xlsx"
+
+< ./批量导入材料模板.xlsx
+--WebAppBoundary--
 
 ###事项申请材料列表
 POST {{baseUrl}}/matter/datum/list
@@ -73,4 +94,9 @@ Accept: application/json
 
 
 
+###downloadTemplate
+POST {{baseUrl}}/matter/datum/downloadTemplate
+Content-Type: application/json
+
+
 

base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http

@@ -72,7 +72,6 @@ Accept: application/json
 ###模板导出
 POST {{baseUrl}}/window/downloadTemplate
 Content-Type: application/json
-Authorization: {{authToken}}