diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 284ba745f..378bf5d90 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -824,21 +824,21 @@ CREATE TABLE `sar_file_compare_res_comment` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; --- 法规技术评估-条款信息评估结果表 字段增加长度 2022-08-08 +-- 法规技术评估-条款信息评估结果表 字段增加长度 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` MODIFY COLUMN `technical_file_name` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术文件名称' AFTER `evaluation_methods`, MODIFY COLUMN `section` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节' AFTER `technical_file_name`; --- 问题知识库 字段长度修改 2022-08-08 +-- 问题知识库 字段长度修改 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`problem_knowledge_base` MODIFY COLUMN `buss_document_library_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id' AFTER `target_market`, MODIFY COLUMN `stand_number` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号' AFTER `buss_document_library_id`, MODIFY COLUMN `stand_title` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准标题' AFTER `stand_number`; --- 问题知识库 字段类型修改 2022-08-09 +-- 问题知识库 字段类型修改 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`problem_knowledge_base` MODIFY COLUMN `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容（正文）' AFTER `stand_title`; --- 国家与国旗关系表 2022-08-09 +-- 国家与国旗关系表 2022-08-11 已同步生产环境 CREATE TABLE `laws_weilai`.`country_national_flag` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', @@ -852,7 +852,7 @@ CREATE TABLE `laws_weilai`.`country_national_flag` ( `national_flag_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '国旗url', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '国家与国旗中间表' ROW_FORMAT = Dynamic; --- 初始化数据 2022-08-10 +-- 初始化数据 2022-08-11 已同步生产环境 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 ('1', NULL, NULL, NULL, NULL, NULL, '欧盟', 'EU', NULL, '/jero-boot/nationalFlag/EU.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 ('10', NULL, NULL, NULL, NULL, NULL, '美国', 'US', NULL, '/jero-boot/nationalFlag/US.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 ('11', NULL, NULL, NULL, NULL, NULL, '澳大利亚', 'Australia', NULL, '/jero-boot/nationalFlag/Australia.png'); @@ -867,22 +867,22 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti 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 ('8', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '海湾地区.jpg'); 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 ('9', NULL, NULL, NULL, NULL, NULL, '阿联酋', 'UAE', NULL, '/jero-boot/nationalFlag/UAE.png'); --- 法规意见收集-评估结果表字段长度调整 2022-08-11 +-- 法规意见收集-评估结果表字段长度调整 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_opinion_assessment_result` MODIFY COLUMN `related_section` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关章节' AFTER `laws_opinion_gather_id`, MODIFY COLUMN `issue_or_suggest` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议' AFTER `related_section`; --- 法规技术评估-评估结果表 字段长度调整 2022-08-11 +-- 法规技术评估-评估结果表 字段长度调整 2022-08-11 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_technology_evaluation_result` MODIFY COLUMN `issue_or_suggest` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议' AFTER `related_section`, MODIFY COLUMN `reason` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '理由' AFTER `issue_or_suggest`; --- 展示区域 英文修改 2022-08-11 +-- 展示区域 英文修改 2022-08-11 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Relevant Information' WHERE `id` = '1492408622838222850'; UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'General Information' WHERE `id` = '1499657602378825729'; UPDATE `laws_weilai`.`onl_cgform_area` SET `en_name` = 'Document Files' WHERE `id` = '1499658880093847553'; --- 数据字典 英文修改 2022-08-11 +-- 数据字典 英文修改 2022-08-11 已同步生产环境 -- 同步情况 sync_state UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'No' WHERE `id` = '1507311752583352322'; UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Yes' WHERE `id` = '1507311835571851265'; @@ -899,7 +899,7 @@ UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Development' WHERE `id` = UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Production' WHERE `id` = '1513769467044179970'; --- 表字段 英文修改 2022-08-11 +-- 表字段 英文修改 2022-08-11 已同步生产环境 -- OCR识别转换记录表 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Result' WHERE `id` = '6b29f1c0e03533bb380c5ead03195785'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Conversion Time' WHERE `id` = '85894f5ad04de66ccf45ebd96c97b534'; @@ -917,13 +917,35 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item No.' WHER UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Name' WHERE `id` = '9e91b704de198ccf2f5fb7297e675404'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Content' WHERE `id` = '120a92b6d595c2fd68d2b90278357ce4'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Technical Field' WHERE `id` = 'ccf68e6578a0a446a6ac34018f0a477d'; --- 文档库信息表 2022-08-12 +-- 文档库信息表 2022-08-12 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Standard Type' WHERE `id` = '441588d80cc31ce68fbdf2ce8b36f93c'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Area' WHERE `id` = '9f82d58f22a12792a53e202d64a39f06'; --- 参数项收集清单 2022-08-12 +-- 参数项收集清单 2022-08-12 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Batch' WHERE `id` = '161c35a16e92682972dd1aeb26151fa2'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Name' WHERE `id` = 'e586bd87d4d826ce3d7d373caf54c6f6'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Status' WHERE `id` = '9050dc65a7b2fe82927b74a9ef4a4bb4'; 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`; 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..ee76c4205 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 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/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..79d84035b 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"; } 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 new file mode 100644 index 000000000..03682f71a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java @@ -0,0 +1,48 @@ +package com.jero.modules.problemKnowledgeBase.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 问题知识库-查询标识枚举类 + */ +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"), + ; + + String cnName; + String enName; + String value; + + private QueryFlagEnum(String cnName, String enName, String value) { + this.cnName = cnName; + this.enName = enName; + this.value = value; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + QueryFlagEnum[] values = values(); + for (QueryFlagEnum queryFlagEnum : values) { + if (queryFlagEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return queryFlagEnum.cnName; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return queryFlagEnum.enName; + } + } + } + return null; + } +} 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 c5226def4..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,9 +6,11 @@ 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; +import com.jero.modules.problemKnowledgeBase.enums.QueryFlagEnum; import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; @@ -18,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; @@ -216,9 +219,9 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl countryCardManageReleaseEOList = this.list(); - //如果查询标识是空，则是在countryCard管理发布页面新增数据时使用：管理发布页新增查询的是，所有未创建countryCard的适用市场。 - //如果查询标识不是空，则是在CountryCard的首页使用：首页查询的是 所有已创建了countryCard的适用市场。 - if (StringUtils.isEmpty(queryFlag)) { + if (StringUtils.equals(queryFlag, QueryFlagEnum.GET_ALL_APPLY_MARKET.getValue())) { + result = dictModelList; + }else if (StringUtils.equals(queryFlag,QueryFlagEnum.GET_NOT_CREATE_APPLY_MARKET.getValue())) { if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){ result = dictModelList; }else { @@ -236,7 +239,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl queryList() { - return list(); + List result = this.list(); + // 匿名比较器排序 + Collections.sort(result, new Comparator() { + @Override + public int compare(ProblemKnowledgeBaseClassifyEO p1, ProblemKnowledgeBaseClassifyEO p2) { + return p1.getProblemLabel().compareTo(p2.getProblemLabel()); + } + }); + return result; } @Override 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 cad2b60e5..b8c54e9e8 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 @@ -50,6 +50,8 @@ 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); } /** @@ -308,20 +322,25 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl { boolean flag = false; - if (StringUtils.equals(targetMarket, region.getValue())) { - flag = true; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, region.getValue())) { + flag = true; + } } return flag; }).map(DictModel::getText).collect(Collectors.joining(",")); }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ targetMarket_dicText = regionList.stream().filter(region -> { boolean flag = false; - if (StringUtils.equals(targetMarket, region.getValue())) { - flag = true; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, region.getValue())) { + flag = true; + } } return flag; }).map(DictModel::getTextEn).collect(Collectors.joining(",")); @@ -348,11 +367,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/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index 659adc94d..46058eaca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -44,7 +44,6 @@ public class ProjectLibraryBaseController extends JeroController queryPageList(@RequestBody Map params) { IPage pageList= projectLibraryBaseService.queryPageList(params); 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..521c43992 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]); @@ -367,7 +367,7 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi 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"; + title = "Responsible Field,Relevant project,Design Compliance Confirmation,Pre-Homo Confirmation,Validation Compliance Confirmation"; fileName = "Compliance results" + ".xlsx"; } OutputStream os = null; @@ -391,7 +391,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]); 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..03a7c2498 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,10 @@ public class LawsMonthlyReportWriteEO implements Serializable { @TableField(exist = false) private String ids; + //新添字段 + private String relatedAreasCn;//相关领域中文 + private String relatedAreasEn;//相关领域英文 + private String source;//来源 + 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..6b2ef20e5 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,9 @@ + + + + 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/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 ff53dad1a..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()); //新征求意见清单模板 @@ -456,8 +465,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOService.list(); lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOS.stream() .filter(e -> memoriesChapterList.contains(e.getId())).collect(Collectors.toList()); - - String path = uploadpath + "/tempZip"; + long l = System.currentTimeMillis(); + String path = uploadpath + "/tempZip"+l; File fileTemp = new File(path); if (fileTemp.exists()) { fileTemp.delete(); @@ -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文件 @@ -514,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<>(); @@ -583,13 +617,15 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleOneList, String titleCN, XWPFDocument document, - String cut) { + String cut, + List loginUserList) { //数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); @@ -753,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,163 @@ 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 source = lawsMonthlyReportWriteEO.getSource();//来源 + 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, "来源",source); + //第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",source); + //第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 +777,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/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index d5961d3c1..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 @@ -41,9 +41,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -127,9 +130,63 @@ public class LawsWarnService { bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, onlCgformFieldListTemp,null); bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); } + //到期前6个月显示红色，到期前12个月显示黄色 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String newCarTime = String.valueOf(record.get("xin1_che1_xing2_shi2_shi1_ri4_qi1")); + String implementTime = String.valueOf(record.get("implement_time")); + String currentTime = sdf.format(new Date()); + if(StringUtils.isNotBlank(newCarTime) && !"null".equals(newCarTime)){ + try { + if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 0){ + Date newCarTimeDate = sdf.parse(newCarTime); + //当前时间的前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)) || newCarTime.equals(beforeTimeSix)){ + record.put("new_colour","red"); + } + if((newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)) || newCarTime.equals(beforeTimeTwelve)){ + record.put("new_colour","yellow"); + } + } + } catch (ParseException e) { + e.printStackTrace(); + } + } + if(StringUtils.isNotBlank(implementTime) && !"null".equals(implementTime)){ + try { + if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 1){ + 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((implementTimeDate.after(new Date()) && implementTimeDate.before(parseSix)) || implementTime.equals(beforeTimeSix)){ + record.put("implement_colour","red"); + } + if((implementTimeDate.after(parseSix) && implementTimeDate.before(parseTwelve)) || implementTime.equals(beforeTimeTwelve)){ + record.put("implement_colour","yellow"); + } + } + } catch (ParseException e) { + e.printStackTrace(); + } + } } return infoPage; } + private String beforeTime (int month, Date date){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar calendarBefore = Calendar.getInstance(); + calendarBefore.setTime(date); + calendarBefore.add(Calendar.MONTH, month); + Date dateBefore = calendarBefore.getTime(); + String beforeTime = sdf.format(dateBefore); + return beforeTime; + } public void exportExcel(Map map, HttpServletResponse response, HttpServletRequest request) { String cut = (String) map.get("cut"); 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 5e03aefe8..a94cf3b59 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -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', @@ -1255,9 +1255,11 @@ module.exports = { deleteNode:'If there is any file information, the file will be deleted. Are you sure to delete this data?', HaveReleased:'Have released', forward:'Forward', + areResponsibilityAreaInformationBatch:'Are you sure you want to modify the responsibility area information in batch', issuedBy:'Issued by', pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order', 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', } \ 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 c95accf02..89622c213 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -495,7 +495,7 @@ module.exports = { toBeConfirmed: '待确认', Operator: '操作人', role: '角色', - operationContent: '操作内容', + OperationContent: '操作内容', operationTime: '操作时间', toDoProcess: '待办流程', processDone: '已办流程', @@ -1357,9 +1357,11 @@ module.exports = { deleteNode:'若有文件信息将同步删除，确认删除该条数据？', HaveReleased:'已发布', forward:'转发', + areResponsibilityAreaInformationBatch:'确实是否批量修改责任领域信息', issuedBy:'发布人', pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', weilaiRegulationMonthlyReport:'蔚来法规月报', + thereTitleWhichCannotBeDeleted:'该标题下存在新增内容,不能删除', } \ 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 94961b84c..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 }} - - - -
+
@@ -680,8 +681,9 @@ uploadFileChangeDown }, mounted() { + console.log(this.detailDate) this.detailDate.list.forEach((item) => { - if (item.type === 'pull_more') { + if (item.type === 'pull_more' && !item.dataValue) { item.dataValue = [] } // this.detailDatetransformation.push(item) @@ -737,11 +739,11 @@ }, watch: { detailDate(newold, oldold) { - console.log(newold, oldold, 'll') + // console.log(newold, oldold, 'll') }, formInline: { handler(newOld, oldval) { - console.log(newOld, oldval, 'll') + // console.log(newOld, oldval, 'll') }, deep: true } diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index 2c5c7b703..ced5cdd61 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -1,7 +1,7 @@
-
+
{{$t('classificationMaintenance')}}
-
+
{{$t('managePublishing')}}
-
+
{{$t('newlyAdded')}}
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..cd49be66e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -205,6 +205,15 @@ this.$message.warning(this.$t('thereWhichCannotDeleted')) return } + getAction('/report/lawsMonthlyReportTitleTemplateEO/verifyDelete', { ids: val.id }).then((res) => { + 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/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 583c1df2a..d851a0ecf 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -44,8 +44,10 @@ {{$t('selectedStandard')}}
- {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber+' - '+selectedRowKeysRecord[0].title:''}} + {{selectedRowKeysRecord[0] ? + selectedRowKeysRecord[0].serialNumber+'-'+selectedRowKeysRecord[0].title:''}}
@@ -323,6 +325,7 @@ this.formInline.lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId this.formInline.remark = this.$route.query.remark this.formInline.standId = this.$route.query.standId + this.formInline = { ...this.formInline } this.getListOne() } eventBUs.$on('searchQuery', search => { @@ -539,6 +542,8 @@ value[res] = value[res].replace(/\'/g, '‘') } }) + let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + value.handlingTime = operatorTime this.startProcess(value, dataList) }, startProcess(value, dataList) { @@ -694,6 +699,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-word; + padding: 0 14px; + box-sizing: border-box; } .title-text-right { @@ -707,6 +715,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-word; + padding: 0 14px; + box-sizing: border-box; color: #21c9cc; cursor: pointer; } diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 4189fc701..fea978047 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -590,6 +590,7 @@ text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + word-break: break-word; color: #040B29; font-weight: 400; } @@ -618,6 +619,7 @@ font-size: 16px; text-overflow: ellipsis; white-space: pre-wrap; + word-break: break-word; overflow: visible; float: left; color: #040B29; diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 91cf4407e..b3807a125 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -540,6 +540,7 @@ this.form.name = this.nodeItem.name this.form.itemName = this.nodeItem.itemName this.form.displaySeq = this.nodeItem.displaySeq + this.form = { ...this.form } this.menuRightVisible = true }, //树形删除 @@ -1314,7 +1315,7 @@ max-height: 39vh !important; } - .ant-modal-body { + .ant-modal-body { overflow-y: visible !important; } @@ -1388,11 +1389,9 @@ /*.title-text {*/ /* min-width: 73px !important;*/ /*}*/ - /*.split-detail-wrap {*/ /* height: 481px !important;*/ /*}*/ - /*.mainItem {*/ /* height: 500px;*/ /*}*/ @@ -1402,7 +1401,6 @@ /*.split-detail .split-detail-wrap .split-detail-left {*/ /* height: 735px !important;*/ /*}*/ - /*.mainItem {*/ /* height: 800px !important;*/ /*}*/ diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue index 4c910cdfe..9c66155a9 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue @@ -47,7 +47,8 @@
-
+
@@ -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/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 82463a0bb..e4abc53ed 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -720,10 +720,6 @@ height: 18px !important; line-height: 18px !important; } - - .text-left-select .ant-select { - max-width: calc(100% - 126px) !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..85b4932ba --- /dev/null +++ b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue @@ -0,0 +1,278 @@ + + + + + \ 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..448483f82 --- /dev/null +++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue @@ -0,0 +1,546 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 870631efb..8d6826fc5 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -23,7 +23,8 @@ v-model="selectValueTwo" :maxLength="100" @keyup.enter.native="wholeOnSearch(selectValueTwo)" - v-else-if="active === $t('whole')" + v-else-if="active === $t('whole') || active === $t('problemKnowledgeBase') + || active === $t('monthlyReportRegulations')" class="inputSearch" :placeholder="$t('pleaseEnter')+$t('searchContent')" > @@ -33,18 +34,21 @@ >{{$t('query')}} {{$t('query')}} {{$t('searchInResults')}} {{$t('reset')}} @@ -61,14 +65,18 @@ - - - + + + +
+ +
@@ -78,13 +86,17 @@ @@ -659,7 +685,8 @@ .box-content-cou { cursor: pointer; } - .box-content-buttom{ + + .box-content-buttom { width: 100%; overflow: hidden; display: -webkit-box; diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue index bea09d067..4a1285e36 100644 --- a/jero-web/src/views/projectManagement/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/batSetting.vue @@ -215,6 +215,13 @@ }) }, handleOk() { + if (this.formInline.dutyTerritory) { + this.handleOkTwo() + } else { + this.handleOkOne() + } + }, + handleOkOne() { let ids = JSON.parse(JSON.stringify(this.ids)) let query = { ids: ids.join(','), @@ -233,6 +240,31 @@ } }) }, + handleOkTwo() { + let _this = this + this.$confirm({ + content: _this.$t('areResponsibilityAreaInformationBatch'), + onOk() { + let ids = JSON.parse(JSON.stringify(_this.ids)) + let query = { + ids: ids.join(','), + ..._this.formInline + } + _this.confirmLoading = true + postAction(_this.url.setBatch, query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.visible = false + _this.confirmLoading = false + _this.$emit('batSettingList') + } else { + _this.$message.warning(_this.$t('operationFailed')) + _this.confirmLoading = false + } + }) + } + }) + }, handleCancel() { this.formInline = {} this.visible = false diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index ea5608dd6..460c504bd 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -838,8 +838,8 @@ rulesData: { subtitle: [ { - max: 100, - message: this.$t('subtitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 300, + message: this.$t('subtitle') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e289457ce..194e2cda8 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -29,10 +29,10 @@
{{ $t('areaOfResponsibility') }}
- +
@@ -200,7 +200,7 @@ class="tableList" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 170px)'}" + :scroll="{x: '100%',y:'calc(100vh - 186px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -273,6 +273,9 @@ -- +
+ {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}} +
@@ -1386,9 +1389,15 @@ if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { roleCode = 0 } + let queryParam = JSON.parse(JSON.stringify(this.queryParam)) + Object.keys(queryParam).forEach(val => { + if (queryParam[val] instanceof Array) { + queryParam[val] = queryParam[val].join(',') + } + }) let query = { ...this.queryParamQuery, - ...this.queryParam, + ...queryParam, projectLibraryId: this.$route.query.id, roleCode: roleCode } @@ -2257,6 +2266,14 @@ text-justify: inter-ideograph; word-break: break-all } + + .buttom-box { + width: 100%; + text-align: right; + font-size: 16px; + font-weight: 500; + color: #000F16; + } + \ 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..24ebea27a 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') }} @@ -58,28 +74,28 @@ @change='handleTableChange'> - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} - {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} + {{ text }} @@ -321,6 +337,33 @@ export default {