Merge remote-tracking branch 'origin/master'

base-manager/pom.xml

@@ -246,6 +246,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
 
 
         <!-- Spring Boot Data Elasticsearch依赖 -->

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowServiceImpl.java

@@ -72,8 +72,9 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
         Map<Long, List<WorkmanEntity>> workmanCollect = workmanService.find(new WorkmanQuery()).stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId()));
         Map<Long, List<WindowBusinessEntity>> windowBusinessCollect = windowBusinessService.find(new WindowBusinessQuery())
                 .stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId()));
-        Map<Long, List<WindowMatterEntity>> windowMatterCollect = windowMatterService.find(new WindowMatterQuery())
+/*        Map<Long, List<WindowMatterEntity>> windowMatterCollect = windowMatterService.find(new WindowMatterQuery())
                 .stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId()));
+       */
         Map<Long, WindowHallEntity> windowHallMap = windowHallService.find(new WindowHallQuery()).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), y -> y, (o, n) -> n));
         list.stream().peek(item -> {
             if (!ObjectUtils.isEmpty(workmanCollect.get(item.getId()))) {
@@ -82,9 +83,9 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
             if (!ObjectUtils.isEmpty(windowBusinessCollect.get(item.getId()))) {
                 item.setWindowBusinessList(windowBusinessCollect.get(item.getId()));
             }
-            if (!ObjectUtils.isEmpty(windowMatterCollect.get(item.getId()))) {
+/*            if (!ObjectUtils.isEmpty(windowMatterCollect.get(item.getId()))) {
                 item.setWindowMatterList(windowMatterCollect.get(item.getId()));
-            }
+            }*/
             WindowHallEntity windowHallEntity = windowHallMap.get(item.getId());
             if (!ObjectUtils.isEmpty(windowHallEntity)) {
                 item.setHallId(windowHallEntity.getHallId());

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

@@ -15,9 +15,9 @@ POST {{baseUrl}}/matter/datum/importData
 Content-Type: multipart/form-data; boundary=WebAppBoundary
 
 --WebAppBoundary
-Content-Disposition: form-data; name="file"; filename="大竹批量导入材料模板.xlsx"
+Content-Disposition: form-data; name="file"; filename="材料模板.xlsx"
 
-< ./大竹批量导入材料模板.xlsx
+< ./材料模板.xlsx
 --WebAppBoundary--
 
 ###事项申请材料列表