WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
wangzhijiang
2022-08-24 19:35:09 +08:00
parent c701343948 5831e4e320
commit 4e64516c82
4 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
+4 -4
View File
@@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
this.updateById(lawsMonthlyReportManageEO); this.updateById(lawsMonthlyReportManageEO);
// 同步es // 同步es
syncElasticsearch(id, issueStatus, issueTime); // syncElasticsearch(id, issueStatus, issueTime);
} }
private void syncElasticsearch(String id, String issueStatus, Date issueTime) { private void syncElasticsearch(String id, String issueStatus, Date issueTime) {
@@ -163,7 +163,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
|| ossFile.getFileName().endsWith(".DOC") || ossFile.getFileName().endsWith(".DOC")
|| ossFile.getFileName().endsWith(".DOCX")) { || ossFile.getFileName().endsWith(".DOCX")) {
String wordContent = null; String wordContent = "--"; // 默认文件内容为空 ，不能定义为null,前端会加载不出页面
try { try {
wordContent = ReadWordUtil.readWord(ossFile.getUrl(),uploadpath); wordContent = ReadWordUtil.readWord(ossFile.getUrl(),uploadpath);
} catch (Exception e) { } catch (Exception e) {
@@ -173,7 +173,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
fileText = wordContent; fileText = wordContent;
} }
} else if (ossFile.getFileName().endsWith(".pdf") || ossFile.getFileName().endsWith(".PDF")) { } else if (ossFile.getFileName().endsWith(".pdf") || ossFile.getFileName().endsWith(".PDF")) {
String pdfContent = null; String pdfContent = "--"; // 默认文件内容为空 ，不能定义为null,前端会加载不出页面
try { try {
pdfContent = ReadPdfUtil.readPdf(ossFile.getUrl()); pdfContent = ReadPdfUtil.readPdf(ossFile.getUrl());
} catch (Exception e) { } catch (Exception e) {
@@ -259,7 +259,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
stringMap.put("file_text", fileText); stringMap.put("file_text", fileText);
stringMap.put("file_name", fileName); stringMap.put("file_name", fileName);
stringMap.put("file_id", fileId); stringMap.put("file_id", fileId);
stringMap.put("issue_time", issueTime); stringMap.put("create_time", issueTime);
stringMap.put("cut",cut); stringMap.put("cut",cut);
stringMap.put("flag",flag); stringMap.put("flag",flag);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java
+2 -2
View File
@@ -166,7 +166,7 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea
Map<String,Object> issueTime = new HashMap<>(); Map<String,Object> issueTime = new HashMap<>();
Map<String,Object> issueTime1 = new HashMap<>(); Map<String,Object> issueTime1 = new HashMap<>();
issueTime.put("order","desc"); issueTime.put("order","desc");
issueTime1.put("issue_time",issueTime); issueTime1.put("create_time",issueTime);
sort.putAll(issueTime1); sort.putAll(issueTime1);
// Map<String,Object> mapSort = new HashMap<>(); // Map<String,Object> mapSort = new HashMap<>();
@@ -258,7 +258,7 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea
list1.add("</text>"); list1.add("</text>");
mapTemp.put("pre_tags", list); mapTemp.put("pre_tags", list);
mapTemp.put("post_tags", list1); mapTemp.put("post_tags", list1);
mapTemp.put("fragment_size", 200);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("fragment_size", 550);//高亮字段内容长度，去除html样式标签，统计字数，设置为200
mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段
mapTemp.put("type", "plain"); mapTemp.put("type", "plain");
mapHighlight.put(key, mapTemp); mapHighlight.put(key, mapTemp);
jero-web/src/views/documentTools/searchCenter/index.vue
+4 -4
View File
@@ -65,10 +65,10 @@
<a-tab-pane :key="$t('whole')" :tab="$t('whole')"></a-tab-pane> <a-tab-pane :key="$t('whole')" :tab="$t('whole')"></a-tab-pane>
<a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')" force-render> <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')" force-render>
</a-tab-pane> </a-tab-pane>
<a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render> <!-- <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>-->
</a-tab-pane> <!-- </a-tab-pane>-->
<a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render> <!-- <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>-->
</a-tab-pane> <!-- </a-tab-pane>-->
</a-tabs> </a-tabs>
</div> </div>
</div> </div>
jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
+40 -40
View File
@@ -433,46 +433,46 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<div class="header-text"> <!-- <div class="header-text">-->
{{$t('reasonsForRejection')}} <!-- {{$t('reasonsForRejection')}}-->
</div> <!-- </div>-->
<a-row :gutter="24"> <!-- <a-row :gutter="24">-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('rejectedBy')">{{$t('rejectedBy')}}</span> <!-- :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- <div class="itemModel">-->
{{formInline.verifyRemark ? formInline.verifyRemark : '--'}} <!-- {{formInline.verifyRemark ? formInline.verifyRemark : '&#45;&#45;'}}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('rejectionTime')">{{$t('rejectionTime')}}</span> <!-- :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- <div class="itemModel">-->
{{formInline.verifyRemark ? formInline.verifyRemark : '--'}} <!-- {{formInline.verifyRemark ? formInline.verifyRemark : '&#45;&#45;'}}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
<a-row :gutter="24"> <!-- <a-row :gutter="24">-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('rejectReason')">{{$t('rejectReason')}}</span> <!-- :title="$t('rejectReason')">{{$t('rejectReason')}}</span>-->
</div> <!-- </div>-->
<div class="itemModel"> <!-- <div class="itemModel">-->
{{formInline.verifyRemark ? formInline.verifyRemark : '--'}} <!-- {{formInline.verifyRemark ? formInline.verifyRemark : '&#45;&#45;'}}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
</a-form-model> </a-form-model>
</a-spin> </a-spin>
<div class="drawer-bootom-button"> <div class="drawer-bootom-button">