From d6fbd52e1a129498c0913940d0b04382c46bc8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Tue, 6 Sep 2022 11:57:50 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 3 +- .../processForm/handshakeProcess/index.vue | 10 +-- .../components/listEditModel.vue | 62 ++++++++++++++++++- .../components/listOfRegulationsView.vue | 61 +++++++++++++++++- 5 files changed, 127 insertions(+), 11 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0f184b54f..2173516e1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1283,4 +1283,6 @@ module.exports = { rejectReason:'Reject Reason', collectionLegislativeComments:'Collection of Legislative Comments', regulatoryAndTechnicalAssessment:'Regulatory and technical assessment', + listConfirmationRejectionReason:'List confirmation rejection reason', + taskConfirmationRejectionReason:'Task confirmation rejection reason' } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 45c33af9a..aef1cdb45 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1385,5 +1385,6 @@ module.exports = { rejectReason:'拒绝原因', collectionLegislativeComments:'法规意见收集', regulatoryAndTechnicalAssessment:'法规技术评估', - + listConfirmationRejectionReason:'清单确认驳回原因', + taskConfirmationRejectionReason:'任务确认驳回原因' } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index ec731f550..41fa34ad3 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -189,8 +189,8 @@ rejectUserId:this.userInfo().id, rejectTime:rejectTime, rejectCause:rejectCause, - projectLawsInventoryId:ids.join(','), - rejectType:'0', + projectLawsInventoryId:ids, + rejectType:'1', } postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => { @@ -198,9 +198,9 @@ }, completeTask(value, handlingTime) { let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value) - // if (json.flag == '1'){ - // this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id) - // } + if (json.flag == '1'){ + this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id) + } Object.keys(json).forEach(res => { if (json[res] && typeof json[res] == 'string') { json[res] = json[res].replace(/\"/g, '“') diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 9d45f7dec..15205e741 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -805,8 +805,9 @@
- {{$t('reasonsForRejection')}} + {{$t('listConfirmationRejectionReason')}}
+
@@ -847,6 +848,51 @@
+ +
+ {{$t('taskConfirmationRejectionReason')}} +
+ +
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -881,6 +927,7 @@ visible: false, confirmLoading: false, rules: {}, + rejectCauseListOne: [], rulesData: { subtitle: [ { @@ -966,9 +1013,20 @@ } getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => { if (res.success) { - this.rejectCauseList = res.result + this.rejectCauseList = [] + this.rejectCauseListOne = [] + if (res.result && res.result.length > 0) { + res.result.forEach(val => { + if (val.rejectType == '0') { + this.rejectCauseList.push(val) + } else if (val.rejectType == '1') { + this.rejectCauseListOne.push(val) + } + }) + } } else { this.rejectCauseList = [] + this.rejectCauseListOne = [] } }) }, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue index d95bdb5cc..e3f3da2b7 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -434,7 +434,7 @@
- {{$t('reasonsForRejection')}} + {{$t('listConfirmationRejectionReason')}}
@@ -476,6 +476,49 @@
+
+ {{$t('taskConfirmationRejectionReason')}} +
+
+ + +
+
+ {{$t('rejectedBy')}} +
+
+ {{item.createBy ? item.createBy : '--'}} +
+
+ + +
+
+ {{$t('rejectionTime')}} +
+
+ {{item.rejectTime ? item.rejectTime : '--'}} +
+
+ + + + +
+
+ {{$t('rejectReason')}} +
+
+ {{item.rejectCause ? item.rejectCause : '--'}} +
+
+ + +
@@ -507,7 +550,8 @@ formInline: {}, disabled: false, userInfoQuery: {}, - rejectCauseList:[] + rejectCauseList:[], + rejectCauseListOne:[] } }, mounted() { @@ -527,9 +571,20 @@ } getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => { if (res.success) { - this.rejectCauseList = res.result + this.rejectCauseList = [] + this.rejectCauseListOne = [] + if (res.result && res.result.length > 0) { + res.result.forEach(val => { + if (val.rejectType == '0') { + this.rejectCauseList.push(val) + } else if (val.rejectType == '1') { + this.rejectCauseListOne.push(val) + } + }) + } } else { this.rejectCauseList = [] + this.rejectCauseListOne = [] } }) }, From 7d5107c2267d52c855c16dba59feca98615e4883 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 6 Sep 2022 13:33:26 +0800 Subject: [PATCH 2/8] =?UTF-8?q?bug-=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 21 +++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 0734ca5ae..9fb7eaed8 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -291,10 +291,7 @@ export default { userData: {}, wrapperCol: { span: 16 }, contentVisible: false, //条款内容弹框显示 - queryParams: { - pageNo: 1, - pageSize: 10 - }, + queryParams: {}, pageSize: 10, pageNo: 1, disabled:false, @@ -747,7 +744,7 @@ export default { } }, pageOnChange(page, pageSize) { - this.queryParams.pageNo = page + this.pageNo = page this.loadData() }, addModelList() { @@ -761,6 +758,8 @@ export default { //获取列表数据 loadData(item) { this.queryParams.supFolder = this.menuId + this.queryParams.pageNo= this.pageNo + this.queryParams.pageSize= this.pageSize let params = { ...this.queryParams, ...item, @@ -785,10 +784,8 @@ export default { }, //清空 searchReset() { - this.queryParams = { - pageNo: 1, - pageSize: 10 - } + this.pageNo = 1 + this.queryParams = {} this.loadData() }, //新增 @@ -942,13 +939,13 @@ export default { }, //点击页数 onChangePage(page, pageSize) { - this.queryParams.pageNo = page + this.pageNo = page this.loadData() }, //一页显示条数 SizeChange(page, pageSize) { - this.queryParams.pageSize = pageSize - this.queryParams.pageNo = 1 + this.pageSize = pageSize + this.pageNo = 1 this.loadData() }, // 上传文件 From 81d42bc853f036e9f37f0a0527c1b59a5bb33e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Tue, 6 Sep 2022 15:29:32 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index aef1cdb45..c602b27d6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -834,7 +834,7 @@ module.exports = { feedbackMessage: '反馈意见', result: '结果', opinion: '意见', - operationNode: '操作节点', + OperationNode: '操作节点', selectInquiry: '选择询问人', sendBack: '退回', taskConfirmationProcess: '任务确认流程', From bb758e019e982a11729e5e0813e54e40d33d732a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 6 Sep 2022 15:46:07 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=BC=96=E8=BE=91es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/shiro/ShiroConfig.java | 1 + .../BussDocumentLibraryEOServiceImpl.java | 43 +++++++++++++------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index dc48bf546..94b42ba42 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -95,6 +95,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件预览 filterChainDefinitionMap.put("/sys/split/file/**", "anon");//图片预览 filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件 + filterChainDefinitionMap.put("/document/bussDocumentLibraryEO/updateES", "anon");//编辑ES数据 filterChainDefinitionMap.put("/", "anon"); filterChainDefinitionMap.put("/doc.html", "anon"); filterChainDefinitionMap.put("/**/*.js", "anon"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 56c3395e4..22b76897a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2250,7 +2250,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); @@ -2360,8 +2366,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldDate = fieldDateList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); //处理时间类型 @@ -5737,11 +5746,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : map.entrySet()) { String key = entry.getKey(); - String value = (String) entry.getValue(); - if (dbFieldName.equals(key)) { - List files = oSSFileAll.stream().filter(e -> StringUtils.isNotBlank(value) && value.equals(e.getConnectId())).collect(Collectors.toList()); - if (files.size() != 0) { - result.addAll(files); + if(!"create_time".equals(key) + && !"update_time".equals(key) + && !"issue_time".equals(key) + && !"implement_time".equals(key) + && !"xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(key)){ + String value = (String) entry.getValue(); + if (dbFieldName.equals(key)) { + List files = oSSFileAll.stream().filter(e -> StringUtils.isNotBlank(value) && value.equals(e.getConnectId())).collect(Collectors.toList()); + if (files.size() != 0) { + result.addAll(files); + } } } } From 5ac7a31ebc4afb1ab06bbf0907d544f151fee89f Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 6 Sep 2022 16:20:59 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E7=9A=84=20=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E8=AF=84=E4=BC=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=20=EF=BC=88=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=9C=A8=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=A1=A8=E4=B8=AD=E6=B2=A1=E6=9C=89=E7=9A=84?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/shiro/ShiroConfig.java | 1 + .../ConditionAssessmentEOController.java | 11 +++++ .../IConditionAssessmentEOService.java | 6 +++ .../ConditionAssessmentEOServiceImpl.java | 45 +++++++++++++++++++ .../impl/DocumentSearchServiceImpl.java | 2 +- 5 files changed, 64 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index dc48bf546..9b47168c2 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -155,6 +155,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口，事件订阅配置。 filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口，卡片消息配置。 filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口 + filterChainDefinitionMap.put("/project/projectTaskInventoryConditionAssessmentEO/initConditionAssessment", "anon"); // 初始化项目当前状态数据接口 // 添加自己的过滤器并且取名为jwt Map filterMap = new HashMap(1); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java index 197e40252..ad06d8cf6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java @@ -195,4 +195,15 @@ public class ConditionAssessmentEOController extends JeroController addOrUpdateConditionAssessmentBatch(@RequestBody ConditionAssessmentVO conditionAssessmentVO) { return conditionAssessmentEOService.addOrUpdateBatch(conditionAssessmentVO); } + + /** + * 初始化当前项目状态评估数据 （法规清单在项目状态评估表中没有的） + */ + @AutoLog(value = "任务清单-项目状态评估表-初始化当前项目状态评估数据") + @ApiOperation(value="任务清单-项目状态评估表-初始化当前项目状态评估数据", notes="任务清单-项目状态评估表-初始化当前项目状态评估数据") + @GetMapping(value = "/initConditionAssessment") + public Result initConditionAssessment(@RequestParam Map params) { + this.conditionAssessmentEOService.initConditionAssessment(params); + return Result.OK("初始化数据成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java index ff5ad39bd..da659aaea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java @@ -98,4 +98,10 @@ public interface IConditionAssessmentEOService extends IService addOrUpdateBatch(ConditionAssessmentVO conditionAssessmentVO); + + /** + * 初始化项目当前状态数据 + * @param params + */ + void initConditionAssessment(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java index 2f28cb299..a09f4568d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java @@ -5,14 +5,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ConditionAssessmentEO; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectTaskInventoryEO; +import com.jero.modules.project.enums.CurrentProjectStatusEnum; import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.mapper.ConditionAssessmentEOMapper; import com.jero.modules.project.service.IConditionAssessmentEOService; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.vo.ConditionAssessmentVO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -27,6 +31,9 @@ import java.util.stream.Collectors; @Service public class ConditionAssessmentEOServiceImpl extends ServiceImpl implements IConditionAssessmentEOService { + @Autowired + private IProjectLawsInventoryEOService projectLawsInventoryEOService; + /** * 保存 * @@ -317,4 +324,42 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl params) { + String projectLibraryId = (String) params.get("projectLibraryId"); + + QueryWrapper lawsInventoryQueryWrapper = new QueryWrapper<>(); + if(StringUtils.isNotEmpty(projectLibraryId)){ + //如果项目库id不为空，只处理这一个项目下的数据。 + lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + } + List lawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryQueryWrapper); + if(CollectionUtils.isNotEmpty(lawsInventoryEOList)){ + QueryWrapper conditionAssessmentQueryWrapper = new QueryWrapper<>(); + List conditionAssessmentEOList = this.baseMapper.selectList(conditionAssessmentQueryWrapper); + + //过滤出，没有项目当前状态数据的法规清单数据 + lawsInventoryEOList = lawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag = true; + for (ConditionAssessmentEO conditionAssessmentEO : conditionAssessmentEOList) { + if(StringUtils.equals(lawsInventory.getId(),conditionAssessmentEO.getProjectLawsInventoryId())){ + flag = false; + break; + } + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(lawsInventoryEOList)){ + for (ProjectLawsInventoryEO lawsInventory : lawsInventoryEOList) { + ConditionAssessmentEO conditionAssessmentEO = new ConditionAssessmentEO(); + conditionAssessmentEO.setRoleCode(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue()); + conditionAssessmentEO.setProjectLawsInventoryId(lawsInventory.getId()); + conditionAssessmentEO.setConditionAssessment(CurrentProjectStatusEnum.BLUE.getValue()); + this.addOrUpdate(conditionAssessmentEO); + } + } + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 8b96ccbf8..a3082a93e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -1519,7 +1519,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { list1.add(""); mapTemp.put("pre_tags", list); mapTemp.put("post_tags", list1); - mapTemp.put("fragment_size", 280);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("fragment_size", 500);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("type", "plain"); mapHighlight.put(key, mapTemp); From 22dad688cc77d3c2fd05e5a8eb0252e45c99bdcb Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 6 Sep 2022 17:09:44 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=9B=BD=E6=97=97=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=AE=8C=E5=96=84=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 | 3 +++ .../static/nationalFlag/Australia.png | Bin 156678 -> 44350 bytes .../main/resources/static/nationalFlag/EU.png | Bin 131749 -> 29398 bytes .../resources/static/nationalFlag/Japan.png | Bin 66705 -> 7001 bytes .../static/nationalFlag/Malaysia.png | Bin 80076 -> 38017 bytes .../static/nationalFlag/NewZealand.png | Bin 202396 -> 39847 bytes .../static/nationalFlag/Singapore.png | Bin 67588 -> 9419 bytes .../static/nationalFlag/SouthKorea.png | Bin 119903 -> 39791 bytes .../static/nationalFlag/TaiWanChina.png | Bin 0 -> 312077 bytes .../resources/static/nationalFlag/UAE.png | Bin 47628 -> 3928 bytes .../main/resources/static/nationalFlag/UK.png | Bin 86656 -> 9746 bytes .../main/resources/static/nationalFlag/US.png | Bin 130203 -> 25874 bytes 12 files changed, 3 insertions(+) create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/TaiWanChina.png diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 69fe0390a..f953c4c62 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1084,3 +1084,6 @@ COMMENT='清单确认-拒绝原因表' ROW_FORMAT=DYNAMIC ; +-- 增加 中国台湾 国旗数据 2022-09-06 +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('28', NULL, NULL, NULL, NULL, NULL, '中国台湾', 'Tai Wan China', NULL, '/jero-boot/nationalFlag/TaiWanChina.png'); + diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png index 2c4a076c2af2df0b7f34b2350c491f16d60d9899..f93a94a0e6001ad4dc012949f035dc4687225727 100644 GIT binary patch literal 44350 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