From 517e96fdc18d42861f6fbdbeb74d55aac59b41d8 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 2 Aug 2024 11:30:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=B1=BD=E5=9B=BD=E6=A0=87?= =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/prod/2024-3-18-变更.sql | 14 ++++++++ .../entity/StandardEarlyWarning.java | 9 ++++-- .../xml/LawsStandardEarlyWarningMapper.xml | 12 +++++-- .../LawsStandardEarlyWarningServiceImpl.java | 32 +++++++++++++++++++ 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/db/prod/2024-3-18-变更.sql b/db/prod/2024-3-18-变更.sql index 7aef55ab..8736bf50 100644 --- a/db/prod/2024-3-18-变更.sql +++ b/db/prod/2024-3-18-变更.sql @@ -181,3 +181,17 @@ update sys_depart set es_select_flag = 1 where parent_id = '1005000000'; -- 2024-07-10 征求意见截止时间 ALTER TABLE `process_es_revision` ADD COLUMN `total_advice_deadline` datetime NULL COMMENT '征求意见总截至日期' AFTER `review_user`; + +-- 2024-08-02 新车型实施日期备注 在产车实施日期备注 +ALTER TABLE `laws_overseas_standard` + ADD COLUMN `new_model_implementation_date_remarks` varchar(500) NULL DEFAULT NULL COMMENT '新车型实施日期备注', + ADD COLUMN `on_the_production_date_remarks` varchar(500) NULL DEFAULT NULL COMMENT '在产车实施日期备注'; + +ALTER TABLE `laws_domestic_standard` + ADD COLUMN `new_model_implementation_date_remarks` varchar(500) NULL DEFAULT NULL COMMENT '新车型实施日期备注', + ADD COLUMN `on_the_production_date_remarks` varchar(500) NULL DEFAULT NULL COMMENT '在产车实施日期备注'; + +INSERT INTO `laws_tag` (`id`, `table_name`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_show_form_create`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `del_flag`, `is_model`, `dict_id`, `home_search_context_order`, `home_search_file_order`, `dict_field_search`, `dict_table_search`, `dict_text_search`, `usable_range`) VALUES ('1818916543200575482', 'laws_overseas_standard', 'new_model_implementation_date_remarks', 'New model implementation date Remarks', '新车型实施日期备注', 13, 'new_model_implementation_date_remarks', 0, 1, 'String', 500, NULL, NULL, NULL, NULL, NULL, '5', NULL, NULL, NULL, '0', NULL, NULL, 1, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, '2024-08-01 15:47:52', 'ldq1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '1694630597254553601', NULL, 0, 0, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `laws_tag` (`id`, `table_name`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_show_form_create`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `del_flag`, `is_model`, `dict_id`, `home_search_context_order`, `home_search_file_order`, `dict_field_search`, `dict_table_search`, `dict_text_search`, `usable_range`) VALUES ('1818916543200575489', 'laws_domestic_standard', 'new_model_implementation_date_remarks', 'New model implementation date Remarks', '新车型实施日期备注', 12, 'new_model_implementation_date_remarks', 0, 1, 'String', 500, NULL, NULL, NULL, NULL, NULL, '5', NULL, NULL, NULL, '0', NULL, NULL, 1, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, '2024-08-01 15:47:52', 'ldq1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '1499657602378825729', NULL, 0, 0, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `laws_tag` (`id`, `table_name`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_show_form_create`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `del_flag`, `is_model`, `dict_id`, `home_search_context_order`, `home_search_file_order`, `dict_field_search`, `dict_table_search`, `dict_text_search`, `usable_range`) VALUES ('1818916929537916923', 'laws_overseas_standard', 'on_the_production_date_remarks', 'Remarks on date of implementation in production ve', '在产车实施日期备注', 13, 'on_the_production_date_remarks', 0, 1, 'String', 500, NULL, NULL, NULL, NULL, NULL, '5', NULL, NULL, NULL, '0', NULL, NULL, 1, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, '2024-08-01 15:49:25', 'ldq1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '1694630597254553601', NULL, 0, 0, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `laws_tag` (`id`, `table_name`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_show_form_create`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `del_flag`, `is_model`, `dict_id`, `home_search_context_order`, `home_search_file_order`, `dict_field_search`, `dict_table_search`, `dict_text_search`, `usable_range`) VALUES ('1818916929537916929', 'laws_domestic_standard', 'on_the_production_date_remarks', 'Remarks on date of implementation in production ve', '在产车实施日期备注', 12, 'on_the_production_date_remarks', 0, 1, 'String', 500, NULL, NULL, NULL, NULL, NULL, '5', NULL, NULL, NULL, '0', NULL, NULL, 1, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, '2024-08-01 15:49:25', 'ldq1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '1499657602378825729', NULL, 0, 0, '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java index 74edc862..c5ae61d6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java @@ -1,8 +1,5 @@ package com.jero.modules.laws.localTool.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; @@ -60,6 +57,12 @@ public class StandardEarlyWarning { @Excel(name = "在产车实施日期", width = 15) @ApiModelProperty(value = "在产车实施日期") private java.lang.String onTheProductionDate; + /**在产车实施日期备注*/ + @ApiModelProperty(value = "在产车实施日期备注") + private java.lang.String onTheProductionDateRemarks; + /**新车型实施日期备注*/ + @ApiModelProperty(value = "新车型实施日期备注") + private java.lang.String newModelImplementationDateRemarks; /**新车型实施日期*/ @Excel(name = "新车型实施日期", width = 15) @ApiModelProperty(value = "新车型实施日期") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml index 51ca580a..89b569f1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml @@ -10,7 +10,9 @@ dataInfo.standard_name, dataInfo.responsible_department, dataInfo.new_model_implementation_date, + dataInfo.new_model_implementation_date_remarks, dataInfo.on_the_production_date, + dataInfo.on_the_production_date_remarks, dataInfo.implementation_date FROM (SELECT DISTINCT @@ -33,6 +35,8 @@ standard.on_the_production_date, + standard.new_model_implementation_date_remarks, + standard.on_the_production_date_remarks, standard.implementation_date FROM ( @@ -44,7 +48,9 @@ lds.responsible_department, lds.on_the_production_date, lds.new_model_implementation_date, - lds.implementation_date + lds.implementation_date, + lds.on_the_production_date_remarks, + lds.new_model_implementation_date_remarks FROM laws_domestic_standard lds WHERE @@ -57,7 +63,9 @@ los.responsible_department, los.on_the_production_date, los.new_model_implementation_date, - los.implementation_date + los.implementation_date, + los.on_the_production_date_remarks, + los.new_model_implementation_date_remarks FROM laws_overseas_standard los WHERE diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java index ee652278..54b7d707 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java @@ -81,6 +81,38 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa standardEarlyWarning.setDayStrings(dayStrings); Page page = new Page<>(pageNo, pageSize); IPage pageList = lawsStandardEarlyWarningMapper.pageList(page, standardEarlyWarning); + // 需要处理新车型实施日期备注 + if (CollectionUtils.isNotEmpty(pageList.getRecords())) { + pageList.getRecords().forEach(data -> { + try { + String newModelImplementationDate = data.getNewModelImplementationDate(); + String newModelImplementationDateRemarks = data.getNewModelImplementationDateRemarks(); + String onTheProductionDate = data.getOnTheProductionDate(); + String onTheProductionDateRemarks = data.getOnTheProductionDateRemarks(); + // 根据字符串匹配找到对应的备注后去除前面的日期 + if (StringUtils.isNotBlank(newModelImplementationDateRemarks)) { + String[] split = newModelImplementationDateRemarks.split(","); + for (String s : split) { + if (s.contains(newModelImplementationDate)) { + data.setNewModelImplementationDateRemarks( + s.replace(newModelImplementationDate, "")); + } + } + } + if (StringUtils.isNotBlank(onTheProductionDateRemarks)) { + String[] split = onTheProductionDateRemarks.split(","); + for (String s : split) { + if (s.contains(onTheProductionDate)) { + data.setOnTheProductionDateRemarks( + s.replace(onTheProductionDate, "")); + } + } + } + } catch (Exception e) { + log.error("标准预警：处理备注异常", e); + } + }); + } return pageList; }