From 1d214373a02a3dc69b7549e0628209b7db3e0c6d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 26 Aug 2022 13:40:59 +0800 Subject: [PATCH 01/10] =?UTF-8?q?58572=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=B8=AD=E5=BF=83=E6=8E=92=E5=BA=8F=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 8 ++++---- .../service/impl/DocumentSearchServiceImpl.java | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 087d3aabf..ef7d1f457 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -222,7 +222,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl targetMarketList){ if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){ + /*if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){ String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut); sbCn.append("展示权限" + ":" + textByValue + " "); }else { @@ -233,7 +233,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl createTime = new HashMap<>(); Map createTime1 = new HashMap<>(); createTime.put("order","desc"); @@ -559,6 +561,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { score1.put("_score",score); sort.putAll(score1); } + log.info("搜索中心-全部索引，排序方式为：" + sort.toJSONString()); // Map mapSort = new HashMap<>(); // Map mapSortTemp = new HashMap<>(); @@ -1256,7 +1259,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { queryMapJsonAll.add(jsonObjectThree); } JSONObject sort = new JSONObject(); - if(StringUtils.isEmpty(selectValue)){ + if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){ Map createTime = new HashMap<>(); Map createTime1 = new HashMap<>(); createTime.put("order","desc"); From 8fa191fa018a9b5c0d809225090797d999ae3449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Fri, 26 Aug 2022 13:45:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/libraryAddForm/index.vue | 7 ++++++- jero-web/src/components/libraryPush/index.vue | 4 ++-- jero-web/src/views/documentManage/library/index.vue | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 5d2f46830..90f7add64 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -332,7 +332,12 @@ if (res.success) { this.confirmLoading = false this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + if (this.formInline.id) { + eventBUs.$emit('searchGetData') + } else { + eventBUs.$emit('searchReset') + } + this.$emit('addFormClick') } else { this.confirmLoading = false diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue index 7d344063b..05d1e547f 100644 --- a/jero-web/src/components/libraryPush/index.vue +++ b/jero-web/src/components/libraryPush/index.vue @@ -115,7 +115,7 @@ this.visible = false this.visibleTree = false this.$emit('clearSelected') - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') } else { this.$message.warning(this.$t('operationFailed')) } @@ -188,7 +188,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; - z-index:100; + z-index: 100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index b5caea42c..9195327c9 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -184,7 +184,7 @@ if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.idList = [] - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') } else { _this.$message.warning(_this.$t('operationFailed')) } @@ -233,7 +233,7 @@ getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') + eventBUs.$emit('searchGetData') } else { _this.$message.warning(_this.$t('operationFailed')) } From 0e12912b169737cdff9d83e2cae553fad8c9d846 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 26 Aug 2022 13:58:35 +0800 Subject: [PATCH 03/10] update --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index ef7d1f457..ff9e0fa10 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -272,10 +272,10 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl"); - sbCn.append("内容" + ":" + problemKnowledgeBaseEO.getContent() + " "); + sbCn.append("正文" + ":" + problemKnowledgeBaseEO.getContent() + " "); }else { sbCn.append("
"); - sbCn.append("内容" + ":" + "-- "); + sbCn.append("正文" + ":" + "-- "); } if(StringUtils.isNotEmpty(fileText)){ @@ -335,10 +335,10 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl"); - sbEn.append("Content" + ":" + problemKnowledgeBaseEO.getContent() + " "); + sbEn.append("Text" + ":" + problemKnowledgeBaseEO.getContent() + " "); }else { sbEn.append("
"); - sbEn.append("Content" + ":" + "-- "); + sbEn.append("Text" + ":" + "-- "); } if(StringUtils.isNotEmpty(fileText)){ From 6ac2aea0137bcc24ea68a612b0adae486598c225 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 26 Aug 2022 14:28:07 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportSearchServiceImpl.java | 121 +++++++++++------- 1 file changed, 72 insertions(+), 49 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java index f046e4f02..13a854a87 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java @@ -77,35 +77,27 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea Map mapHighlight1 = new HashMap<>(); //封装首次的条件 if (StringUtils.isNotBlank(selectValue)) { + selectValue = selectValue.toLowerCase(); for (String field : fieldList) { - Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); - Map map4 = new HashMap<>(); - if("title".equals(field)){ - map3.put("boost",1); - }else if("content".equals(field)){ - map3.put("boost",0.01); - } - // 标题字段 通配符模糊匹配 - if (field.equals("title")){ - // map2放最内层 - map2.put(field, "*" + selectValue + "*"); - - // map4放query - map4.put("wildcard",map2); - } else { - map3.put("query", selectValue); - map2.put(field, map3); - map4.put("match", map2); - } - queryMapJson.add(map4); + getQueryMapJson(queryMapJson, selectValue, field); //高亮 if(!"flag".equals(field)){ highlight(mapHighlight, field); + } else { + // query_string查询 + Map map25 = new HashMap<>(); + Map map45 = new HashMap<>(); + map25.put("query", selectValue); + map25.put("allow_leading_wildcard", false); //禁用了前置通配符 + map45.put("query_string", map25); + queryMapJson.add(map45); + } + } mapHighlight1.put("fields",mapHighlight); + } if(CollectionUtils.isNotEmpty(queryMapJson)){ JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJson); @@ -113,33 +105,22 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea } //封装二次的条件 if (StringUtils.isNotBlank(selectValueTwo)) { + selectValueTwo = selectValueTwo.toLowerCase(); for (String field : fieldList) { - Map queryMap = new HashMap<>(); - Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); - if("title".equals(field)){ - map3.put("boost",1); - }else if("content".equals(field)){ - map3.put("boost",0.01); - } + getQueryMapJson(queryMapJsonTwo, selectValueTwo, field); - // 标题字段 通配符模糊匹配 - if (field.equals("title")){ - // map2放最内层 - map2.put(field, "*" + selectValueTwo + "*"); - // map4放query - queryMap.put("wildcard",map2); - } else { - map3.put("query", selectValueTwo); -// map3.put("minimum_should_match",2); - map2.put(field, map3); - queryMap.put("match", map2); - } - - queryMapJsonTwo.add(queryMap); //高亮 if(!"flag".equals(field)){ highlight(mapHighlight, field); + } else { + // query_string查询 + Map map25 = new HashMap<>(); + Map map45 = new HashMap<>(); + map25.put("query", selectValue); + map25.put("allow_leading_wildcard", false); + map45.put("query_string", map25); + queryMapJsonTwo.add(map45); + } } mapHighlight1.put("fields",mapHighlight); @@ -227,11 +208,6 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea } mapSource.put(key,fieldConyent); } - //如果这一条数据中有高亮字段值,但是file_text中没有高亮值, 则赋空值,否则列表中会展示所有的文件内容, 赋空后,则展示基础数据 - String fileText = (String) mapSource.get("file_text"); - if(StringUtils.isNotBlank(fileText) && !fileText.contains("")){ - mapSource.put("file_text",""); - } } mapList.add(mapSource); } @@ -258,10 +234,57 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea list1.add(""); mapTemp.put("pre_tags", list); mapTemp.put("post_tags", list1); - mapTemp.put("fragment_size", 550);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("fragment_size", 450);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("type", "plain"); mapHighlight.put(key, mapTemp); } + private void getQueryMapJson(JSONArray queryMapJson, String selectValue, String field) { + // 前缀匹配 缺点是前缀一定不能断开 + //情况举例：用户只记得前面那段字 + Map map21 = new HashMap<>(); + Map map31 = new HashMap<>(); + Map map41 = new HashMap<>(); + if("title".equals(field)){ + map31.put("boost",1); + }else if("content".equals(field)){ + map31.put("boost",0.01); + } + map31.put("value", selectValue); + map21.put(field + ".keyword", map31); + map41.put("prefix", map21); + queryMapJson.add(map41); + + // match_phrase_prefix 词组匹配查询，允许最后词组与文中的任意分词前缀匹配 + Map map22 = new HashMap<>(); + Map map32 = new HashMap<>(); + Map map42 = new HashMap<>(); + if("title".equals(field)){ + map32.put("boost",1); + }else if("content".equals(field)){ + map32.put("boost",0.01); + } + map32.put("query", selectValue); + map22.put(field, map32); + map42.put("match_phrase_prefix", map22); + queryMapJson.add(map42); + + // match分词匹配查询 + // 情况举例：用户可能他知道开头的前缀几个字，知道中间的几个字 + Map map23 = new HashMap<>(); + Map map43 = new HashMap<>(); + map23.put(field, selectValue); + map43.put("match", map23); + queryMapJson.add(map43); + + // wildcard模糊查询 + //情况举例：用户只记得中间那段字 + Map map24 = new HashMap<>(); + Map map44 = new HashMap<>(); + map24.put(field, "*" + selectValue + "*"); + map44.put("wildcard",map24); + queryMapJson.add(map44); + } + } From 43e289fe9013764e23ff5de57e72f3eeb85dc611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Fri, 26 Aug 2022 14:53:35 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 4 ++-- .../components/evaluationResultsClause.vue | 2 +- .../technologyAssessment/components/initiatingProcess.vue | 4 ++-- .../processCenter/components/evaluatorFeedbackList.vue | 7 +++++++ .../processCenter/processForm/evaluationProcess/index.vue | 2 +- .../processCenter/processForm/handshakeProcess/index.vue | 2 +- .../processCenter/processForm/regulatoryProcess/index.vue | 2 +- .../processCenter/processForm/taskListProcess/index.vue | 2 +- .../projectManagement/components/listOfRegulations.vue | 2 +- 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 5d8242925..8981f9504 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -333,7 +333,7 @@ value.id = this.getUUID() value.currentUserName = this.userInfo().username Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } @@ -364,7 +364,7 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 8dd8ec28a..a64a58ba0 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -217,7 +217,7 @@ }, { title: this.$t('feedbackTime'), - dataIndex: 'updateTime', + dataIndex: 'feedbackTime', align: 'center', ellipsis: true, width: 160 diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index d851a0ecf..d5ebba0a4 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -537,7 +537,7 @@ if (value[res] && value[res] instanceof Array) { value[res] = value[res].join(',') } - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } @@ -579,7 +579,7 @@ }, completeTask(value, taskId) { Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 20843f030..0e1348394 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -98,6 +98,7 @@ import { getAction, postAction } from '@/api/manage' import uploadFile from '@/components/uploadFile/file' import viewFileModel from '@/components/viewFileModel/index' + import moment from 'moment' export default { name: 'evaluatorFeedback', @@ -345,6 +346,12 @@ return } } + if (this.$route.query.taskDefinitionKey == 'pgrqr'){ + let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + for (let i = 0; i < this.dataSource.length; i++) { + this.dataSource[i].feedbackTime = feedbackTime + } + } callBack && callBack(this.dataSource) }, preservationData(callBack) { diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 84123fb01..8176a68b9 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -313,7 +313,7 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 533a748a9..cc254ac6e 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -267,7 +267,7 @@ let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.operatorTime = operatorTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 71cb5ac64..43ad09a5c 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -176,7 +176,7 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 653d756c2..92f24d749 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -346,7 +346,7 @@ let json = Object.assign(this.queryBy, value) let data = JSON.stringify(json).replace(/\"/g, '\'') Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 13b17f49b..8b943d1a5 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1787,7 +1787,7 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } From c351b713750a687013982eddf9ad81cb359c8f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Fri, 26 Aug 2022 14:56:48 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/components/evaluatorFeedbackList.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 0e1348394..169b650a2 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -355,6 +355,12 @@ callBack && callBack(this.dataSource) }, preservationData(callBack) { + if (this.$route.query.taskDefinitionKey == 'pgrqr'){ + let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + for (let i = 0; i < this.dataSource.length; i++) { + this.dataSource[i].feedbackTime = feedbackTime + } + } callBack && callBack(this.dataSource) }, accessoryFileClick(item) { From fab70cc8c9cf774b6ce4db186de49b2a931941b2 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 26 Aug 2022 15:00:27 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 5 +++++ .../entity/LawsTechnologyEvaluationItemResultEO.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6a24c7bd5..c408ef57e 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -966,3 +966,8 @@ ADD COLUMN `related_areas_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4 ADD COLUMN `source_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源中文' AFTER `related_areas_en`, ADD COLUMN `time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期' AFTER `source_cn`, ADD COLUMN `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源英文' AFTER `time`; + + +-- 法规技术评估 条款项评估结果表增加字段。 2022-08-26 +ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` + ADD COLUMN `feedback_time` datetime NULL COMMENT '反馈时间' AFTER `laws_technology_evaluation_id`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java index 5ab32f3d2..770cf937b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java @@ -135,6 +135,11 @@ public class LawsTechnologyEvaluationItemResultEO implements Serializable { @ApiModelProperty(value = "发起人反馈") private java.lang.String sponsorFeedback; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "反馈时间") + private java.util.Date feedbackTime; + /**法规技术评估表id*/ @ApiModelProperty(value = "法规技术评估表id") private java.lang.String lawsTechnologyEvaluationId; From 7c3855705feacfaebd8aaaec1f220f7bde10f8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Fri, 26 Aug 2022 15:03:10 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/documentTools/searchCenter/components/whole.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index 70660ed12..e94a8bea7 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -21,7 +21,7 @@