单事项，辅助接件事项材料列表查询方法subList优化；材料附件下载到本地以及转换预览图片方法修改

single-matter/src/main/java/com/mortals/xhx/common/utils/MatterDetailHtmlParseUtil.java

@@ -449,88 +449,9 @@ public class MatterDetailHtmlParseUtil {
 //            System.out.println(item.getKey() + "=" + item.getValue());
 //        });
 
-//        List<Map<String, Object>> mapList = MatterDetailHtmlParseUtil.getsqclInfoMapByHtml(dom);
-//        System.out.println(JSON.toJSONString(mapList));
+        List<Map<String, Object>> mapList =  MatterDetailHtmlParseUtil.getsqclInfoMapByHtml(dom);
+        System.out.println(JSON.toJSONString(mapList));
 
-        String blankSampleExp = "//div[@id=\"zhezhao\"]//div[@class='zhezhao4']";
-        String sampleExp = "//div[@id=\"zhezhao\"]//div[@class='zhezhao2']";
-        String baseInfoExp = "//div[@id=\"zhezhao\"]//div[@class='zhezhao3']";
-        try {
-            Elements elements = dom.selectXpath(blankSampleExp);
-            int rowNum = elements.size();
-
-            for (int i = 1; i <= rowNum; i++) {
-                HashMap<String, Object> map = new HashMap<>();
-                List<MatterDatumFileEntity> datumFileEntities = new ArrayList<>();
-                List<MatterDatumFileEntity> datumSampleFileEntities = new ArrayList<>();
-                //查询空白样表数量
-                String tempxPath = blankSampleExp + String.format("[%d]//table//tr[position()>1]//td", i);
-
-                Elements evaluateList = dom.selectXpath(tempxPath);
-                for (int j = 0; j < evaluateList.size(); j++) {
-                    if (j % 2 == 0) {
-                        continue;
-                    }
-                    Element node = evaluateList.get(j);
-                    System.out.println(j);
-                    System.out.println(JSON.toJSONString(node));
-                    if (j > 0) {
-                        Element prenode = evaluateList.get(j - 1);
-                        MatterDatumFileEntity fileEntity = new MatterDatumFileEntity();
-                        fileEntity.setCreateTime(new Date());
-                        fileEntity.setCreateUser("system");
-                        fileEntity.setSource(SourceEnum.政务网.getValue());
-                        fileEntity.setFiletype(FiletypeEnum.空白表格.getValue());
-                        fileEntity.setFileName(prenode.text().trim());
-                        fileEntity.setFileUrl(node.firstChild().attr("onclick").trim());
-                        datumFileEntities.add(fileEntity);
-                    }
-                }
-                map.put("blankList", datumFileEntities);
-                //查询样表
-                String tempxPath1 = sampleExp + String.format("[%d]//table//tr[position()>1]//td", i);
-                Elements sampleList = dom.selectXpath(tempxPath1);
-
-                for (int j = 0; j < sampleList.size(); j++) {
-                    if (j % 2 == 0) {
-                        continue;
-                    }
-                    Element node = sampleList.get(j);
-                    if (j > 0) {
-                        Element prenode = sampleList.get(j - 1);
-                        MatterDatumFileEntity fileEntity = new MatterDatumFileEntity();
-                        fileEntity.setCreateTime(new Date());
-                        fileEntity.setCreateUser("system");
-                        fileEntity.setSource(SourceEnum.政务网.getValue());
-                        fileEntity.setFiletype(FiletypeEnum.示例样表.getValue());
-                        fileEntity.setFileName(prenode.text().trim());
-                        fileEntity.setFileUrl(node.firstChild().attr("onclick").trim());
-                        System.out.println(JSON.toJSONString(fileEntity));
-                        datumSampleFileEntities.add(fileEntity);
-                    }
-                    map.put("sampleList", datumSampleFileEntities);
-                }
-
-
-                //查询基本信息
-                String tempxPath2 = baseInfoExp + String.format("[%d]//table//tr//td", i);
-                Elements baseinfoList = dom.selectXpath(tempxPath2);
-                HashMap<String, String> baseInfoMap = new HashMap<>();
-                for (int j = 0; j < baseinfoList.size(); j++) {
-                    if (j % 2 == 0) {
-                        continue;
-                    }
-                    Element node = baseinfoList.get(j);
-                    if (j > 0) {
-                        Element prenode = baseinfoList.get(j - 1);
-                        baseInfoMap.put(prenode.text().trim(), node.text().trim());
-                    }
-                }
-                map.put("baseinfo", baseInfoMap);
-            }
-        } catch (Exception e) {
-            log.error("申请材料表格解析xpath解析异常:", e);
-        }
 
 //        Map<String, String> sltjMapByHtml = MatterDetailHtmlParseUtil.getSltjMapByHtml(dom);
 //        System.out.println("==============受理条件==============");

single-matter/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -1256,7 +1256,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             matterDatumService.remove(datumIds, context);
             Long[] datumFileIds = matterDatumFileService.find(new MatterDatumFileQuery().datumIdList(Arrays.asList(datumIds))).stream().map(item -> item.getId()).toArray(Long[]::new);
             if (!ObjectUtils.isEmpty(datumFileIds)) {
-                matterDatumService.remove(datumFileIds, context);
+                matterDatumFileService.remove(datumFileIds, context);
             }
         }
 
@@ -1270,6 +1270,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             datumEntity.initAttrValue();
             datumEntity.setMatterId(matterEntity.getId());
             datumEntity.setMatterCode(matterEntity.getMatterNo());
+            datumEntity.setMatterName(matterEntity.getMatterName());
             datumEntity.setMaterialName(matterEntity.getMatterName());
             datumEntity.setSource(SourceEnum.政务网.getValue());
             datumEntity.setCreateTime(new Date());

single-matter/src/main/resources/sqclinfo.setting

@@ -8,7 +8,7 @@
 备注 = remark
 是否减免 = isjianm
 纸质材料份数 = paperNum
-材料名称 = matterName
+材料名称 = materialName
 填报须知 = remarkSub
 受理标准 = summary
 来源渠道 = materialSource