diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index b18b292ff..e31b0a1fc 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -927,3 +927,34 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Status' WHERE UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Responsible Field' WHERE `id` = 'ed57f77975218560b37ea497a20109c6'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Filled by' WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Eng. Interface' WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b'; + +-- 国家国旗表 增加旗帜 2022-08-16 +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 ('14', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '/jero-boot/nationalFlag/GCC.png'); +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 ('15', NULL, NULL, NULL, NULL, NULL, '巴西', 'Brazil', NULL, '/jero-boot/nationalFlag/Brazil.png'); +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 ('16', NULL, NULL, NULL, NULL, NULL, '德国', 'Germany', NULL, '/jero-boot/nationalFlag/Germany.png'); +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 ('17', NULL, NULL, NULL, NULL, NULL, '俄国', 'Russia', NULL, '/jero-boot/nationalFlag/Russia.png'); +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 ('18', NULL, NULL, NULL, NULL, NULL, '菲律宾', 'Philippines', NULL, '/jero-boot/nationalFlag/Philippines.png'); +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 ('19', NULL, NULL, NULL, NULL, NULL, '加拿大', 'Canada', NULL, '/jero-boot/nationalFlag/Canada.png'); +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 ('20', NULL, NULL, NULL, NULL, NULL, '墨西哥', 'Mexico', NULL, '/jero-boot/nationalFlag/Mexico.png'); +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 ('21', NULL, NULL, NULL, NULL, NULL, '挪威', 'Norway', NULL, '/jero-boot/nationalFlag/Norway.png'); +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 ('22', NULL, NULL, NULL, NULL, NULL, '泰国', 'Thailand', NULL, '/jero-boot/nationalFlag/Thailand.png'); +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 ('23', NULL, NULL, NULL, NULL, NULL, '印度', 'Hindustan', NULL, '/jero-boot/nationalFlag/Hindustan.png'); +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 ('24', NULL, NULL, NULL, NULL, NULL, '印尼', 'Indonesia', NULL, '/jero-boot/nationalFlag/Indonesia.png'); +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 ('25', NULL, NULL, NULL, NULL, NULL, '越南', 'Vietnam', NULL, '/jero-boot/nationalFlag/Vietnam.png'); +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 ('26', NULL, NULL, NULL, NULL, NULL, '智利', 'Chile', NULL, '/jero-boot/nationalFlag/Chile.png'); +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 ('27', NULL, NULL, NULL, NULL, NULL, '中国香港', 'Hong Kong China', NULL, '/jero-boot/nationalFlag/HongKongChina.png'); +-- 删除之前的3中国香港 和8海湾地区 +delete from country_national_flag where id in ('3','8'); + +-- 法规流程历史表增加字段 审批意见 2022-08-16 +ALTER TABLE `laws_weilai`.`laws_process_history` + ADD COLUMN `approval_opinion` varchar(2000) NULL COMMENT '审批意见' AFTER `flow_type`; + +--- 用户表 删除工号唯一索引 2022-08-18 +ALTER TABLE `laws_weilai`.`sys_user` +DROP INDEX `uniq_sys_user_work_no`; + + +-- 工作流 流程表增加流程名称 英文字段 2022-08-19 +ALTER TABLE `laws_weilai_wkflow`.`bus_process_name` + ADD COLUMN `PRC_NAME_EN` varchar(255) NULL COMMENT '流程名称（英文）' AFTER `PROJECT_LAWS_INVENTORY_ID`; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 0bba80865..844f7bebe 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -36,6 +36,7 @@ import com.jero.modules.cert.report.service.*; import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; import com.jero.modules.cert.template.enums.ControlTypeEnum; +import com.jero.modules.cert.template.enums.ParamsIsMustEnum; import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOService; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.feishu.service.IFeishuService; @@ -528,147 +529,196 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryList(ParamsReportDetailEO paramsReportDetailEO, + public Result queryList(ParamsReportDetailVO paramsReportDetailVO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="100") Integer pageSize, @RequestParam(name = "cut") String cut) { - if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) { - paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailVO.getNioNumber())) { + paramsReportDetailVO.setNioNumber(paramsReportDetailVO.getNioNumber().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsReportDetailEO.getParamsName())) { - paramsReportDetailEO.setParamsName(paramsReportDetailEO.getParamsName().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailVO.getParamsName())) { + paramsReportDetailVO.setParamsName(paramsReportDetailVO.getParamsName().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsReportDetailEO.getSdt())) { - paramsReportDetailEO.setSdt(paramsReportDetailEO.getSdt().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailVO.getSdtName())) { + paramsReportDetailVO.setSdt(paramsReportDetailVO.getSdtName().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsReportDetailEO.getDre())) { - paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailVO.getDreName())) { + paramsReportDetailVO.setDre(paramsReportDetailVO.getDreName().replace("%","\\%")); } IPage page = new Page(pageNo, pageSize); + ParamsReportDetailEO paramsReportDetailEO = new ParamsReportDetailEO(); + BeanUtils.copyProperties(paramsReportDetailVO, paramsReportDetailEO); IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index fd2ac0176..5ac86ab0a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -26,6 +26,7 @@ import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper; import com.jero.modules.cert.report.service.*; import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import com.jero.modules.cert.template.enums.ControlTypeEnum; +import com.jero.modules.cert.template.enums.ParamsIsMustEnum; import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; @@ -274,147 +275,196 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); if (CollectionUtil.isNotEmpty(ossFileList)) { @@ -1078,7 +1132,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl fileNameList = new ArrayList<>(); - paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> { + for(ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOS) { if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { List ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); if (CollectionUtil.isNotEmpty(ossFileList)) { @@ -1087,16 +1141,17 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); } } } @@ -265,7 +265,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); } } } @@ -357,7 +357,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if (cut.equals(CutEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re-select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java index 3b1ea5267..40e1d088a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java @@ -8,9 +8,14 @@ package com.jero.modules.document.enums; public enum SearchEnum { INDEX_NAME_DOCUMENT("文档库索引名称","documentLibrary"), TYPE_NAME_DOCUMENT("文档库类型","document"), + INDEX_NAME_LAWS_MONTHLY_REPORT("法规月报索引名称","lawsMonthlyReportManage"), + TYPE_NAME_LAWS_MONTHLY_REPORT("法规月报类型名称","lawsMonthlyReport"), FULL_TEXT_SEARCH("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"), - FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen"); + FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen"), + INDEX_PROBLEM_KNOWLEDGE_BASE("问题知识库索引名称","problemKnowledgeBase"), + TYPE_PROBLEM_KNOWLEDGE_BASE_CN("问题知识库类型","problemKnowledgeBaseTypeCn"), + TYPE_PROBLEM_KNOWLEDGE_BASE_EN("问题知识库类型","problemKnowledgeBaseTypeEn"); String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 0fec9671c..4c6513783 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -86,7 +86,7 @@ public class ExtRepoDataController extends JeroController= 2) { - queryWrapper.between(ExtRepoData::getCreateTime, createTimeArr[0], createTimeArr[1]); + queryWrapper.between(ExtRepoData::getCreateTime, createTimeArr[0]+" 00:00:00", createTimeArr[1]+" 23:59:59"); } } queryWrapper.eq(ExtRepoData::getSupFolder, extRepoData.getSupFolder()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java index e7e09c63d..c306bee74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java @@ -97,4 +97,7 @@ public class LawsProcessHistoryEO implements Serializable { @ApiModelProperty(value = "流程类型") private String flowType; + /**审批意见*/ + @ApiModelProperty(value = "审批意见") + private String approvalOpinion; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java index 64c64e77f..bf1e5ac43 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java @@ -59,6 +59,6 @@ public class LawsOpinionGatherJob implements Job { } } } - log.info("法规意见收集流程，定时任务开启 ====================================================="); + log.info("法规意见收集流程，定时任务结束 ====================================================="); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml index 43244944a..6b0c07368 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/mapper/xml/LawsProcessHistoryEOMapper.xml @@ -14,5 +14,6 @@ + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index 7ab5d17ce..9ca5ddf32 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -208,8 +208,7 @@ public class LawsTechnologyEvaluationEOController extends JeroController importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception { - List> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); - return Result.OK(result); + return this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); } @ApiOperation(value="根据id查询明细数据", notes="根据id查询明细数据") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index a0b58fab0..bac8a0c3c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -85,7 +85,7 @@ public interface ILawsTechnologyEvaluationEOService extends IService> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; + Result importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; List> queryPageDummyById(Map parameter); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index b02e02d74..5d2f587ec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -312,7 +312,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception { + public Result importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception { //校验文件格式 int pos = file.getOriginalFilename().lastIndexOf("."); String fileSuffixStr = file.getOriginalFilename().substring(pos+1).toLowerCase(); @@ -367,7 +367,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl itemInfoMap = new HashMap<>(); String itemId = UUID.randomUUID().toString().replace("-", ""); itemInfoMap.put("itemId",itemId); @@ -421,9 +444,17 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> dataList,String cut){ + //存放数据验证结果信息 + List stringMessage = new ArrayList<>(); + + int i = 0; + + for (Map map : dataList) { + i++; + + int countError = 0; //记录失败数据数量 + String errorMsg = ""; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg = "第" + i + "行："; + }else{ + errorMsg = i + " line："; + } + + String itemNum = (String) map.get("itemNum"); + String itemName = (String) map.get("itemName"); + String itemContent = (String) map.get("itemContent"); + + if(StringUtils.isEmpty(itemNum)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款号不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item No. cannot be empty;"; + } + countError++; + }else if(itemNum.length() > 100){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款号长度不能超过100;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item No. length of the cannot exceed 100;"; + } + countError++; + } + + if(StringUtils.isEmpty(itemName)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款名称不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Name cannot be empty;"; + } + countError++; + }else if(itemName.length() > 100){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款名称长度不能超过100;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Name length of the cannot exceed 100;"; + } + countError++; + } + + if(StringUtils.isEmpty(itemContent)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款内容不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Content cannot be empty;"; + } + countError++; + }else if(itemContent.length() > 500){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款内容长度不能超过500;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Content length of the cannot exceed 500;"; + } + countError++; + } + + if (countError > 0) { + errorMsg = errorMsg.substring(0,errorMsg.length()-1); + stringMessage.add(errorMsg); + } + } + + Map result = new HashMap(); + + if(CollectionUtils.isEmpty(dataList)){ + result.put("result", false); + String message = ""; + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + message = "不能导入空的模板，请检查！"; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + message = "Cannot import empty template, please check!"; + } + result.put("message", message); + }else if (stringMessage.isEmpty()) { + result.put("result", true); + result.put("resultList", dataList); + result.put("message", ""); + } else { + result.put("result", false); + String html = ""; + for (String message : stringMessage) { + html += message + "
"; + } + result.put("message", html); + } + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java index 1da77c4a4..b788927a3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java @@ -216,9 +216,12 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl List categoryList = sysCategoryService.list(); for (LawsTechnologyEvaluationItemResultEO data : datas) { String evaluationMethods = data.getEvaluationMethods(); - List evaluationMethodsList = Arrays.asList(evaluationMethods.split(",")); - String name = getTreeName(cut, categoryList, evaluationMethodsList); - data.setEvaluationMethodsName(name); + if(StringUtils.isNotEmpty(evaluationMethods)){ + List evaluationMethodsList = Arrays.asList(evaluationMethods.split(",")); + String name = getTreeName(cut, categoryList, evaluationMethodsList); + data.setEvaluationMethodsName(name); + } + if(StringUtils.isNotEmpty(data.getComplianceResult())){ data.setComplianceResultName(ComplianceResultEnum.getTextByValue(data.getComplianceResult(),cut)); } @@ -263,7 +266,7 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl title = "条款号,条款名称,条款内容,评估人,评估方式,技术文件名称,章节,符合性结果,意见,附件,反馈时间"; fileName = "条款评估结果 " + ".xlsx"; }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - title = "Item num,Item name,Item Contents,Evaluator,Evaluation methods,Name of technical document,Section,Compliance results,Opinion,Accessory,Feedback time "; + title = "Item No.,Item Name,Item Content,Assessor,Evaluation method,Name of technical document,Chapter,Compliance Results,Opinion,Enclosure,Feedback Time"; fileName = "Item Evaluation results " + ".xlsx"; } @@ -289,7 +292,7 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl //创建表头 String[] titleArr = title.split(","); for (int i=0; i<=10; i++){ - sheet.setColumnWidth(i,4000); + sheet.setColumnWidth(i,5000); Cell cell = firstRow.createCell(i); cell.setCellStyle(titleCellStyle); cell.setCellValue(titleArr[i]); @@ -402,7 +405,7 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl public String disposeDate(Date date){ String result = ""; try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if(date != null){ result = sdf.format(date); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java index 842aaafe4..6cf3c0a82 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java @@ -111,8 +111,8 @@ public class ProblemKnowledgeBaseClassifyEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - problemKnowledgeBaseClassifyEOService.deleteById(id); + public Result delete(@RequestParam(name="id",required=true) String id,@RequestParam(name="cut",required=true) String cut) { + problemKnowledgeBaseClassifyEOService.deleteById(id,cut); return Result.OK("删除成功!"); } @@ -125,8 +125,8 @@ public class ProblemKnowledgeBaseClassifyEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.problemKnowledgeBaseClassifyEOService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="cut",required=true) String cut) { + this.problemKnowledgeBaseClassifyEOService.deleteByIds(Arrays.asList(ids.split(",")),cut); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java index ec1a9448c..03682f71a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java @@ -11,7 +11,7 @@ public enum QueryFlagEnum { GET_ALL_APPLY_MARKET("获取所有的适用市场","","0"), GET_NOT_CREATE_APPLY_MARKET("获取还没有创建过countryCard的适用市场","","1"), GET_RELEASED_APPLY_MARKET("获取已发布的countryCard的适用市场","","2"), - GET_CREATE_APPLY_MARKET("获取所有已创建的countryCard的适用市场","","3"), + GET_CREATE_APPLY_MARKET("获取所有自己已创建的countryCard的适用市场","","3"), ; String cnName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java index 00564d0f1..2ea94a93f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java @@ -34,7 +34,7 @@ public interface IProblemKnowledgeBaseClassifyEOService extends IService ids); + void deleteByIds(List ids,String cut); /** * 通过id查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index 8e211b19a..2dc1c22fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -6,6 +6,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.entity.CountryNationalFlagEO; @@ -19,6 +20,7 @@ import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -257,13 +259,15 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseClassifyEOService { @Autowired private ISysUserService sysUserService; + @Autowired + private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService; /** * 保存 @@ -65,7 +72,8 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl ids) { + public void deleteByIds(List ids,String cut) { + checkData(ids,cut); removeByIds(ids); } @@ -144,4 +153,21 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl idList,String cut){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(ProblemKnowledgeBaseEO::getProblemType,idList); + List problemKnowledgeBaseEOS = this.problemKnowledgeBaseEOService.list(queryWrapper); + if(CollectionUtils.isNotEmpty(problemKnowledgeBaseEOS)){ + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + throw new JeroBootException("分类不能删除，已经被问题知识库引用！"); + }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ + throw new JeroBootException("Classification cannot be deleted, has been referenced by the problem knowledge base!"); + } + } + } } 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 11921430d..f1c728345 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 @@ -1,22 +1,33 @@ package com.jero.modules.problemKnowledgeBase.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.es.JeroElasticsearchTemplate; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.document.enums.SearchEnum; +import com.jero.modules.document.utils.ReadPdfUtil; +import com.jero.modules.document.utils.ReadWordUtil; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.problemKnowledgeBase.entity.*; import com.jero.modules.problemKnowledgeBase.enums.CollectStatusEnum; import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum; import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum; import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.*; +import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum; import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.*; @@ -50,6 +61,16 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl> mapListTempCn = new ArrayList<>(); + List> mapListTempEn = new ArrayList<>(); + + //查询该数据的文件。 + StringBuffer fileTextSb = new StringBuffer(); + List accessoryFileList = iOSSFileService.getFileInfos(problemKnowledgeBaseEO.getAccessoryFile()); + if(CollectionUtils.isNotEmpty(accessoryFileList)){ + for (OSSFile ossFile : accessoryFileList) { + String fileText = ""; + // 读取文件内容 + if (ossFile.getFileName().endsWith(".doc") + || ossFile.getFileName().endsWith(".docx") + || ossFile.getFileName().endsWith(".DOC") + || ossFile.getFileName().endsWith(".DOCX")) { + + String wordContent = null; + try { + wordContent = ReadWordUtil.readWord(ossFile.getUrl(),uploadpath); + } catch (Exception e) { + log.error("文档库: 读取word内容失败"); + } + if (StringUtils.isNotBlank(wordContent)) { + fileText = ossFile.getFileName() + " : " +wordContent; + } + } else if (ossFile.getFileName().endsWith(".pdf") || ossFile.getFileName().endsWith(".PDF")) { + String pdfContent = null; + try { + pdfContent = ReadPdfUtil.readPdf(ossFile.getUrl()); + } catch (Exception e) { + log.error("文档库: 读取PDF文件内容失败"); + } + if (StringUtils.isNotBlank(pdfContent)) { + fileText = ossFile.getFileName() + " : " + pdfContent; + } + } + + fileTextSb.append(fileText); + fileTextSb.append("\n"); + } + } + + //sbCn sbEn 这两个字段作为es中英文切换 + StringBuilder sbCn = new StringBuilder(); + esFullText(problemKnowledgeBaseEO,sbCn,null,CutEnum.CN.getValue(),fileTextSb.toString()); + StringBuilder sbEn = new StringBuilder(); + esFullText(problemKnowledgeBaseEO,null,sbEn,CutEnum.EN.getValue(),fileTextSb.toString()); + + Map stringMapCn = new HashMap<>(); + this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapCn); + + Map stringMapEn = new HashMap<>(); + this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapEn); + + this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCn,SEARCH_FLAG,"问题知识库"); + this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEn,SEARCH_FLAG,"Problem knowledge base"); + + Map stringMapCnBase = new HashMap<>(); + this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapCnBase); + Map stringMapEnBase = new HashMap<>(); + this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapEnBase); + this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCnBase,null,"问题知识库"); + this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEnBase,null,"Problem knowledge base"); + + mapListTempCn.add(stringMapCn); + mapListTempEn.add(stringMapEn); + + stringMapCnBase.put("id",problemKnowledgeBaseId + "base"); + mapListTempCn.add(stringMapCnBase); + + stringMapEnBase.put("id",problemKnowledgeBaseId + "base"); + mapListTempEn.add(stringMapEnBase); + + JSONObject jsonObjectCn = JSON.parseObject(JSON.toJSONString(stringMapCn)); + JSONObject jsonObjectEn = JSON.parseObject(JSON.toJSONString(stringMapEn)); + JSONArray arrayCn = JSONArray.parseArray(JSON.toJSONString(mapListTempCn)); + JSONArray arrayEn = JSONArray.parseArray(JSON.toJSONString(mapListTempEn)); + + try { + this.deleteElasticsearchData(problemKnowledgeBaseId); + + //问题知识库索引添加数据 + this.jeroElasticsearchTemplate.saveOrUpdate(SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_EN.getValue(), SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_EN.getValue(), problemKnowledgeBaseId, jsonObjectEn); + this.jeroElasticsearchTemplate.saveOrUpdate(SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_CN.getValue(), SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_CN.getValue(), problemKnowledgeBaseId, jsonObjectCn); + //全部索引添加数据 + this.jeroElasticsearchTemplate.saveBatch(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), arrayCn); + this.jeroElasticsearchTemplate.saveBatch(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), arrayEn); + } catch (Exception e) { + e.printStackTrace(); + log.error("问题知识库添加es失败"); + } + } + + /** + * 根据问题知识库id删除es中数据 + * @param problemKnowledgeBaseId + */ + public void deleteElasticsearchData(String problemKnowledgeBaseId){ + try { + //根据id删除全部索引中数据 + this.jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), problemKnowledgeBaseId); + this.jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), problemKnowledgeBaseId); + + //根据id删除全部索引中数据 + this.jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), problemKnowledgeBaseId + "base"); + this.jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), problemKnowledgeBaseId + "base"); + + //根据id删除问题知识库索引中数据 + this.jeroElasticsearchTemplate.delete(SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_CN.getValue(), SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_CN.getValue(), problemKnowledgeBaseId); + this.jeroElasticsearchTemplate.delete(SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_EN.getValue(), SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_EN.getValue(), problemKnowledgeBaseId); + }catch (Exception ex){ + ex.printStackTrace(); + log.error("问题知识库根据id删除es数据失败，问题知识库id为：" + problemKnowledgeBaseId); + } + } + + public void esFullText(ProblemKnowledgeBaseEO problemKnowledgeBaseEO,StringBuilder sbCn,StringBuilder sbEn,String cut,String fileText){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions_dicText())){ + sbCn.append("展示权限" + ":" + problemKnowledgeBaseEO.getShowPermissions_dicText() + " "); + }else { + sbCn.append("展示权限" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getTitle())){ + sbCn.append("标题" + ":" + problemKnowledgeBaseEO.getTitle() + " "); + }else { + sbCn.append("标题" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getProblemTypeName())){ + sbCn.append("问题分类" + ":" + problemKnowledgeBaseEO.getProblemTypeName() + " "); + }else { + sbCn.append("问题分类" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getTargetMarket_dicText())){ + sbCn.append("市场" + ":" + problemKnowledgeBaseEO.getTargetMarket_dicText() + " "); + }else { + sbCn.append("市场" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getStandNumber())){ + sbCn.append("标准编号" + ":" + problemKnowledgeBaseEO.getStandNumber() + " "); + }else { + sbCn.append("标准编号" + ":" + "-- "); + } + + /*if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getStandTitle())){ + sbCn.append("标准标题" + ":" + problemKnowledgeBaseEO.getStandTitle() + " "); + }else { + sbCn.append("标准标题" + ":" + "-- "); + }*/ + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getContent())){ + sbCn.append("内容" + ":" + problemKnowledgeBaseEO.getContent() + " "); + }else { + sbCn.append("内容" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(fileText)){ + sbCn.append("附件内容" + ":" + fileText + " "); + }else { + sbCn.append("附件内容" + ":" + "-- "); + } + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){ + sbEn.append("Display permission" + ":" + problemKnowledgeBaseEO.getShowPermissions() + " "); + }else { + sbEn.append("Display permission" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getTitle())){ + sbEn.append("Title" + ":" + problemKnowledgeBaseEO.getTitle() + " "); + }else { + sbEn.append("Title" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getProblemTypeName())){ + sbEn.append("Problem classification" + ":" + problemKnowledgeBaseEO.getProblemTypeName() + " "); + }else { + sbEn.append("Problem classification" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getTargetMarket())){ + sbEn.append("Market" + ":" + problemKnowledgeBaseEO.getTargetMarket() + " "); + }else { + sbEn.append("Market" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getStandNumber())){ + sbEn.append("Standard No" + ":" + problemKnowledgeBaseEO.getStandNumber() + " "); + }else { + sbEn.append("Standard No" + ":" + "-- "); + } + + /*if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getStandTitle())){ + sbEn.append("Standard Title" + ":" + problemKnowledgeBaseEO.getStandTitle() + " "); + }else { + sbEn.append("Standard Title" + ":" + "-- "); + }*/ + + if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getContent())){ + sbEn.append("Content" + ":" + problemKnowledgeBaseEO.getContent() + " "); + }else { + sbEn.append("Content" + ":" + "-- "); + } + + if(StringUtils.isNotEmpty(fileText)){ + sbEn.append("Accessory File content" + ":" + fileText + " "); + }else { + sbEn.append("Accessory File content" + ":" + "-- "); + } + } + } + + public void putMap(String id,String content,String cut,Map map,String flag,String moduleType){ + map.put("id",id); + map.put("module_type_flag", ModuleTypeFlagEnum.PROBLEM_KNOWLEDGE_BASE_CLASSIFY.getValue()); // 默认法规月报标识 + map.put("module_type", moduleType); + map.put("content",content); + map.put("flag",flag); + } + + /** + * 问题知识库对象转Map，根据中英文切换字段转 + * @param problemKnowledgeBaseEO 问题知识库对象 + * @param cut 中英文切换标识 值对应CutEnum枚举类 + * @param convertAfterMap 转换后的Map + */ + public void problemKnowledgeBaseEOConvertMapByCut(ProblemKnowledgeBaseEO problemKnowledgeBaseEO,String cut,Map convertAfterMap){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + convertAfterMap.put("id",problemKnowledgeBaseEO.getId()); + convertAfterMap.put("标题",problemKnowledgeBaseEO.getTitle()); + convertAfterMap.put("问题分类",problemKnowledgeBaseEO.getProblemType()); + convertAfterMap.put("市场",problemKnowledgeBaseEO.getTargetMarket()); + convertAfterMap.put("标准编号",problemKnowledgeBaseEO.getStandNumber()); + //convertAfterMap.put("标准标题",problemKnowledgeBaseEO.getStandTitle()); + convertAfterMap.put("内容",problemKnowledgeBaseEO.getContent()); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + convertAfterMap.put("id",problemKnowledgeBaseEO.getId()); + convertAfterMap.put("title",problemKnowledgeBaseEO.getTitle()); + convertAfterMap.put("problem_type",problemKnowledgeBaseEO.getProblemType()); + convertAfterMap.put("target_market",problemKnowledgeBaseEO.getTargetMarket()); + convertAfterMap.put("stand_number",problemKnowledgeBaseEO.getStandNumber()); + convertAfterMap.put("standard_title",problemKnowledgeBaseEO.getStandTitle()); + convertAfterMap.put("content",problemKnowledgeBaseEO.getContent()); + convertAfterMap.put("createTime",problemKnowledgeBaseEO.getCreateTime()); + } + } + /** * 更新 * @@ -84,7 +366,10 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl ids) { removeByIds(ids); + + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.in("problem_knowledge_base_id",ids); + this.problemKnowledgeBaseUserEOService.remove(deleteWrapper); + + this.problemKnowledgeBasePraiseEOService.remove(deleteWrapper); + + this.problemKnowledgeBaseCollectEOService.remove(deleteWrapper); + + this.problemKnowledgeBaseBrowsingHistoryEOService.remove(deleteWrapper); + + this.problemKnowledgeBaseCommentEOService.remove(deleteWrapper); + + /*for (String problemKnowledgeBaseId : ids) { + this.deleteElasticsearchData(problemKnowledgeBaseId); + }*/ } /** @@ -353,11 +654,13 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); queryWrapper.lambda().and(query -> { - query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue()). - or(o -> { + query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue()); + if(CollectionUtils.isNotEmpty(problemKnowledgeBaseIdList)){ + query.or(o -> { o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue()); o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList); }); + } }); String searchStr = problemKnowledgeBaseEO.getSearchStr(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 13c1ff160..cdc9ad495 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -7,9 +7,9 @@ public enum ProjectTaskPlanningNameEnum { // PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), // ATTESTATION_START_TIME("认证开始","Certification begins"), // ATTESTATION_END_TIME("认证结束"," End of certification"), - PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo - ATTESTATION_START_TIME("认证结束","Homo Completion"),// name:认证开始 value:Certification begins - ATTESTATION_END_TIME("认证开始","Homo KO"),// name:认证结束 value:End of certification + PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo + ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins + ATTESTATION_END_TIME("认证批准","Homo KO"),// name:认证结束 value:End of certification VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java index 639720188..d060a5ebe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java @@ -257,7 +257,7 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi title = "编号,标题,状态,技术领域,责任领域,相关项目,设计符合性,Pre-Homo确认,验证符合性"; fileName = "符合性结果" + ".xlsx"; }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - title = "Serial number,Title,State,Technology territory,Responsible Field,Relevant project,Design conformance,Pre-Homo Confirm,Verify conformance"; + title = "Number,Title,Status,Tech Field,Responsible Field,Relevant Project,Design Compliance Confirmation,Pre-Homo Confirmation,Validation Compliance Confirmation"; fileName = "Compliance results" + ".xlsx"; } OutputStream os = null; @@ -281,7 +281,7 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi //设置居中、表头值。 for (int i = 0; i < firstLineTitleArr.length; i++){ - sheet.setColumnWidth(i,5000); + sheet.setColumnWidth(i,8000); Cell cell = firstRow.createCell(i); cell.setCellStyle(titleCellStyle); cell.setCellValue(firstLineTitleArr[i]); @@ -360,66 +360,64 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi String cut = (String) params.get("cut"); List> exportData = this.lawsComplianceBoardMapper.queryComplianceResultList(params); this.disposeComplianceResult(exportData,cut); - if(CollectionUtils.isNotEmpty(exportData)){ - String title = ""; - String fileName = ""; - if(StringUtils.equals(cut, CutEnum.CN.getValue())){ - title = "责任领域,相关项目,设计符合性,Pre-Homo确认,验证符合性"; - fileName = "符合性结果" + ".xlsx"; - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - title = "Responsible Field,Relevant project,Design conformance,Pre-Homo Confirm,Verify conformance"; - fileName = "Compliance results" + ".xlsx"; + String title = ""; + String fileName = ""; + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + title = "责任领域,相关项目,设计符合性,Pre-Homo确认,验证符合性"; + fileName = "符合性结果" + ".xlsx"; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + title = "Responsible Field,Relevant Project,Design Compliance Confirmation,Pre-Homo Confirmation,Validation Compliance Confirmation"; + fileName = "Compliance results" + ".xlsx"; + } + OutputStream os = null; + HSSFWorkbook workbook = new HSSFWorkbook(); + + try { + response.setHeader("Content-Disposition", + "attachment; filename=" + fileName); + response.setContentType("application/force-download"); + + HSSFSheet sheet = workbook.createSheet("sheet1"); + + CellStyle titleCellStyle = workbook.createCellStyle(); + titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中 + titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中 + titleCellStyle.setWrapText(true);//自动换行 + + //创建表头 + String[] firstLineTitleArr = title.split(","); + Row firstRow = sheet.createRow(0); + + //设置居中、表头值。 + for (int i = 0; i < firstLineTitleArr.length; i++){ + sheet.setColumnWidth(i,8000); + Cell cell = firstRow.createCell(i); + cell.setCellStyle(titleCellStyle); + cell.setCellValue(firstLineTitleArr[i]); } - OutputStream os = null; - HSSFWorkbook workbook = new HSSFWorkbook(); - try { - response.setHeader("Content-Disposition", - "attachment; filename=" + fileName); - response.setContentType("application/force-download"); - - HSSFSheet sheet = workbook.createSheet("sheet1"); - - CellStyle titleCellStyle = workbook.createCellStyle(); - titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中 - titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中 - titleCellStyle.setWrapText(true);//自动换行 - - //创建表头 - String[] firstLineTitleArr = title.split(","); - Row firstRow = sheet.createRow(0); - - //设置居中、表头值。 - for (int i = 0; i < firstLineTitleArr.length; i++){ - sheet.setColumnWidth(i,5000); - Cell cell = firstRow.createCell(i); - cell.setCellStyle(titleCellStyle); - cell.setCellValue(firstLineTitleArr[i]); - } - - //设置导出数据 - if(CollectionUtils.isNotEmpty(exportData)) { - int rowIndex = 1; - for (int dataIndex = 0; dataIndex < exportData.size(); dataIndex++) { - Row dataRow = sheet.createRow(rowIndex); - dataRow.createCell(0).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("dutyTerritory_dicText"))); - dataRow.createCell(1).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("projectName"))); - dataRow.createCell(2).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("designFlowTaskStatus_dicText"))); - dataRow.createCell(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoFlowTaskStatus_dicText"))); - dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyFlowTaskStatus_dicText"))); - rowIndex ++; - } - } - os = response.getOutputStream(); - workbook.write(os); - os.flush(); - }catch (IOException ex){ - if(CutEnum.CN.getValue().equals(cut)){ - throw new JeroBootException("下载文件失败"); - }else{ - throw new JeroBootException("Failed to download file"); + //设置导出数据 + if(CollectionUtils.isNotEmpty(exportData)) { + int rowIndex = 1; + for (int dataIndex = 0; dataIndex < exportData.size(); dataIndex++) { + Row dataRow = sheet.createRow(rowIndex); + dataRow.createCell(0).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("dutyTerritory_dicText"))); + dataRow.createCell(1).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("projectName"))); + dataRow.createCell(2).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("designFlowTaskStatus_dicText"))); + dataRow.createCell(3).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("prehomoFlowTaskStatus_dicText"))); + dataRow.createCell(4).setCellValue(checkValueIsNotNull(exportData.get(dataIndex).get("verifyFlowTaskStatus_dicText"))); + rowIndex ++; } } + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + }catch (IOException ex){ + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("下载文件失败"); + }else{ + throw new JeroBootException("Failed to download file"); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java index a4ec13edc..b7d24803b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java @@ -134,6 +134,22 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController verifyDelete(@RequestParam(name="ids",required=true) String ids) { + String flag = this.lawsMonthlyReportTitleTemplateEOService.verifyDelete(Arrays.asList(ids.split(","))); + return Result.OK(flag); + } + + + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index 127853d68..b76f1b294 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -193,4 +193,11 @@ public class LawsMonthlyReportWriteEO implements Serializable { @TableField(exist = false) private String ids; + //新添字段 + private String relatedAreasCn;//相关领域中文 + private String relatedAreasEn;//相关领域英文 + private String sourceCn;//来源中文 + private String sourceEn;//来源英文 + private String time;//日期 + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java index 7fb5ff88c..6430bfce0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java @@ -9,7 +9,8 @@ package com.jero.modules.report.enums; public enum ContentTemplateEnum { DEFAULT_TEMPLATE("默认模板","1"), NEW_REQUEST_LIST_TEMPLATE("新征求意见清单模板","2"), - NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE("新发布标准清单模板","3"); + NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE("新发布标准清单模板","3"), + INDUSTRY_INFORMATION_TRENDS("行业资讯动态","4"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml index 17fc90742..699e217ff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml @@ -29,5 +29,10 @@ + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java index 6a2b744c1..6b3701ac6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java @@ -48,6 +48,13 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService ids); + /** + * 目录删除验证 + * @param ids + * @return + */ + String verifyDelete(List ids); + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 339832758..1947159ab 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -1,20 +1,33 @@ package com.jero.modules.report.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.es.JeroElasticsearchTemplate; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.document.enums.SearchEnum; +import com.jero.modules.document.utils.ReadPdfUtil; +import com.jero.modules.document.utils.ReadWordUtil; import com.jero.modules.dummy.enums.InventoryStateEnum; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.report.entity.LawsMonthlyReportManageEO; import com.jero.modules.report.mapper.LawsMonthlyReportManageEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; +import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum; +import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.util.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @Description: 法规月报管理 @@ -25,6 +38,21 @@ import java.util.List; @Service public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportManageEOService { + @Autowired + private ISysDictItemService sysDictItemService; + + @Autowired + private JeroElasticsearchTemplate jeroElasticsearchTemplate; + + @Autowired + private IOSSFileService iOSSFileService; + + @Value(value = "${jero.path.upload}") + private String uploadpath; + + public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据) + + /** * 保存 * @@ -110,6 +138,130 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl stringMapCn = new HashMap<>(); + Map stringMapEn = new HashMap<>(); + Map stringMapCnForSearch = new HashMap<>(); + Map stringMapEnForSearch = new HashMap<>(); + List> mapListTempCn = new ArrayList<>(); + List> mapListTempEn = new ArrayList<>(); + //文件相关封装中文的全文内容(es) 非搜索条件下的：flag---SEARCH_FLAG + putMap(id, "法规月报", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCn, SEARCH_FLAG); + //文件相关封装英文的全文内容(es) 搜索条件下的: flag---null + putMap(id, "monthly report", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEn, SEARCH_FLAG); + + //文件相关封装中文的全文内容(es) + putMap(id + monthlyReportManageEO.getFileId(), "法规月报", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCnForSearch, null); + //文件相关封装英文的全文内容(es) + putMap(id + monthlyReportManageEO.getFileId(), "monthly report", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEnForSearch, null); + + mapListTempCn.add(stringMapCn); + mapListTempCn.add(stringMapCnForSearch); + mapListTempEn.add(stringMapEn); + mapListTempEn.add(stringMapEnForSearch); + + //添加es + JSONObject jsonObjectCn = JSON.parseObject(JSON.toJSONString(stringMapCn)); + JSONObject jsonObjectEn = JSON.parseObject(JSON.toJSONString(stringMapEn)); + JSONArray arrayCn = JSONArray.parseArray(JSON.toJSONString(mapListTempCn)); + JSONArray arrayEn = JSONArray.parseArray(JSON.toJSONString(mapListTempEn)); + + try { + // 法规月报 + jeroElasticsearchTemplate.saveOrUpdate(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue(), SearchEnum.TYPE_NAME_LAWS_MONTHLY_REPORT.getValue(), id, jsonObjectCn); + //全部 + jeroElasticsearchTemplate.saveBatch(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), arrayCn); + jeroElasticsearchTemplate.saveBatch(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), arrayEn); + } catch (Exception e) { + log.error("文档库添加es失败"); + } + + } else if ("2".equals(issueStatus)) { // 待发布---撤回操作 + // 删除es中的月报 + try { + jeroElasticsearchTemplate.delete(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue(), SearchEnum.TYPE_NAME_LAWS_MONTHLY_REPORT.getValue(), id); + //删除全部中文的 + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH.getValue(), SearchEnum.FULL_TEXT_SEARCH.getValue(), id); + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), id); + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), id + monthlyReportManageEO.getFileId()); + //删除全部英文的 + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), id); + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), id + monthlyReportManageEO.getFileId()); + + } catch (Exception e) { + e.printStackTrace(); + log.error("文档库删除es失败"); + } + } + } + private void putMap(String id, String moduleType, + String content, String title , String fileText, + String fileName, String fileId, Date issueTime, String cut, + Map stringMap, + String flag){ + stringMap.put("id", id); + stringMap.put("module_type", moduleType); + stringMap.put("module_type_flag", ModuleTypeFlagEnum.LAWS_MONTHLY_REPORT.getValue()); // 默认法规月报标识 + stringMap.put("content", content); + stringMap.put("title", title); + stringMap.put("file_text", fileText); + stringMap.put("file_name", fileName); + stringMap.put("file_id", fileId); + stringMap.put("issue_time", issueTime); + stringMap.put("cut",cut); + stringMap.put("flag",flag); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index c2c35988f..20950cba4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -121,6 +121,32 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl ids) { + //标题下存在内容或子标题时不能删除 + //1. 判断是否存在子标题 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(LawsMonthlyReportTitleTemplateEO::getParentId,ids); + List list = this.list(wrapper); + if(list.size() != 0){ + //不能删除 + return "false"; + } + //2. 判断是否存在内容 memories_chapter + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getMemoriesChapter,ids); + List lawsMonthlyReportWriteEOS = lawsMonthlyReportWriteEOService.list(lambdaQueryWrapper); + if(lawsMonthlyReportWriteEOS.size() != 0){ + //不能删除 + return "false"; + } + return "true"; + } + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 5e947cab4..64d918af5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -414,7 +414,16 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); + if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ + wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername()); + } List lawsMonthlyReportWriteEOS = this.list(wrapper); + //法规联系人 + List loginUserList = getlawsContact(lawsMonthlyReportWriteEOS); + List lawsMonthlyReportIdList = lawsMonthlyReportWriteEOS.stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); //新征求意见清单模板 @@ -465,7 +474,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl getlawsContact(List lawsMonthlyReportWriteEOS) { + List userIdList = lawsMonthlyReportWriteEOS.stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList()); + //法规联系人 + List userIds = new ArrayList<>(); + for (String s : userIdList) { + if(StringUtils.isNotBlank(s)){ + if(s.contains(",")){ + userIds.addAll(Arrays.asList(s.split(","))); + }else{ + userIds.add(s); + } + } + } + List jsonObjects = sysBaseApi.queryUsersByIds(StringUtils.join(userIds, ",")); + List userList = new ArrayList<>(); + for (JSONObject jsonObject : jsonObjects) { + LoginUser loginUser = JSONObject.parseObject(jsonObject.toJSONString(), LoginUser.class); + userList.add(loginUser); + } + return userList; + } + /** *创建word文件 @@ -516,7 +547,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, - List lawsMonthlyReportTitleTemplateEOS){ + List lawsMonthlyReportTitleTemplateEOS, + List loginUserList){ //一级菜单 List parentIdList = lawsMonthlyReportTitleTemplateEOS.stream().map(LawsMonthlyReportTitleTemplateEO::getParentId).distinct().collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -585,13 +617,15 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleOneList, String titleCN, XWPFDocument document, - String cut) { + String cut, + List loginUserList) { //数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); @@ -755,9 +790,12 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl sysDictItems, List categoryList, - String cut) { + String cut, + List loginUserList) { String technologyTerritory = lawsMonthlyReportWriteEO.getTechnologyTerritory();//技术领域 String applyCar = lawsMonthlyReportWriteEO.getApplyCar();//适用车型 String applyScope = lawsMonthlyReportWriteEO.getApplyScope();//适用范围 @@ -363,7 +364,8 @@ public class WordUtil { String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文 String workProgressCn = lawsMonthlyReportWriteEO.getWorkProgressCn();//NIO工作进展中文 String workProgressEn = lawsMonthlyReportWriteEO.getWorkProgressEn();//NIO工作进展英文 - String lawsContact = lawsMonthlyReportWriteEO.getLawsContact();//法规联系人 + String lawsContactTemp = lawsMonthlyReportWriteEO.getLawsContact();//法规联系人 + String lawsContact = getLawsContact(loginUserList, lawsContactTemp); String link = lawsMonthlyReportWriteEO.getLink();//链接 String technologyTerritoryName = ""; if(org.apache.commons.lang3.StringUtils.isNotBlank(technologyTerritory)){ @@ -404,54 +406,164 @@ public class WordUtil { //第1行 if(CutEnum.CN.getValue().equals(cut)){ //第1行 - setCell(table.getRow(0), "技术领域",technologyTerritoryName); + setCell(table, 0, "相关领域",technologyTerritoryName); //第2行 - setCell(table.getRow(1), "适用车型",applyCarName); + setCell(table,1, "适用车型",applyCarName); //第3行 - setCell(table.getRow(2), "适用范围",applyScopeName); + setCell(table,2, "适用范围",applyScopeName); //第4行 - setCell(table.getRow(3), "状态",stateName); + setCell(table,3, "状态",stateName); //第5行 - setCell(table.getRow(4), "用法",useMethodName); + setCell(table,4, "用法",useMethodName); //第6行 - setCell(table.getRow(5), "实施车型",implementCar); + setCell(table,5, "实施车型",implementCar); //第7行 - setCell(table.getRow(6), "新车型实施日期",newCarImplementTime); + setCell(table,6, "新车型实施日期",newCarImplementTime); //第8行 - setCell(table.getRow(7), "在产车实施日期",productionCarImplementTime); + setCell(table,7, "在产车实施日期",productionCarImplementTime); //第9行 - setCell(table.getRow(8), "主要内容中文",contentCn); + setCell(table,8, "主要内容",contentCn); //第10行 - setCell(table.getRow(9), "NIO工作进展中文",workProgressCn); + setCell(table,9, "NIO工作进展",workProgressCn); //第11行 - setCell(table.getRow(10), "法规联系人",lawsContact); + setCell(table,10, "法规联系人",lawsContact); //第12行 - setCell(table.getRow(11), "链接",link); + setCell(table,11, "链接",link); }else{ //第1行 - setCell(table.getRow(0), "Technical Field",technologyTerritoryName); + setCell(table,0, "Related Areas",technologyTerritoryName); //第2行 - setCell(table.getRow(1), "Vehicle Type",applyCarName); + setCell(table,1,"Vehicle Type",applyCarName); //第3行 - setCell(table.getRow(2), "Scope",applyScopeName); + setCell(table,2,"Scope",applyScopeName); //第4行 - setCell(table.getRow(3), "Status",stateName); + setCell(table,3,"Status",stateName); //第5行 - setCell(table.getRow(4), "usage",useMethodName); + setCell(table,4,"usage",useMethodName); //第6行 - setCell(table.getRow(5), "Implementation Model",implementCar); + setCell(table,5,"Implementation Model",implementCar); //第7行 - setCell(table.getRow(6), "New Type Execution Date",newCarImplementTime); + setCell(table,6,"New Type Execution Date",newCarImplementTime); //第8行 - setCell(table.getRow(7), "New Vehicle Execution Date",productionCarImplementTime); + setCell(table,7,"New Vehicle Execution Date",productionCarImplementTime); //第9行 - setCell(table.getRow(8), "Main Content (English)",contentEn); + setCell(table,8,"Main Content",contentEn); //第10行 - setCell(table.getRow(9), "NIO Work Progress (English)",workProgressEn); + setCell(table,9,"NIO Work Progress",workProgressEn); //第11行 - setCell(table.getRow(10), "Regulatory Contact",lawsContact); + setCell(table, 10,"Regulatory Contact",lawsContact); //第12行 - setCell(table.getRow(11), "Link",link); + setCell(table, 11,"Link",link); + } +// if(CutEnum.CN.getValue().equals(cut)){ +// //第1行 +// setCell(table.getRow(0), "相关领域",technologyTerritoryName); +// //第2行 +// setCell(table.getRow(1), "适用车型",applyCarName); +// //第3行 +// setCell(table.getRow(2), "适用范围",applyScopeName); +// //第4行 +// setCell(table.getRow(3), "状态",stateName); +// //第5行 +// setCell(table.getRow(4), "用法",useMethodName); +// //第6行 +// setCell(table.getRow(5), "实施车型",implementCar); +// //第7行 +// setCell(table.getRow(6), "新车型实施日期",newCarImplementTime); +// //第8行 +// setCell(table.getRow(7), "在产车实施日期",productionCarImplementTime); +// //第9行 +// setCell(table.getRow(8), "主要内容",contentCn); +// //第10行 +// setCell(table.getRow(9), "NIO工作进展",workProgressCn); +// //第11行 +// setCell(table.getRow(10), "法规联系人",lawsContact); +// //第12行 +// setCell(table.getRow(11), "链接",link); +// }else{ +// //第1行 +// setCell(table.getRow(0), "Related Areas",technologyTerritoryName); +// //第2行 +// setCell(table.getRow(1), "Vehicle Type",applyCarName); +// //第3行 +// setCell(table.getRow(2), "Scope",applyScopeName); +// //第4行 +// setCell(table.getRow(3), "Status",stateName); +// //第5行 +// setCell(table.getRow(4), "usage",useMethodName); +// //第6行 +// setCell(table.getRow(5), "Implementation Model",implementCar); +// //第7行 +// setCell(table.getRow(6), "New Type Execution Date",newCarImplementTime); +// //第8行 +// setCell(table.getRow(7), "New Vehicle Execution Date",productionCarImplementTime); +// //第9行 +// setCell(table.getRow(8), "Main Content",contentEn); +// //第10行 +// setCell(table.getRow(9), "NIO Work Progress",workProgressEn); +// //第11行 +// setCell(table.getRow(10), "Regulatory Contact",lawsContact); +// //第12行 +// setCell(table.getRow(11), "Link",link); +// } + } + + /** + * 行业资讯动态 + * @param document + * @param lawsMonthlyReportWriteEO + * @param cut + */ + public static void exportWordExcelIndustry(XWPFDocument document, + LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO, + String cut) { + String relatedAreasCn = lawsMonthlyReportWriteEO.getRelatedAreasCn();//相关领域中文 + String relatedAreasEn = lawsMonthlyReportWriteEO.getRelatedAreasEn();//相关领域英文 + String sourceCn = lawsMonthlyReportWriteEO.getSourceCn();//来源 + String sourceEn = lawsMonthlyReportWriteEO.getSourceEn(); + String time = lawsMonthlyReportWriteEO.getTime();//日期 + String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文 + String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文 + String link = lawsMonthlyReportWriteEO.getLink();//链接 + + XWPFTable table = document.createTable(5, 2); + + //表格属性 + CTTblPr tablePr = table.getCTTbl().addNewTblPr(); + //表格宽度 + CTJc cTJc = tablePr.addNewJc(); + //居中 + cTJc.setVal(STJc.CENTER); + //列宽自动分割 + CTTblWidth tableWidth = tablePr.addNewTblW(); + //设置表格宽度 + tableWidth.setType(STTblWidth.DXA); + tableWidth.setW(BigInteger.valueOf(8000)); + + + //第1行 + if(CutEnum.CN.getValue().equals(cut)){ + //第1行 + setCell(table, 0, "相关领域",relatedAreasCn); + //第2行 + setCell(table,1, "来源",sourceCn); + //第3行 + setCell(table,2, "日期",time); + //第4行 + setCell(table,3, "主要内容",contentCn); + //第5行 + setCell(table,4, "链接",link); + }else{ + //第1行 + setCell(table,0, "Related Areas",relatedAreasEn); + //第2行 + setCell(table,1,"Source",sourceEn); + //第3行 + setCell(table,2,"Date",time); + //第4行 + setCell(table,3,"Main Content",contentEn); + //第5行 + setCell(table,4,"Link",link); } } public static void exportWordExcelAsk(XWPFDocument document, @@ -666,18 +778,49 @@ public class WordUtil { return fieldValueName; } - private static void setCell(XWPFTableRow tableRow, String fieldName,String technologyTerritory) { + private static void setCell(XWPFTable table, int number, String fieldName,String technologyTerritory) { - tableRow.setHeight(500); - CTTblWidth ctTblWidth0 = tableRow.getCell(0).getCTTc().addNewTcPr().addNewTcW(); + table.getRow(number).setHeight(500); + CTTblWidth ctTblWidth0 = table.getRow(number).getCell(0).getCTTc().addNewTcPr().addNewTcW(); ctTblWidth0.setType(STTblWidth.DXA); - ctTblWidth0.setW(BigInteger.valueOf(3000)); - CTTblWidth ctTblWidth1 = tableRow.getCell(1).getCTTc().addNewTcPr().addNewTcW(); + ctTblWidth0.setW(BigInteger.valueOf(2000)); + CTTblWidth ctTblWidth1 = table.getRow(number).getCell(1).getCTTc().addNewTcPr().addNewTcW(); ctTblWidth1.setType(STTblWidth.DXA); ctTblWidth1.setW(BigInteger.valueOf(5000)); - tableRow.getCell(0).setText(fieldName); - tableRow.getCell(1).setText(technologyTerritory); + table.getRow(number).getCell(0).setText(fieldName); + table.getRow(number).getCell(1).setText(technologyTerritory); + } +// private static void setCell(XWPFTableRow tableRow, String fieldName,String technologyTerritory) { +// +// tableRow.setHeight(500); +// CTTblWidth ctTblWidth0 = tableRow.getCell(0).getCTTc().addNewTcPr().addNewTcW(); +// ctTblWidth0.setType(STTblWidth.DXA); +// ctTblWidth0.setW(BigInteger.valueOf(3000)); +// CTTblWidth ctTblWidth1 = tableRow.getCell(1).getCTTc().addNewTcPr().addNewTcW(); +// ctTblWidth1.setType(STTblWidth.DXA); +// ctTblWidth1.setW(BigInteger.valueOf(5000)); +// +// tableRow.getCell(0).setText(fieldName); +// tableRow.getCell(1).setText(technologyTerritory); +// } + + private static String getLawsContact(List userList, String lawsContact) { + if(com.jero.modules.system.util.StringUtils.isNotBlank(lawsContact)){ + List collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList()); + StringBuilder sb = new StringBuilder(); + for (String s : lawsContact.split(",")) { + List loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList()); + if(loginUserList.size() != 0){ + sb.append(loginUserList.get(0).getUsername()+","); + } + } + if(com.jero.modules.system.util.StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + return substring; + } + } + return null; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/DocumentSearchController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/DocumentSearchController.java index abb7f316e..4350a42f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/DocumentSearchController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/DocumentSearchController.java @@ -104,4 +104,12 @@ public class DocumentSearchController { iDocumentSearchService.deleteAll(); return Result.OK(); } + + @ApiOperation(value="列表查询问题知识库", notes="列表查询问题知识库") + @PostMapping(value = "/getProblemKnowledgeBasePage") + //@RequiresPermissions("document:search") + public Result getProblemKnowledgeBasePage(@RequestBody Map map) { + IPage infoList = iDocumentSearchService.getProblemKnowledgeBasePage(map); + return Result.OK(infoList); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java new file mode 100644 index 000000000..230c6e1fa --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java @@ -0,0 +1,38 @@ +package com.jero.modules.searchcenter.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.modules.searchcenter.service.ILawsMonthlyReportSearchService; +import com.jero.modules.searchcenter.vo.SearchVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description 搜索中心-法规月报 控制层 + * @date 2022/8/17 15:03 + * @auth liyawei + */ +@Api(tags="搜索中心") +@RestController +@RequestMapping("/search/lawsMonthlyReport") +@Slf4j +public class LawsMonthlyReportSearchController { + + @Autowired + private ILawsMonthlyReportSearchService lawsMonthlyReportSearchService; + + @ApiOperation(value="法规月报查询", notes="法规月报查询") + @PostMapping(value = "/page") + @RequiresPermissions("document:search") + public Result queryPageInfo(@RequestBody SearchVO searchVO) { + IPage pageInfo = lawsMonthlyReportSearchService.pageInfo(searchVO); + return Result.OK(pageInfo); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java new file mode 100644 index 000000000..3fe0a4b21 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java @@ -0,0 +1,30 @@ +package com.jero.modules.searchcenter.enums; + +public enum ModuleTypeFlagEnum { + LAWS_MONTHLY_REPORT("法规月报","FGYB"), + PROBLEM_KNOWLEDGE_BASE_CLASSIFY("问题知识库","WTZSK"); + + String name; + String value; + + private ModuleTypeFlagEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java new file mode 100644 index 000000000..a09e13032 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java @@ -0,0 +1,19 @@ +package com.jero.modules.searchcenter.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.searchcenter.vo.SearchVO; + +/** + * @description 搜索中心-法规月报 接口 + * @date 2022/8/17 15:03 + * @auth liyawei + */ +public interface ILawsMonthlyReportSearchService { + + /** + * 分页查询 + * @param searchVO + * @return + */ + IPage pageInfo(SearchVO searchVO); +} 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 7336976ec..93c2d50de 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 @@ -1073,6 +1073,246 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } + @Override + public IPage getProblemKnowledgeBasePage(Map map) { + + boolean flagTemp = true; + String cut = (String) map.get("cut"); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_CN.getValue()); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_EN.getValue()); + } + + if (!flagTemp) { + return new Page(Integer.parseInt(map.get("pageNo").toString()), Integer.parseInt(map.get("pageSize").toString())); + } + JSONArray queryJsonMustNot = new JSONArray(); + + String selectValue = (String) map.get("selectValue"); + String selectValueTwo = (String) map.get("selectValueTwo"); + String problem_type = (String) map.get("problem_type"); + String target_market = (String) map.get("target_market"); + //1. 需要查询的字段 + List fieldList = new ArrayList<>(); + fieldList.add("title");//权重5 + fieldList.add("content");//权重4 +// fieldList.add("problem_type");//权重3 +// fieldList.add("target_market"); //权重2 + fieldList.add("module_type"); + fieldList.add("id"); + fieldList.add("flag"); + + JSONArray queryMapJson = new JSONArray(); + JSONArray queryMapJsonTwo = new JSONArray(); + JSONArray queryMapJsonThree = new JSONArray(); + JSONArray queryMapJsonProblemType = new JSONArray(); + JSONArray queryMapJsonTargetMarket = new JSONArray(); + JSONArray queryMapJsonAll = new JSONArray(); + + Map mapHighlight = new HashMap<>(); + Map mapHighlight1 = new HashMap<>(); + //封装首次的条件 + if (StringUtils.isNotBlank(selectValue)) { + 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("file_text".equals(field)){ + map3.put("boost",0.01); + }else if("content".equals(field)){ + map3.put("boost",0.01); + }else if("file_name".equals(field)){ + map3.put("boost",1); + } + + map3.put("query",selectValue); + map2.put(field, map3); + map4.put("match",map2); + queryMapJson.add(map4); + + //高亮 + if(!"flag".equals(field)){ + highlight(mapHighlight, field); + } + } + mapHighlight1.put("fields",mapHighlight); + } + + //封装问题类型选择框查询条件。 + if (StringUtils.isNotBlank(problem_type)) { + Map map2 = new HashMap<>(); + Map map3 = new HashMap<>(); + Map map4 = new HashMap<>(); + + map3.put("query",problem_type); + map2.put("problem_type", map3); + map4.put("match",map2); + queryMapJson.add(map4); + //高亮 + highlight(mapHighlight, problem_type); + + mapHighlight1.put("fields",mapHighlight); + } + + //封装市场选择框查询条件。 + if (StringUtils.isNotBlank(target_market)) { + Map map2 = new HashMap<>(); + Map map3 = new HashMap<>(); + Map map4 = new HashMap<>(); + + map3.put("query",target_market); + map2.put("target_market", map3); + map4.put("match",map2); + queryMapJson.add(map4); + //高亮 + highlight(mapHighlight, target_market); + + mapHighlight1.put("fields",mapHighlight); + } + + + if(CollectionUtils.isNotEmpty(queryMapJson)){ + JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJson); + queryMapJsonAll.add(jsonObject); + } + //封装二次的条件 + if (StringUtils.isNotBlank(selectValueTwo)) { + 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("file_text".equals(field)){ + map3.put("boost",0.01); + }else if("content".equals(field)){ + map3.put("boost",0.01); + }else if("file_name".equals(field)){ + map3.put("boost",1); + } + + //特殊处理编号字段 + 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); + } + } + mapHighlight1.put("fields",mapHighlight); + } + if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){ + JSONObject jsonObjectTwo = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonTwo); + queryMapJsonAll.add(jsonObjectTwo); + } + //ids进行三次封装 + String ids = (String) map.get("ids"); + if (StringUtils.isNotBlank(ids)) { + for (String s : ids.split(",")) { + Map queryMap = new HashMap<>(); + Map queryMapTemp = new HashMap<>(); + queryMapTemp.put("id", s); + queryMap.put("match_phrase", queryMapTemp); + queryMapJsonThree.add(queryMap); + } + } + if(CollectionUtils.isNotEmpty(queryMapJsonThree)){ + JSONObject jsonObjectThree = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree); + queryMapJsonAll.add(jsonObjectThree); + } + JSONObject sort = new JSONObject(); + Map createTime = new HashMap<>(); + Map createTime1 = new HashMap<>(); + createTime.put("order","desc"); + createTime1.put("createTime",createTime); + sort.putAll(createTime1); + + Integer pageNo = Integer.parseInt(map.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(map.get("pageSize").toString()); + IPage page = this.getProblemKnowledgeBasePage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null, + pageNo, pageSize, null,(String) map.get("cut"),sort,queryJsonMustNot); + return page; + } + + @NotNull + private IPage getProblemKnowledgeBasePage(String selectValue, String selectValueTwo, JSONArray queryMapJson,Map highlightMap, + JSONArray should, Integer pageNo, Integer pageSize, String paragraphFlag, + String cut,JSONObject querySort,JSONArray queryMustNot) { + JSONObject jsonObject = new JSONObject(); + //基础添加封装 + if ("paragraphFlag".equals(paragraphFlag)) { + jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null); + } else { + jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null); + } + JSONArray jsonArraySort = new JSONArray(); + jsonArraySort.add(querySort); + + //1. 条件,分页 + JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(null, + jsonObject, + highlightMap, + jsonArraySort, + pageNo-1, + pageSize); + //2. 数据查询 + JSONObject search = new JSONObject(); + + if(CutEnum.CN.getValue().equals(cut)){ + search = jeroElasticsearchTemplate.search(SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_CN.getValue(), + SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_CN.getValue(), + queryObject); + }else{ + search = jeroElasticsearchTemplate.search(SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_EN.getValue(), + SearchEnum.TYPE_PROBLEM_KNOWLEDGE_BASE_EN.getValue(), + queryObject); + } + + List> list = (List>) (((Map) search.get("hits")).get("hits")); + List> mapList = new ArrayList<>(); + for (Map map : list) { + Map mapSource = (Map) map.get("_source"); + Map mapHighlight = (Map) map.get("highlight"); + if(ObjectUtils.isNotEmpty(mapHighlight)){ + for (Map.Entry entry : mapHighlight.entrySet()) { + String key = entry.getKey(); + List value = (List) entry.getValue(); + String fieldConyent= ""; + for (String s : value) { + fieldConyent += s; + } + mapSource.put(key,fieldConyent); + } + //如果这一条数据中有高亮字段值,但是file_text中没有高亮值, 则赋控制,否则列表中会展示所有的文件内容, 赋空后,则展示基础数据 + String fileText = (String) mapSource.get("content"); + if(StringUtils.isNotBlank(fileText) && !fileText.contains("")){ + mapSource.put("content",""); + } + } + mapList.add(mapSource); + } + + //处理分页 + IPage page = new Page(pageNo, pageSize); + if (StringUtils.isNotBlank(selectValueTwo)) { + //二次搜索的结果 + page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total")))); + page.setRecords(mapList); + } else { + //首次搜索的结果 + page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total")))); + page.setRecords(mapList); + } + return page; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/IDocumentSearchService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/IDocumentSearchService.java index b378c7127..51379e1ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/IDocumentSearchService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/IDocumentSearchService.java @@ -27,4 +27,5 @@ public interface IDocumentSearchService { void deleteAll(); + IPage getProblemKnowledgeBasePage(Map map); } 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 new file mode 100644 index 000000000..55375d65b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java @@ -0,0 +1,261 @@ +package com.jero.modules.searchcenter.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.es.JeroElasticsearchTemplate; +import com.jero.modules.document.enums.SearchEnum; +import com.jero.modules.searchcenter.service.ILawsMonthlyReportSearchService; +import com.jero.modules.searchcenter.vo.SearchVO; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @description 搜索中心-法规月报 服务层 + * @date 2022/8/17 15:03 + * @auth liyawei + */ +@Component +public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSearchService { + + @Autowired + private JeroElasticsearchTemplate jeroElasticsearchTemplate; + public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据) + + /** + * 全文 + * @param searchVO + * @return + */ + @Override + public IPage pageInfo(SearchVO searchVO) { + JSONArray queryJsonMustNot = new JSONArray(); +// if(StringUtils.isNotBlank(searchVO.getSelectValue())){ +// Map map = new HashMap<>(); +// Map map1 = new HashMap<>(); +// Map map2 = new HashMap<>(); +// map.put("query",SEARCH_FLAG); +// map1.put("flag",map); +// map2.put("match",map1); +// queryJsonMustNot.add(map2); +// } + if(StringUtils.isBlank(searchVO.getSelectValue())){ + searchVO.setSelectValue(SEARCH_FLAG); + } + + //判断索引是否存在 + boolean flagTemp = true; + flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue()); + if (!flagTemp) { + return new Page(searchVO.getPageNo(), searchVO.getPageSize()); + } + + String selectValue = searchVO.getSelectValue(); + String selectValueTwo = searchVO.getSelectValueTwo(); + //1. 需要查询的字段 + List fieldList = new ArrayList<>(); + fieldList.add("title");//权重5 + fieldList.add("file_text");//权重4 + fieldList.add("content");//权重3 + fieldList.add("file_name"); //权重2 + fieldList.add("module_type"); + fieldList.add("id"); + fieldList.add("flag"); + + JSONArray queryMapJson = new JSONArray(); + JSONArray queryMapJsonTwo = new JSONArray(); + JSONArray queryMapJsonThree = new JSONArray(); + JSONArray queryMapJsonAll = new JSONArray(); + + Map mapHighlight = new HashMap<>(); + Map mapHighlight1 = new HashMap<>(); + //封装首次的条件 + if (StringUtils.isNotBlank(selectValue)) { + 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("file_text".equals(field)){ + map3.put("boost",0.01); + }else if("content".equals(field)){ + map3.put("boost",0.01); + }else if("file_name".equals(field)){ + map3.put("boost",1); + } + + map3.put("query",selectValue); + map2.put(field, map3); + map4.put("match",map2); + queryMapJson.add(map4); + + //高亮 + if(!"flag".equals(field)){ + highlight(mapHighlight, field); + } + } + mapHighlight1.put("fields",mapHighlight); + } + if(CollectionUtils.isNotEmpty(queryMapJson)){ + JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJson); + queryMapJsonAll.add(jsonObject); + } + //封装二次的条件 + if (StringUtils.isNotBlank(selectValueTwo)) { + 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("file_text".equals(field)){ + map3.put("boost",0.01); + }else if("content".equals(field)){ + map3.put("boost",0.01); + }else if("file_name".equals(field)){ + map3.put("boost",1); + } + + //特殊处理编号字段 + 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); + } + } + mapHighlight1.put("fields",mapHighlight); + } + if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){ + JSONObject jsonObjectTwo = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonTwo); + queryMapJsonAll.add(jsonObjectTwo); + } + //ids进行三次封装 + if (StringUtils.isNotBlank(searchVO.getIds())) { + for (String s : searchVO.getIds().split(",")) { + Map queryMap = new HashMap<>(); + Map queryMapTemp = new HashMap<>(); + queryMapTemp.put("id", s); + queryMap.put("match_phrase", queryMapTemp); + queryMapJsonThree.add(queryMap); + } + } + if(CollectionUtils.isNotEmpty(queryMapJsonThree)){ + JSONObject jsonObjectThree = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree); + queryMapJsonAll.add(jsonObjectThree); + } + JSONObject sort = new JSONObject(); + Map issueTime = new HashMap<>(); + Map issueTime1 = new HashMap<>(); + issueTime.put("order","desc"); + issueTime1.put("issue_time",issueTime); + sort.putAll(issueTime1); + +// Map mapSort = new HashMap<>(); +// Map mapSortTemp = new HashMap<>(); +// mapSort.put("order","asc"); +// mapSortTemp.put("file_sort.keyword",mapSort); +// sort.putAll(mapSortTemp); + + Integer pageNo = searchVO.getPageNo(); + Integer pageSize = searchVO.getPageSize(); + IPage page = getiPage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null, + pageNo, pageSize, null,searchVO.getCut(),sort,queryJsonMustNot); + return page; + } + + @NotNull + private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,Map highlightMap, + JSONArray should, Integer pageNo, Integer pageSize, String paragraphFlag, + String cut,JSONObject querySort,JSONArray queryMustNot) { + JSONObject jsonObject = new JSONObject(); + //基础添加封装 + if ("paragraphFlag".equals(paragraphFlag)) { + jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null); + } else { + jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null); + } + JSONArray jsonArraySort = new JSONArray(); + jsonArraySort.add(querySort); + + //1. 条件,分页 + JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(null, + jsonObject, + highlightMap, + jsonArraySort, + pageNo-1, + pageSize); + //2. 数据查询 + JSONObject search = new JSONObject(); + search = jeroElasticsearchTemplate.search(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue(), + SearchEnum.TYPE_NAME_LAWS_MONTHLY_REPORT.getValue(), + queryObject); + + List> list = (List>) (((Map) search.get("hits")).get("hits")); + List> mapList = new ArrayList<>(); + for (Map map : list) { + Map mapSource = (Map) map.get("_source"); + Map mapHighlight = (Map) map.get("highlight"); + if(ObjectUtils.isNotEmpty(mapHighlight)){ + for (Map.Entry entry : mapHighlight.entrySet()) { + String key = entry.getKey(); + List value = (List) entry.getValue(); + String fieldConyent= ""; + for (String s : value) { + fieldConyent += s; + } + 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); + } + + //处理分页 + IPage page = new Page(pageNo, pageSize); + if (StringUtils.isNotBlank(selectValueTwo)) { + //二次搜索的结果 + page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total")))); + page.setRecords(mapList); + } else { + //首次搜索的结果 + page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total")))); + page.setRecords(mapList); + } + return page; + } + + private void highlight(Map mapHighlight, String key) { + Map mapTemp = new HashMap<>(); + List list = new ArrayList<>(); + list.add(""); + List list1 = new ArrayList<>(); + list1.add(""); + mapTemp.put("pre_tags", list); + mapTemp.put("post_tags", list1); + mapTemp.put("fragment_size", 200);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 + mapTemp.put("type", "plain"); + mapHighlight.put(key, mapTemp); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 87662c695..9c43e54a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -144,10 +144,10 @@ public class LawsWarnService { String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)) || newCarTime.equals(beforeTimeSix)){ record.put("new_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)) || newCarTime.equals(beforeTimeTwelve)){ record.put("new_colour","yellow"); } } @@ -158,16 +158,16 @@ public class LawsWarnService { if(StringUtils.isNotBlank(implementTime) && !"null".equals(implementTime)){ try { if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 1){ - Date newCarTimeDate = sdf.parse(implementTime); + Date implementTimeDate = sdf.parse(implementTime); //当前时间的前6个月 String beforeTimeSix = beforeTime(6,new Date()); String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((implementTimeDate.after(new Date()) && implementTimeDate.before(parseSix)) || implementTime.equals(beforeTimeSix)){ record.put("implement_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((implementTimeDate.after(parseSix) && implementTimeDate.before(parseTwelve)) || implementTime.equals(beforeTimeTwelve)){ record.put("implement_colour","yellow"); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java index 5d568e4df..590fa4d09 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java @@ -3,6 +3,7 @@ package com.jero.modules.wkflow.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.wkflow.entity.BusMes; import com.jero.modules.wkflow.entity.BusProcessName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java index 139757911..7649958a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java @@ -21,6 +21,8 @@ public class BusProcessName implements Serializable { private String prcName; + private String prcNameEn; + private String prcId; private String prcMes; diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index f3c8ae460..53383a8d2 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -137,10 +137,10 @@ spring: # url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - # url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false - # username: root - # password: 123456 - # driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://10.10.10.44:3306/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false +# username: root +# password: 123456 +# driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false url: jdbc:mysql://121.36.69.172:3307/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root @@ -158,7 +158,7 @@ spring: allow-bean-definition-overriding: true #redis 配置 redis: - database: 6 + database: 13 host: 121.36.69.172 lettuce: pool: diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Brazil.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Brazil.png new file mode 100644 index 000000000..40166c613 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Brazil.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Canada.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Canada.png new file mode 100644 index 000000000..a320f145c Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Canada.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Chile.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Chile.png new file mode 100644 index 000000000..bbbd843b1 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Chile.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/GCC.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/GCC.png new file mode 100644 index 000000000..2d21eb9bb Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/GCC.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Germany.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Germany.png new file mode 100644 index 000000000..e6d6f0b59 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Germany.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Hindustan.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Hindustan.png new file mode 100644 index 000000000..3a72a3622 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Hindustan.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/HongKongChina.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/HongKongChina.png new file mode 100644 index 000000000..1e65c15d2 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/HongKongChina.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Mexico.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Mexico.png new file mode 100644 index 000000000..fe5b77c1d Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Mexico.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Norway.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Norway.png new file mode 100644 index 000000000..23dd519cb Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Norway.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Philippines.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Philippines.png new file mode 100644 index 000000000..442273077 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Philippines.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Russia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Russia.png new file mode 100644 index 000000000..8887a1807 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Russia.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Thailand.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Thailand.png new file mode 100644 index 000000000..b8d142581 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Thailand.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Vietnam.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Vietnam.png new file mode 100644 index 000000000..857322821 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Vietnam.png differ diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 72d278ab7..66b94e6f8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -531,7 +531,7 @@ module.exports = { newClause: 'New Clause', clauseNo: 'Item No.', functionalAreas: 'Functional Areas', - technicalField: 'Tech field', + technicalField: 'Tech Field', informationCategory: 'Info Type', contentValidity: 'Content Validity', content: 'Content', @@ -822,7 +822,7 @@ module.exports = { sendBack: 'Reject', taskConfirmationProcess: 'Task confirmation process', notFinished: 'Assigned', - Finished: 'Complete', + Finished: 'Completed', theRequirementst: 'The engineering interface person confirms the compliance requirements', dataLoading: 'Data loading...', Submitting: 'Submitting', @@ -1051,7 +1051,7 @@ module.exports = { ParameterNo: 'Number', NRequired: 'Required', NParameterName: 'Para Name', - NtechnicalField: 'Tech field', + NtechnicalField: 'Tech Field', NparameterBatch: 'Params Batch', NareaOfResponsibility: 'Responsible Field', NParameterDescription: 'Description', @@ -1122,7 +1122,7 @@ module.exports = { RelevantMaterials: 'RelevantMaterials', evaluatorFeedback: 'Evaluator Feedback', nameTechnicalDocument: 'Name of technical document', - chapter: 'chapter', + chapter: 'Chapter', problemDescription: 'Problem Description', filingExternalOpinions: 'Filing of external opinions', regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results', @@ -1168,7 +1168,7 @@ module.exports = { exportComparisonReport: 'Export Comparison Report', comparisonDifferenceComment: 'Comparison Difference Comment', fullTextComments: 'Full text comments', - fileDeclaration: 'file Declaration', + fileDeclaration: 'File Declaration', FileForDetails: 'File For Details', Converting: 'Converting', convertNetwork: 'Convert Network', @@ -1193,7 +1193,7 @@ module.exports = { Fileuploaded: 'File uploaded, please wait', uploadedbyyourself: 'You can only delete files and data uploaded by yourself', Fileuploaded: 'File uploading, please wait', - doNotHavePermissionDeleteData: 'Do not have permission to delete this data,', + doNotHavePermissionDeleteData: 'Do not have permission to delete this data', Parametercollection: 'Parameter Collection', Collectlist: 'Colle Ctlist', Statisticalmodels: 'Statisti Calmodels', @@ -1250,7 +1250,7 @@ module.exports = { Parabatch: 'Para Batch', freeze:'Please select the configuration you want to freeze', optionDropDownBox:'Option drop - down box', - attachmentUpload:'file', + attachmentUpload:'File', textInput:'Text Input', deleteNode:'If there is any file information, the file will be deleted. Are you sure to delete this data?', HaveReleased:'Have released', @@ -1261,4 +1261,11 @@ module.exports = { currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', + thereTitleWhichCannotBeDeleted:'There are new contents under this title, which cannot be deleted', + industryInformationDynamicTemplate:'Industry information dynamic template', + relatedFields:'Related fields', + relatedFieldsEn:'Related fields (English)', + source:'Source', + sourceEn:'Source (English)', + onlyone:'Only one merge delimiter can be entered', } \ 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 bdd85ecab..5632215e0 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -874,7 +874,7 @@ module.exports = { experimentFailed: '实验失败', toBeStarted: '待开始', inProgress: '进行中', - Underway:'进行中', + Underway: '进行中', green: '绿', red: '红', blue: '蓝', @@ -1302,65 +1302,72 @@ module.exports = { Inthecollection: '收集中', Notatthe: '未开始', Thepercentage: '百分比', - problemKnowledgeBase:'问题知识库', - recentHotSpots:'近期热点', - disseminationMaterials:'传播物料', - informationSafety:'信息安全', - blueBook:'蓝皮书', - invoiceCollection:'发票合集', - productHighlights:'产品亮点', - financialReimbursement:'财务报销', - classificationMaintenance:'分类维护', - managePublishing:'管理发布', - displayPermission:'展示权限', - authorizedUser:'权限用户', - problemClassification:'问题分类', - market:'市场', - documentNumber:'文档编号', - documentTitle:'文档标题', - bringInDocumentInformation:'带入文档信息', - thereWhichCannotDeleted:'该标题下存在子标题无法进行删除', - sdt:'工程接口人', - dre:'填写人', - applicableInstructionsMarketList:'市场清单适用说明', - pleaseSelectTheDataCompared:'请选择需要对比的数据', - problemLabel:'问题标签', - personCharge:'负责人', - addLabel:'新增标签', - editLabel:'编辑标签', - applicableMarket:'适用市场', - templateMaintenance:'模板维护', - associatedWebsite:'关联网址', - dropDownOptions:'下拉选项', - dropDownOptionMaintenance:'下拉选项维护', - displayInformation:'展示信息', - addComparison:'添加对比', - showOrNot:'是否展示', - comparisonMarket:'对比市场', - share:'分享', - simplifiedChinese:'简体中文', - uploadOnly:'只能上传', - turnOnAutoMatch:'打开自动匹配', - Adjustareasofresponsibility:'调整责任领域', - regulatoryTechnicalAssessment:'法规技术评估', - OpenOne:'公开', - Privacy:'私密', - punctuationmark:'只能输入除#号和逗号外的英文标点符号', + problemKnowledgeBase: '问题知识库', + recentHotSpots: '近期热点', + disseminationMaterials: '传播物料', + informationSafety: '信息安全', + blueBook: '蓝皮书', + invoiceCollection: '发票合集', + productHighlights: '产品亮点', + financialReimbursement: '财务报销', + classificationMaintenance: '分类维护', + managePublishing: '管理发布', + displayPermission: '展示权限', + authorizedUser: '权限用户', + problemClassification: '问题分类', + market: '市场', + documentNumber: '文档编号', + documentTitle: '文档标题', + bringInDocumentInformation: '带入文档信息', + thereWhichCannotDeleted: '该标题下存在子标题无法进行删除', + sdt: '工程接口人', + dre: '填写人', + applicableInstructionsMarketList: '市场清单适用说明', + pleaseSelectTheDataCompared: '请选择需要对比的数据', + problemLabel: '问题标签', + personCharge: '负责人', + addLabel: '新增标签', + editLabel: '编辑标签', + applicableMarket: '适用市场', + templateMaintenance: '模板维护', + associatedWebsite: '关联网址', + dropDownOptions: '下拉选项', + dropDownOptionMaintenance: '下拉选项维护', + displayInformation: '展示信息', + addComparison: '添加对比', + showOrNot: '是否展示', + comparisonMarket: '对比市场', + share: '分享', + simplifiedChinese: '简体中文', + uploadOnly: '只能上传', + turnOnAutoMatch: '打开自动匹配', + Adjustareasofresponsibility: '调整责任领域', + regulatoryTechnicalAssessment: '法规技术评估', + OpenOne: '公开', + Privacy: '私密', + punctuationmark: '只能输入除#号和逗号外的英文标点符号', created: '创建时间', - updated:'更新时间', - optionDropDownBox:'下拉选择', - attachmentUpload:'附件上传', - textInput:'文本输入', + updated: '更新时间', + optionDropDownBox: '下拉选择', + attachmentUpload: '附件上传', + textInput: '文本输入', Paraname: '参数名称', Parabatch: '参数批次', - freeze:'请选择冻结配置', - deleteNode:'若有文件信息将同步删除，确认删除该条数据？', - HaveReleased:'已发布', - forward:'转发', - areResponsibilityAreaInformationBatch:'确实是否批量修改责任领域信息', - issuedBy:'发布人', - pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', - currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', - currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', - weilaiRegulationMonthlyReport:'蔚来法规月报', + freeze: '请选择冻结配置', + deleteNode: '若有文件信息将同步删除，确认删除该条数据？', + HaveReleased: '已发布', + forward: '转发', + areResponsibilityAreaInformationBatch: '确实是否批量修改责任领域信息', + issuedBy: '发布人', + pleaseDecompositionStandardOrder: '请导入或带入至少一条分解标准单', + currentlyTheFirstOneThatCannotMovedUp: '当前已是第一个无法进行上移', + currentlyTheLastOneCannotmovedDown: '当前已是最后一个无法进行下移', + weilaiRegulationMonthlyReport: '蔚来法规月报', + thereTitleWhichCannotBeDeleted: '该标题下存在新增内容,不能删除', + industryInformationDynamicTemplate: '行业资讯动态模板', + relatedFields: '相关领域', + relatedFieldsEn: '相关领域(英文)', + source: '来源', + sourceEn: '来源(英文)', + onlyone:'只能输入一个合并分隔符', } \ No newline at end of file diff --git a/jero-web/src/components/AdjustareaSofrespon/index.vue b/jero-web/src/components/AdjustareaSofrespon/index.vue index f88517b41..0ca263894 100644 --- a/jero-web/src/components/AdjustareaSofrespon/index.vue +++ b/jero-web/src/components/AdjustareaSofrespon/index.vue @@ -279,6 +279,11 @@ export default { /deep/.add-input{ min-height: 135px!important; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 8a81c237e..0346fa84c 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -240,6 +240,11 @@ export default { display: flex; justify-content: center; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 3d2a8abce..ecce064fb 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -278,6 +278,18 @@
+
+ + + + {{ item.label }} + + + +
@@ -369,18 +381,7 @@ v-model="item.dataValue"/>
-
- - - - {{ item.label }} - - - -
+
diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index ced5cdd61..4c7350ab4 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -37,7 +37,7 @@
\ No newline at end of file diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index 691d36603..953e9aaa2 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -348,6 +348,11 @@ export default { border: 1px #00B3BE solid; color: #00B3BE; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/TaskCutOffTime/indexonekey.vue b/jero-web/src/components/TaskCutOffTime/indexonekey.vue index 1da4a4c82..51541571b 100644 --- a/jero-web/src/components/TaskCutOffTime/indexonekey.vue +++ b/jero-web/src/components/TaskCutOffTime/indexonekey.vue @@ -348,6 +348,11 @@ export default { border: 1px #00B3BE solid; color: #00B3BE; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue index 70f8b1380..5a5a763dc 100644 --- a/jero-web/src/components/UpdateLog/index.vue +++ b/jero-web/src/components/UpdateLog/index.vue @@ -31,7 +31,7 @@
- - - AND{{$t('AllMatching')}} - OR{{$t('AnyOneMatches')}} - - +
+
+ {{$t('FilterMatching')}} +
+ + + + AND{{$t('AllMatching')}} + OR{{$t('AnyOneMatches')}} + + +
+ @@ -627,7 +634,33 @@ \ No newline at end of file diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 63bcabf5f..3ab81739e 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -7,7 +7,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 230px)'}" + :scroll="{x: '100%',y:'calc(100vh - 330px)'}" :data-source="dataSource" :loading="loading" sticky @@ -25,6 +25,9 @@ {{ item.db_field_txt }} {{$t('See')}}
+ + {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }} + @@ -452,6 +455,7 @@ console.log(res) if (res.data.success) { _this.$message.success(_this.$t('OperationSuccessful')) + // this.$refs['ruleFormOne'].resetFields() _this.areaVisiblezr = false this.getLoginUserType() } else { @@ -492,6 +496,7 @@ console.log(res) if (res.data.success) { _this.$message.success(_this.$t('OperationSuccessful')) + this.$refs['ruleForm'].resetFields() _this.areaVisible = false this.getLoginUserType() } else { @@ -515,23 +520,25 @@ }, // 点击工程接口人的详情人员 有权限 areaOfResponsibility(record) { - this.areaVisible = true + // this.$refs.ruleForm.clearValidate() this.$nextTick(() => { this.Dateline = { ...this.Dateline } this.getquerySdtList(record) this.$refs.ruleForm.clearValidate() }) + this.areaVisible = true }, // 点击责任领域的详情人员 有权限 ondataValueTobe(record) { - this.areaVisiblezr = true + // this.$refs.ruleForm.clearValidate() this.$nextTick(() => { this.Dateline = { ...this.Dateline } this.getquerySdtId = record.id this.$refs.ruleFormOne.clearValidate() }) + this.areaVisiblezr = true }, dataValueTobeinitiated() { this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission')) @@ -627,7 +634,7 @@ title: res.db_field_txt, dataIndex: res.db_field_name, align: 'center', - ellipsis: true, + // ellipsis: true, sorter: res.sort, width: 160 }) @@ -640,6 +647,11 @@ customRender: 'operationzr' } } + if(res.click2){ + this.columns[index].scopedSlots = { + customRender: 'ParameterDescription' + } + } if (res.click) { // 工程接口人列表修改 this.columns[index].scopedSlots = { @@ -900,6 +912,13 @@ border: none !important; padding: 0 !important; } + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + + ::v-deep .ant-table-body { + background: transparent!important; + } diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 930ec0431..28058a3d1 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -7,7 +7,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 230px)'}" + :scroll="{x: '100%',y:'calc(100vh - 330px)'}" :data-source="dataSource" :loading="loading" sticky @@ -728,6 +728,13 @@ border: none !important; padding: 0 !important; } + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + + ::v-deep .ant-table-body { + background: transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 949aa6995..ae56be4b7 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -32,7 +32,6 @@ :maxTagCount="1" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" - style="width: 100%" :tree-data="CategoryTreeList" tree-checkable :placeholder="$t('PleaseSelect')+$t('technicalField')" @@ -320,8 +319,7 @@ } .title-text { - width: 20%; - min-width: 110px; + width: 110px; color: #000F16; display: inline-block; font-weight: 500; @@ -336,7 +334,7 @@ .box-input { display: inline-block; - width: 70%; + width: calc(100% - 126px); height: 38px; margin-top: 2px; } @@ -349,4 +347,11 @@ .text-operation { margin-right: 8px; } + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + + ::v-deep .ant-table-body { + background: transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue index 6d6415529..828ce0091 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue @@ -29,7 +29,7 @@
\ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 9a0bd9f7f..335d28489 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -235,6 +235,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, + createBy: this.userInfo().username, ...queryParam } this.loading = true @@ -476,7 +477,8 @@ .text-operation { margin-right: 8px; } - ::v-deep .ant-select-dropdown{ + + ::v-deep .ant-select-dropdown { z-index: 100; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index f021fb817..b6da4ce20 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -357,5 +357,11 @@ color: red; margin-right: 4px; } + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + ::v-deep .ant-table-body { + background: transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue index 9f4811cac..e3c65af86 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue @@ -34,7 +34,7 @@
\ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 4c91a6b97..1ba768a85 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -30,9 +30,9 @@ - +
{{item2.applyMarket_dictText}} - +
@@ -116,6 +116,7 @@ } }, mounted() { + document.title = 'Country Card'+ '-' + this.$t('details') this.queryCountry(() => { this.replacePage() }) @@ -186,7 +187,6 @@ }) } if (content && content.length > 0) { - console.log(content) content.forEach((res, index) => { this.contentList[index + 1] = { name: res.lableName } this.contentList[index + 1].list = [] @@ -228,7 +228,15 @@ } postAction(this.list, query).then((res) => { if (res.success) { - this.queryCountryList = res.result || [] + this.queryCountryList = [] + applyMarkets.split(',').forEach(val => { + res.result.forEach(ol => { + if (val == ol.applyMarket) { + this.queryCountryList.push(ol) + } + }) + }) + // this.queryCountryList = res.result || [] this.isTrue = false this.$nextTick(() => { this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' @@ -345,22 +353,28 @@ display: inline-block; cursor: pointer; background: #fff; + position: relative; border-right: 1px #d9d9d9 solid; border-top: 1px #d9d9d9 solid; border-bottom: 1px #d9d9d9 solid; .content-box-box-img { - width: 70%; + width: 238px; height: 100%; } .content-box-box-text { display: inline-block; - width: 30%; + width: calc(100% - 238px); text-align: center; font-size: 18px; font-weight: 500; color: #040B29; + word-break: break-word; + white-space: pre-line; + position: absolute; + top: 50%; + transform: translateY(-66%); } } @@ -380,17 +394,18 @@ cursor: pointer; .content-box-box-img { - width: 70%; + width: 238px; height: 100%; } .content-box-box-text { display: inline-block; - width: 30%; + width: calc(100% - 238px); text-align: center; font-size: 18px; font-weight: 500; color: #040B29; + word-break: break-word; } } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue index 39181fe65..30a32dc63 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue @@ -54,6 +54,7 @@ v-if="(formInline.dataList.length-1) == index && formInline.dataList.length < 5" type="plus-circle"/> @@ -252,6 +253,5 @@ .icon-size { font-size: 18px; margin-top: 14px; - margin-right: 4px; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue index 709a02c38..2ccb9cd8b 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -186,4 +186,11 @@ .text-operation { margin-right: 8px; } + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + + ::v-deep .ant-table-body { + background: transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue index 46b941ea6..5c815c4c8 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue @@ -65,7 +65,7 @@
\ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 47b816081..80477ef65 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -278,10 +278,12 @@ } }, mounted() { - document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded') this.getBase() if (this.$route.query.id) { this.queryById() + document.title = this.$t('problemKnowledgeBase') + this.$t('edit') + } else { + document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded') } }, methods: { @@ -587,7 +589,12 @@ ::v-deep .itemModel-explain .ant-form-explain { margin-top: 60px } + ::v-deep .ql-tooltip { z-index: 10 !important; } + + ::v-deep .ql-snow .ql-picker { + height: 36px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 2b3175a5f..ec476304d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -26,15 +26,15 @@
-
+
{{$t('classificationMaintenance')}}
-
+
{{$t('managePublishing')}}
-
+
{{$t('newlyAdded')}}
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index d325f194d..674d582b4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -95,6 +95,7 @@ }, mounted() { this.getList() + document.title = this.$t('managePublishing') }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue index b5543536a..6771deb2e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue @@ -68,7 +68,7 @@
+
@@ -109,6 +110,7 @@ import defaultTemplate from './defaultTemplate' import solicitOpinions from './solicitOpinions' import releaseStandard from './releaseStandard' + import industryTemplate from './industryTemplate' import addModel from './addModel' import { getAction, postAction, downloadFile } from '@/api/manage' import moment from 'moment' @@ -119,6 +121,7 @@ defaultTemplate, solicitOpinions, releaseStandard, + industryTemplate, addModel }, data() { @@ -166,6 +169,10 @@ { id: '3', text: this.$t('NewReleasedStandardTemplate') + }, + { + id: '4', + text: this.$t('industryInformationDynamicTemplate') } ], url: { @@ -266,6 +273,8 @@ text = 'solicitOpinionsRef' } else if (this.$refs.releaseStandardRef) { text = 'releaseStandardRef' + }else if (this.$refs.industryTemplateRef) { + text = 'industryTemplateRef' } this.$refs[text].getData((val) => { this.confirmLoading = true @@ -400,5 +409,6 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-word; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index 3a8d0b8d0..57e4d207a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -37,7 +37,7 @@
{ + if (res.result == 'true') { + this.deleteBatch(val) + } else { + this.$message.warning(this.$t('thereTitleWhichCannotBeDeleted')) + } + }) + }, + deleteBatch(val) { let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'), diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue new file mode 100644 index 000000000..c0e6268d2 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue @@ -0,0 +1,326 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index e61bb0b10..d32d78d9d 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -423,6 +423,13 @@ text-justify: inter-ideograph; word-break: break-all } + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + + ::v-deep .ant-table-body { + background: transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index fea978047..50a6d18c9 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -191,7 +191,7 @@
-
+
@@ -64,7 +65,7 @@
-
+
@@ -89,7 +90,7 @@
-
+
@@ -533,6 +534,11 @@ } } + .detail-content-content-text-color { + border: 1px solid #00B3BE; + background: rgba(0,179,190,0.0300); + } + .detail-content-left { width: 50%; display: inline-block; @@ -571,7 +577,9 @@ border-radius: 4px; float: left; } - + .detail-content-bottom-color{ + background: rgba(0,179,190,0.0300); + } .detail-content-bottom-left { width: 115px; font-size: 14px; diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index d424e3ab7..7eb1bf38e 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -327,7 +327,7 @@ if (detailRightColor && detailRightColor.length > 0) { detailRightColor[0].classList.remove('detail-content-content-right-data-color-right') } - if (item.targetStand && item.targetStand >= 0) { + if (item.targetStand > -1) { let detailContent = document.getElementsByClassName('detail-content-content-right-right-top') let detailRight = document.getElementsByClassName('detail-content-content-right-data-right') this.dataRight = this.resultData.textRight[item.targetStand] @@ -357,7 +357,7 @@ if (detailLeftColor && detailLeftColor.length > 0) { detailLeftColor[0].classList.remove('detail-content-content-right-data-color') } - if (item.targetStand && item.targetStand >= 0) { + if (item.targetStand > -1) { this.dataLeft = this.resultData.textLeft[item.targetStand] let detailContent = document.getElementsByClassName('detail-content-content-right-top') let detailLeft = document.getElementsByClassName('detail-content-content-right-data') diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index c12995fcd..ada3a0888 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -355,7 +355,7 @@ }, initiatingProcessClick() { this.$router.push({ - path:'/initiateDocumentComparison' + path: '/initiateDocumentComparison' }) // let newUrl = this.$router.resolve({ // path: '/initiateDocumentComparison' @@ -489,4 +489,12 @@ color: red; margin-right: 4px; } + + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + + ::v-deep .ant-table-body { + background: transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue index 7f6d3b096..87b913116 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -51,7 +51,7 @@
\ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue index 4ea4ffa48..5d29db613 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue @@ -65,7 +65,7 @@
\ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 82463a0bb..9b896b18f 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -133,33 +133,34 @@ @click="checkedClick(item)" :class="{ 'null-input':item.checked }">
- + - + - + - +
- + @@ -167,21 +168,21 @@ >
-
-
- + @@ -684,7 +685,7 @@ let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) } else if (fileSuffix == '.docx') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') @@ -721,8 +722,8 @@ line-height: 18px !important; } - .text-left-select .ant-select { - max-width: calc(100% - 126px) !important; + .tooltip-index { + max-width: calc(100% - 300px) !important; } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue new file mode 100644 index 000000000..1c148031a --- /dev/null +++ b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue @@ -0,0 +1,308 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue new file mode 100644 index 000000000..b66553e89 --- /dev/null +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -0,0 +1,485 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index 58f5f365c..cc7d965e3 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -11,7 +11,7 @@
- + @@ -21,15 +21,17 @@ - + - + @@ -41,7 +43,8 @@
- + @@ -49,20 +52,21 @@ >
-
- +
- + @@ -188,6 +192,10 @@ this.queryParam.selectValueTwo = value this.getList() }, + getText(str) { + let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签 + return words.replace(/\s/g, '') //这里是去除空格 + }, getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { @@ -211,16 +219,43 @@ } }) }, + monthlyReportClick(item) { + let fileName = item.file_name + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + if (fileSuffix == '.pdf') { + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.file_id + '&userName=' + this.userInfo().username)) + } else if (fileSuffix == '.docx') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix) + window.open(url, '_blank') + } + }, titleClick(item) { - let newUrl = this.$router.resolve({ - path: '/docManage/library/detail', - query: { - id: item.id.slice(0, 32), - title: item.title, - serial_number: item.serial_number - } - }) - window.open(newUrl.href, '_blank') + if (item.module_type_flag == 'FGYB') { + this.monthlyReportClick(item) + } else if (item.module_type_flag == 'WTZSK') { + let newUrl = this.$router.resolve({ + path: '/problemKnowledgeBaseView', + query: { + id: item.id + } + }) + window.open(newUrl.href, '_blank') + } else { + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id: item.id.slice(0, 32), + title: item.title, + serial_number: item.serial_number + } + }) + window.open(newUrl.href, '_blank') + } } } } @@ -229,6 +264,10 @@ .highlight-class { color: #21c9cc; } + + .tooltip-index { + max-width: calc(100% - 300px) !important; + } \ No newline at end of file diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index e514ad0be..d446b4851 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -36,16 +36,14 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 130px)'}" + :scroll="{x: '100%',y:'calc(100vh - 158px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - - {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }} - + {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }} {{$t('Exporthistory')}} @@ -113,7 +111,7 @@ { title: this.$t('entryName'), align: 'center', - width: '13%', + width: '17%', dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, @@ -366,4 +364,11 @@ .add-text-text { margin-top: -14px; } + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + + ::v-deep .ant-table-body { + background: transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index b2bc75a42..93bdcf666 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -89,7 +89,7 @@
@@ -134,8 +134,9 @@ export default { rules: { separator:[ { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' }, + { min:1, max: 1, message: this.$t('onlyone'), trigger: 'blur' }, { - pattern: /[`~!@$%^&*()_\-+=<>?:"{}|.\/;'\\[\]·~！@￥%……&*（）——\-+={}|《》？：“”【】、；‘'。、]/, + pattern: /^[\`\~\!\@\$\%\^\&\*\(\)\_\+\-\= \[\]\{\}\\\|\;\'\'\:\"\"\\.\/\<\>\?]+$/, message: this.$t('punctuationmark'), trigger: 'blur' } @@ -248,6 +249,7 @@ export default { handleCancel() { this.visible = false this.required = false + this.combineFlag = false this.$refs.ruleForm.resetFields() }, certCategoryName(value){ @@ -296,6 +298,7 @@ export default { this.confirmLoading = true downloadFile('report/detail/exportNormal', query.exportName+'.zip', query) this.confirmLoading = false + this.combineFlag = false this.visible = false } }) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 5306d884b..aa785af22 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -48,12 +48,12 @@ {{$t('dre')}}
+ v-model="formInline.dreName"/>
@@ -67,7 +67,7 @@ class="box-input" :personneQuery="formInline" @change="PersonnelSelectionChange" - v-model="formInline.sdt"/> + v-model="formInline.sdtName"/>
diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 2570f1117..0b7eaad78 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -37,14 +37,14 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 140px)'}" + :scroll="{x: '100%',y:'calc(100vh - 160px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - {{ text && text.length > 40 ? text.slice(0, 39) + '...' : text }} + {{ text && text.length > 25 ? text.slice(0, 24) + '...' : text }} {{ text && text.length > 25 ? text.slice(0, 21) + '...' : text }} @@ -150,30 +150,32 @@ export default { title: this.$t('templateName'), align: 'center', dataIndex: 'templateName', + width: 300, scopedSlots: { customRender: 'templateName' } }, { title: this.$t('contentDescription'), align: 'center', dataIndex: 'description', + width: 300, scopedSlots: { customRender: 'projectName' } }, { title: this.$t('status'), align: 'center', - width: '5%', + width: 100, dataIndex: 'state_dictText' }, { title: this.$t('creater'), align: 'center', - width: '10%', + width: 100, dataIndex: 'createBy' }, { title: this.$t('Latestupdatetime'), align: 'center', - width: '10%', + width: 180, dataIndex: 'updateTime' }, { @@ -462,4 +464,11 @@ export default { .add-text-text{ margin-top: -14px; } +::v-deep .ant-table-row:first-child { + background: #fff!important; +} + +::v-deep .ant-table-body { + background: transparent!important; +} \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index dc7764ed3..e256d1914 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -510,4 +510,11 @@ export default { background: #fff; border-radius: 0 0 2px 2px; } +::v-deep .ant-table-row:first-child { + background: #fff!important; +} + +::v-deep .ant-table-body { + background: transparent!important; +} \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 2f49be832..68a37617b 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -275,6 +275,14 @@ mounted() { if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) { this.dataSource = this.evaluatorFeedbackList + if (this.dataSource && this.dataSource.length == 1 && this.$route.query.taskDefinitionKey == 'pgrqr') { + this.$nextTick(() => { + let antTableBody = document.getElementsByClassName('ant-table-body') + antTableBody[0].style = 'overflow: scroll;max-height: 500px;position: inherit' + let antTableHeader = document.getElementsByClassName('ant-table-header') + antTableHeader[0].style = 'margin-bottom: -8px;padding-bottom: 0px;min-width: 8px;overflow: hidden' + }) + } if (this.$route.query.taskDefinitionKey != 'pgrqr') { this.dataSource.forEach(res => { res.sponsorFeedback = '' diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue index 65bf69caf..2ff41bc7f 100644 --- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue @@ -26,34 +26,46 @@ export default { name: 'regulatoryCirculationHistory', + props: { + isTrue: { + type: Boolean, + default: false + } + }, data() { return { dataSource: [], loading: false, - columns: [ + columnsAll: [ { title: this.$t('OperationContent'), dataIndex: 'taskDefinitionKeyName', align: 'center', - width: '25%' + width: '20%' + }, + { + title: this.$t('opinion'), + dataIndex: 'approvalOpinion', + align: 'center', + width: '20%' }, { title: this.$t('Operator'), dataIndex: 'createBy', align: 'center', - width: '25%' + width: '20%' }, { title: this.$t('role'), dataIndex: 'operatorRoleName', align: 'center', - width: '25%' + width: '20%' }, { title: this.$t('OperationTime'), dataIndex: 'createTime', align: 'center', - width: '25%', + width: '20%', customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } @@ -64,6 +76,20 @@ mounted() { this.getList() }, + computed: { + columns() { + let columnsAll = JSON.parse(JSON.stringify(this.columnsAll)) + if (!this.isTrue) { + for (let i = 0; i < columnsAll.length; i++) { + if (columnsAll[i].title == this.$t('opinion')) { + columnsAll.splice(i, 1) + i-- + } + } + } + return columnsAll + } + }, methods: { getList() { let query = { diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 1361ff125..84123fb01 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -34,7 +34,7 @@ @submit="submit" @sendBack="sendBack" /> - +
{{this.$t('pleaseWaitWhileRunning')}} @@ -107,7 +107,8 @@ }, { title: this.$t('processBackground'), - value: 'processBackground' + value: 'processBackground', + type: 4 } ], evaluatorFeedback: [ @@ -135,7 +136,8 @@ {}, { title: this.$t('processBackground'), - value: 'processBackground' + value: 'processBackground', + type: 4 } ] } diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index ef1051a7e..4de64d21f 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -78,6 +78,7 @@ }, mounted() { this.getoptions() + this.getEcharts() }, methods: { diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index b2ce60267..aaef47f42 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -49,7 +49,7 @@
{{$t('NareaOfResponsibility')}}
- diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 97dcd2cda..55622d51d 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -561,6 +561,13 @@ text-justify: inter-ideograph; word-break: break-all } + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + + ::v-deep .ant-table-body { + background: transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index b3a67398c..0392e7492 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -11,28 +11,44 @@ > - - - - {{element.text}} - - - - - - - +
+
+ {{$t('areaOfResponsibility')}} +
+ + + + + {{element.text}} + + + + + + + +
+ - - - - {{element.projectName}} - - - +
+
+ {{$t('RelatedItems')}} +
+ + + + + {{element.projectName}} + + + +
+ {{ $t('query') }} @@ -54,32 +70,31 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' - + :scroll="{x: '100%',y:370}" @change='handleTableChange'> - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ $t('toBeConfirmed') }} + {{ $t('taskTermination') }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ $t('toBeConfirmed') }} + {{ $t('taskTermination') }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ $t('toBeConfirmed') }} + {{ $t('taskTermination') }} @@ -266,6 +281,8 @@ export default { dutyTerritory:this.formData.dutyTerritory?this.formData.dutyTerritory:'', projectName:this.formData.projectName?this.formData.projectName:'', projectNameId:this.formData.projectNameId?this.formData.projectNameId:'', + // pageNo: this.pageNo, + // pageSize: this.pageSize, } this.loading = true getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => { @@ -273,6 +290,7 @@ export default { this.areaTable = res.result.complianceResultList this.opinionGather = res.result.opinionGather this.technologyEvaluation = res.result.technologyEvaluation + // this.total = res.result.total this.loading = false }else{ this.loading = false @@ -288,10 +306,12 @@ export default { downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.item.serialNumber +'.xls', query, this.Deselect) }, searchQuery() { + this.pageNo = 1 this.loadData() }, searchReset() { this.formData = {} + this.pageNo = 1 this.loadData() }, handleCancel() { @@ -321,6 +341,33 @@ export default { diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 4e9e49ab0..9406d3be9 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -340,4 +340,11 @@ text-align: right; margin-top: 20px; } + ::v-deep .ant-table-row:first-child { + background: #fff!important; + } + + ::v-deep .ant-table-body { + background: transparent!important; + } \ No newline at end of file diff --git a/jero-web/src/views/system/modules/RoleAssignment.vue b/jero-web/src/views/system/modules/RoleAssignment.vue index 8889d781d..b6ce3f84b 100644 --- a/jero-web/src/views/system/modules/RoleAssignment.vue +++ b/jero-web/src/views/system/modules/RoleAssignment.vue @@ -130,6 +130,11 @@ export default { display: flex; justify-content: center; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/views/system/modules/departmentAllocation.vue b/jero-web/src/views/system/modules/departmentAllocation.vue index cab173a3d..42f018b0d 100644 --- a/jero-web/src/views/system/modules/departmentAllocation.vue +++ b/jero-web/src/views/system/modules/departmentAllocation.vue @@ -41,236 +41,239 @@ \ No newline at end of file