diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5bd12ca..03ca955 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml
index fd681bb..3bfac4b 100644
--- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml
index 4b957f8..66fd58c 100644
--- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml b/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml
index b580403..c803520 100644
--- a/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml
+++ b/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml
index dcd6ee5..2cdf25a 100644
--- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml
+++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml
index af36493..9ce1011 100644
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml
index ed7c028..56ca092 100644
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml
index 64ee3b1..8dadb10 100644
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml
index 997e69b..a67e6d7 100644
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml
index 32aac0b..893e509 100644
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml
index 6e572fd..7bd08c4 100644
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml
index 46a2dcc..49f73b6 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml
index aadfdc1..3225882 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml
index 42fc1e4..0d8cd7a 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml
index 803846e..0cedb0a 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml
index c5f1f55..0aaf5c1 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml
index 9a59f11..e4acb69 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml
index e9b391b..8a0f349 100644
--- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml
+++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml
index 3056db8..b28fff9 100644
--- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml
+++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_oracle_database_jdbc_ojdbc8_21_3_0_0.xml b/.idea/libraries/Maven__com_oracle_database_jdbc_ojdbc8_21_3_0_0.xml
index f8d75b1..ff6a736 100644
--- a/.idea/libraries/Maven__com_oracle_database_jdbc_ojdbc8_21_3_0_0.xml
+++ b/.idea/libraries/Maven__com_oracle_database_jdbc_ojdbc8_21_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
index b8581a6..5eb2b35 100644
--- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
+++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
index 9314c36..c747323 100644
--- a/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
+++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
index be90656..624e833 100644
--- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
+++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
index cba9dd2..0d51901 100644
--- a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
+++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
index 04213f7..0192e98 100644
--- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
+++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml
index c117a77..b0f1889 100644
--- a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml
+++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml
index c957e32..dedcf1e 100644
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml
+++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml
index b67ac50..d13245d 100644
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml
+++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml
index 6b7b59a..c7671bb 100644
--- a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml
+++ b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml
index 7479a40..4fb29ab 100644
--- a/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml
+++ b/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml
index 0a8d4ff..9593449 100644
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml
index a4f1650..15a9fd6 100644
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml
index f0ad621..0f16a1e 100644
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml
index 6952c57..2469e48 100644
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml
index 20657bf..0c8717c 100644
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml
index 6ac1c42..1a06739 100644
--- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml
+++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml
index 03e3cae..993a750 100644
--- a/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml
+++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
index 5bad7db..1838b35 100644
--- a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
+++ b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml
index 6ffac07..07491d3 100644
--- a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml
+++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
index 6b5496f..f08b75b 100644
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml
index 4f367e7..49a5485 100644
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml
index 8e50783..5744e41 100644
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml
index fc8291b..d477228 100644
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml
index 4b3ffb1..32533ba 100644
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml
index 181d095..6d332c3 100644
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml
+++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml
index 5f3aebe..8b6af51 100644
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml
+++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml
index cf13209..8789950 100644
--- a/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml
+++ b/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml
index 49e3f23..f8eb710 100644
--- a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml
+++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml
index 5a8050c..4f1357f 100644
--- a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml
index d35eb55..d1b1d9d 100644
--- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml
index 6613def..f7723a6 100644
--- a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml
+++ b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
index fbc1b16..bebbb38 100644
--- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
+++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml
index 67127c2..a13059f 100644
--- a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml
+++ b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml
index 72b596e..5cffa84 100644
--- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml
+++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
index c4c54d6..8dea164 100644
--- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
+++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml
index 5d5c14b..a6a570e 100644
--- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml
+++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml
index 2d759c1..e71f13b 100644
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml
index 512289c..5470298 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml
index 00bb9da..f225e53 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_6.xml
index b063582..2c3c04c 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml
index 2ed0547..26fe404 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml
index e2e8ba2..47348e7 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml
index 5eaee39..65413c2 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml
index 9b274ec..e3c782a 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml
index 50680c4..e3f2001 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml
index c9b0002..430a840 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_6_6.xml
index 4f1283a..2f98709 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml
index 5036d1e..f2d75c9 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml
index ff1999f..41cffd0 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml
index 6a451a6..f7f57ec 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml
index 3556e5b..c7e2738 100644
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml
index a0e36b6..cf9641a 100644
--- a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml
index 644de4d..4f0c8ae 100644
--- a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml
index 2a5838f..01f2da1 100644
--- a/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml
index df6e618..4063512 100644
--- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml
index 78b1303..53e8608 100644
--- a/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml
index 7e96f06..530a252 100644
--- a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml
index 4f4fc2b..75120b1 100644
--- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml
index 8f3ce39..24deb65 100644
--- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml
index 1d576a9..8ceaf93 100644
--- a/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml
index 39af211..3374580 100644
--- a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml
index 00d2b00..2a04ddf 100644
--- a/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml
index b2dab0c..95fa0da 100644
--- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml
+++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
index 7b246ae..f7b24c7 100644
--- a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
+++ b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml
index e17f90f..de06823 100644
--- a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml
+++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml
index 910256d..bcf1e18 100644
--- a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml
+++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml
index 2334aa0..c8017d4 100644
--- a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml
+++ b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml
index 23e67e6..c2004af 100644
--- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml
+++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml
index c871529..61cd4dc 100644
--- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml
+++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java b/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java
index 4519f2c..6aeb525 100644
--- a/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java
+++ b/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java
@@ -49,7 +49,12 @@ public class AdsorptionTankController {
public String getTeamStatisticsJson(){
List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1001");
if(mesTeamStatisticsList.size()>0){
- return JSONArray.toJSONString(mesTeamStatisticsList.get(0));
+ MesTeamStatistics mesTeamStatistics = mesTeamStatisticsList.get(0);
+ mesTeamStatistics.setClassName("白班");
+ int planAmount = Integer.parseInt(mesTeamStatistics.getPlanAmount() == null ? "0" : mesTeamStatistics.getPlanAmount());
+ int actualAmount= Integer.parseInt(mesTeamStatistics.getActualAmount() == null ? "0" : mesTeamStatistics.getActualAmount());
+ mesTeamStatistics.setDifferenceAmount((planAmount - actualAmount)+"");
+ return JSONArray.toJSONString(mesTeamStatistics);
}
return JSONArray.toJSONString(new MesTeamStatistics());
}
diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java
index 57187da..e3b1177 100644
--- a/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java
+++ b/productionboard/src/main/java/com/productionboard/mapper/MesTeamStatisticsMapper.java
@@ -1,10 +1,15 @@
package com.productionboard.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.productionboard.entity.MesProduction.MesHourProdutionStatistics;
import com.productionboard.entity.MesProduction.MesTeamStatistics;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
/**
* Mes班组生产统计
* @author WenJY
@@ -13,4 +18,7 @@ import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface MesTeamStatisticsMapper extends BaseMapper {
+
+ @Select("select * from table ( scada_xfnd_bztj(#{in_id}) )")
+ List getAdsorptionTankTeamStatistics(@Param("in_id") Integer in_id);
}
diff --git a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java
index dec28ed..7778f19 100644
--- a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java
+++ b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java
@@ -41,10 +41,8 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService {
*/
@Override
public List getMesTeamStatisticsList(String locationNumber) {
- QueryWrapper wrapper = new QueryWrapper();
- wrapper.eq("POSIONID",locationNumber);
- List mesTeamStatistics = teamStatisticsMapper.selectList(wrapper);
- return mesTeamStatistics;
+ List adsorptionTankTeamStatistics = teamStatisticsMapper.getAdsorptionTankTeamStatistics(1);
+ return adsorptionTankTeamStatistics;
}
/**
diff --git a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class
index 1ead10a..86d3f28 100644
Binary files a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class and b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class differ
diff --git a/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class
index e4b5a19..7f585d8 100644
Binary files a/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class differ
diff --git a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class
index 6718f17..35ec3f2 100644
Binary files a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class differ