Merge remote-tracking branch 'origin/master'

.idea/workspace.xml

@@ -4,200 +4,19 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="wanghaodong">
+    <list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="1019文档需求">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmQfxq.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/QfExcel.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/listeners/ExcelQFListener.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/listeners/ExcelSYListener.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmQfxqService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmQfxqMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_corundumstudio_socketio_netty_socketio_1_7_23.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_corundumstudio_socketio_netty_socketio_1_7_23.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_infradna_tool_bridge_method_annotation_1_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_infradna_tool_bridge_method_annotation_1_13.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_microsoft_sqlserver_mssql_jdbc_7_4_1_jre8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_microsoft_sqlserver_mssql_jdbc_7_4_1_jre8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_codegen_codegen_0_6_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_codegen_codegen_0_6_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_commons_mysema_commons_lang_0_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_commons_mysema_commons_lang_0_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_apt_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_apt_4_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_codegen_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_codegen_4_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_core_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_core_4_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_jpa_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_jpa_4_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_52_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_10_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_10_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_13.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_14.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_14.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_fontbox_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_fontbox_2_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_2_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_38.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_38.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_38.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_38.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ehcache_ehcache_3_8_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ehcache_ehcache_3_8_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_21_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_21_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_2_1_3_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_2_1_3_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_20.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_9_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gj_erp.iml" beforeDir="false" afterPath="$PROJECT_DIR$/gj_erp.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/SYController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/SYController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml" afterDir="false" />
     </list>
     <list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" />
     <list id="4d943a56-b745-4db0-8fd5-bbd1f49b8f76" name="Revert &quot;finish&quot;-2" comment="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
@@ -220,84 +39,47 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RESET_MODE" value="KEEP" />
   </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
   <component name="ProjectId" id="2VTh8L8FuI3m4hrNyj7pp34alDh" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="PropertiesComponent">
-  "keyToString": {
+    <property name="RequestMappingsPanelOrder0" value="0" />
-    "RequestMappingsPanelOrder0": "0",
+    <property name="RequestMappingsPanelOrder1" value="1" />
-    "RequestMappingsPanelOrder1": "1",
+    <property name="RequestMappingsPanelWidth0" value="75" />
-    "RequestMappingsPanelWidth0": "75",
+    <property name="RequestMappingsPanelWidth1" value="75" />
-    "RequestMappingsPanelWidth1": "75",
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    "RunOnceActivity.ShowReadmeOnStart": "true",
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    "WebServerToolWindowFactoryState": "false",
+    <property name="TODO_SCOPE" value="All Places" />
-    "last_opened_file_path": "E:/runpeng/gjerp_ui",
+    <property name="WebServerToolWindowFactoryState" value="false" />
-    "node.js.detected.package.eslint": "true",
+    <property name="aspect.path.notification.shown" value="true" />
-    "node.js.detected.package.tslint": "true",
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    "node.js.selected.package.eslint": "(autodetect)",
+    <property name="node.js.detected.package.eslint" value="true" />
-    "node.js.selected.package.tslint": "(autodetect)",
+    <property name="node.js.detected.package.tslint" value="true" />
-    "nodejs_package_manager_path": "npm",
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    "spring.configuration.checksum": "e66d70b2c05a7b57c5785db699821511",
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    "vue.rearranger.settings.migration": "true"
+    <property name="nodejs_package_manager_path" value="npm" />
-  }
+    <property name="settings.editor.selected.configurable" value="application.passwordSafe" />
-}]]></component>
+    <property name="vue.rearranger.settings.migration" value="true" />
+  </component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\runpeng\gj_erp_new\src\main\resources\mappers\sy" />
+      <recent name="E:\workSpace\gj_erp\src\main\java\com\dsic\gj_erp\dao\sy" />
-      <recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\service\jhgk\impl" />
+      <recent name="E:\workSpace\gj_erp\src\main\java\com\dsic\gj_erp\bean\request" />
-      <recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\service\jhgk" />
-      <recent name="E:\runpeng\gj_erp_new\src\main\resources\mappers\jhgk" />
-      <recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\mapper\jhgk" />
-    </key>
-    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
-      <recent name="com.dsic.gj_erp.bean.jhgk" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.dsic.gj_erp.service.jhgk" />
-      <recent name="com.dsic.gj_erp.service.jhgk.impl" />
-      <recent name="com.dsic.gj_erp.mapper.jhgk" />
-      <recent name="com.dsic.gj_erp.controller.jhgk" />
       <recent name="com.dsic.gj_erp.bean.jhgk" />
+      <recent name="com.dsic.gj_erp.dao.jhgk" />
+      <recent name="com.dsic.gj_erp.dao.jcsj" />
+      <recent name="com.dsic.gj_erp.common" />
     </key>
   </component>
   <component name="RunManager" selected="Spring Boot.GjErpApplication">
-    <configuration name="DmSygdController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.controller.jhgk.DmSygdController" />
-      <module name="gj_erp" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.dsic.gj_erp.controller.jhgk.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="DmSygdServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.dsigj_erp.service.jhgk.impl.DmSygdServiceImpl" />
-      <module name="gj_erp" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.dsigj_erp.service.jhgk.impl.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.Test" />
       <module name="gj_erp" />
@@ -311,15 +93,13 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" />
+      <option name="arquillianRunConfiguration">
-      <module name="gj_erp" />
+        <value>
-      <extension name="coverage">
+          <option name="containerStateName" value="" />
-        <pattern>
+        </value>
-          <option name="PATTERN" value="com.dsic.gj_erp.service.jhgk.impl.*" />
+      </option>
-          <option name="ENABLED" value="true" />
+      <option name="TEST_OBJECT" value="class" />
-        </pattern>
-      </extension>
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -331,13 +111,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" />
-        <item itemvalue="Application.DmSygdServiceImpl" />
-        <item itemvalue="Application.DmSygdController" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
@@ -372,22 +145,11 @@
       <workItem from="1695351043840" duration="2412000" />
       <workItem from="1695353513521" duration="2941000" />
       <workItem from="1695383415111" duration="2165000" />
-      <workItem from="1695802200024" duration="1611000" />
+      <workItem from="1697763475514" duration="1179000" />
-      <workItem from="1695870308694" duration="2922000" />
+      <workItem from="1697800899358" duration="4279000" />
-      <workItem from="1696475736363" duration="677000" />
+      <workItem from="1697852420526" duration="5738000" />
-      <workItem from="1696594298875" duration="6495000" />
+      <workItem from="1697871559613" duration="9557000" />
-      <workItem from="1696639837317" duration="12226000" />
+      <workItem from="1697940710591" duration="5807000" />
-      <workItem from="1696679003360" duration="1876000" />
-      <workItem from="1696734164061" duration="6012000" />
-      <workItem from="1696766214791" duration="851000" />
-      <workItem from="1696810883365" duration="19166000" />
-      <workItem from="1696854193468" duration="4998000" />
-      <workItem from="1696896554070" duration="5484000" />
-      <workItem from="1696986013167" duration="18352000" />
-      <workItem from="1697024673176" duration="3734000" />
-      <workItem from="1697073780884" duration="20100000" />
-      <workItem from="1697112185533" duration="1226000" />
-      <workItem from="1697163262383" duration="2146000" />
     </task>
     <task id="LOCAL-00001" summary="finish">
       <created>1695345779307</created>
@@ -459,7 +221,14 @@
       <option name="project" value="LOCAL" />
       <updated>1695353309158</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="1019文档需求">
+      <created>1697885046984</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1697885046984</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -475,6 +244,7 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="finish" />
@@ -485,13 +255,22 @@
     <MESSAGE value="Revert &quot;TEST&quot;1" />
     <MESSAGE value="Revert &quot;finish&quot;&#10;&#10;test" />
     <MESSAGE value="111&#10;&#10;This reverts commit f64a4dcb" />
-    <option name="LAST_COMMIT_MESSAGE" value="111&#10;&#10;This reverts commit f64a4dcb" />
+    <MESSAGE value="1019文档需求" />
+    <option name="LAST_COMMIT_MESSAGE" value="1019文档需求" />
   </component>
   <component name="XDebuggerManager">
-    <watches-manager>
+    <breakpoint-manager>
-      <configuration name="SpringBootApplicationConfigurationType">
+      <breakpoints>
-        <watch expression="((HashMap)param_1).entrySet().toArray()[2]" custom="java.util.HashMap" />
+        <breakpoint enabled="true" type="java-exception">
-      </configuration>
+          <properties class="java.lang.StackOverflowError" package="java.lang" />
-    </watches-manager>
+          <option name="timeStamp" value="6" />
+        </breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+    <pin-to-top-manager>
+      <pinned-members>
+        <PinnedItemInfo parentTag="java.util.HashMap$Node" memberName="value" />
+      </pinned-members>
+    </pin-to-top-manager>
   </component>
 </project>

src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -46,5 +47,15 @@ public class EmGcrl implements Serializable {
     @ApiModelProperty(value = "备注")
     private String bz;
 
+    @ApiModelProperty(value = "星期（星期几）")
+    private String xq;
 
+    @ApiModelProperty(value = "月周（一月中的第几周）")
+    private String yz;
+
+    @ApiModelProperty(value = "年周（一年中的第几周）")
+    private String nz;
+
+    @ApiModelProperty(value = "工作日历（一年中的第几天）")
+    private String gzlr;
 }

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java

@@ -49,4 +49,15 @@ public class EmSbcnp implements Serializable {
     private String dwsj;
 
 
+    @ApiModelProperty(value = "所属部门")
+    @TableField("SZCS")
+    private String szcs;
+
+    @ApiModelProperty(value = "跨位")
+    @TableField("KW")
+    private String kw;
+
+    @ApiModelProperty(value = "工序")
+    @TableField("GX")
+    private String gx;
 }

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java

@@ -54,6 +54,9 @@ public class EmSbrydyp implements Serializable {
     @TableField("YLZD1")
     private String ylzd1;
 
+    @TableField("SZCS")
+    private String szcs;
+
     @TableField("SBBH")
     @Id
     @ApiModelProperty(value = "设备编号")
@@ -78,5 +81,6 @@ public class EmSbrydyp implements Serializable {
     @TableField("YLZD2")
     private String ylzd2;
 
-
+//    @TableField("YLZD2")
+//    private String szcs;
 }

src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java

@@ -31,90 +31,28 @@ public class DmXbjh implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-//    @ExcelProperty("学生编号")
-    @ApiModelProperty(value = "状态； 0未提交1已提交；默认为0；")
-    private String zt;
-
-//    @ExcelProperty("学生编号")
-    @ApiModelProperty(value = "2023年01月的 产量，后面字段以此类推")
-    @TableField("cl_202301")
-    private Double cl202301;
-
-    @TableField("cl_202405")
-    private Double cl202405;
-
-    @TableField("cl_202411")
-    private Double cl202411;
-
-    @TableField("cl_202303")
-    private Double cl202303;
-
-    @TableField("cl_202408")
-    private Double cl202408;
-
-    @TableField("cl_202402")
-    private Double cl202402;
-
-    @TableField("cl_202306")
-    private Double cl202306;
-
-    @TableField("cl_202407")
-    private Double cl202407;
-
-    @TableField("cl_202501")
-    private Double cl202501;
-
     @Id
-    @TableId(value = "dc_ch", type = IdType.ASSIGN_UUID)
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
-    private String dcCh;
+    private String id;
 
-    @TableField("cl_202311")
+    @ApiModelProperty(value = "年份")
-    private Double cl202311;
+    private String nf;
 
-    @TableField("cl_202305")
+    @ApiModelProperty(value = "月份")
-    private Double cl202305;
+    private String yf;
 
-    @TableField("cl_202410")
+    @ApiModelProperty(value = "重量")
-    private Double cl202410;
+    private Double zl;
 
-    @TableField("cl_202308")
+    @ApiModelProperty(value = "有效年份")
-    private Double cl202308;
+    private String yxnf;
 
-    @TableField("cl_202302")
+    @ApiModelProperty(value = "状态")
-    private Double cl202302;
+    private String zt;
-
-    @TableField("cl_202307")
-    private Double cl202307;
-
-    @TableField("cl_202401")
-    private Double cl202401;
-
-    @TableField("cl_202404")
-    private Double cl202404;
-
-    @TableField("cl_202412")
-    private Double cl202412;
-
-    @TableField("cl_202310")
-    private Double cl202310;
-
-    @TableField("cl_202304")
-    private Double cl202304;
-
-    @TableField("cl_202409")
-    private Double cl202409;
-
-    @TableField("cl_202403")
-    private Double cl202403;
-
-    @TableField("cl_202309")
-    private Double cl202309;
 
-    @TableField("cl_202406")
+    @ApiModelProperty(value = "船号")
-    private Double cl202406;
+    private String dcCh;
 
-    @TableField("cl_202312")
-    private Double cl202312;
 
 
 }

src/main/java/com/dsic/gj_erp/bean/request/EmSbwxjhBean.java

@@ -11,4 +11,6 @@ public class EmSbwxjhBean {
     private String beginTime;
     @ApiModelProperty(value = "计划结束时间yyyy/MM/dd")
     private String endTime;
+    @ApiModelProperty(value = "所属部门")
+    private String szcs;
 }

src/main/java/com/dsic/gj_erp/controller/SYController.java

@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.sy.*;
@@ -10,10 +11,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
@@ -268,4 +266,12 @@ public class SYController {
         return new ResultBean(map);
     }
 
+    @ApiOperation(value = "设备信息转码")
+    @RequestMapping(value = "/emSbjbbZM")
+    public ResultBean em_sbjbb_ZM(@RequestBody JSONObject json) {
+        String bmlb=json.getString("bmlb");
+        List<Map> dmZhbmp= syService.em_sbjbb_ZM(bmlb);
+        return new ResultBean(dmZhbmp);
+    }
+
 }

src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java

@@ -81,5 +81,13 @@ public class EmSbjbbController {
 
         return new ResultBean(emSbjbbs);
     }
+
+    @ApiOperation(value = "部门对应设备名称和编号")
+    @PostMapping(value = "/getBMMCBM")
+    public ResultBean getBMMCBM() {
+        Map<String,List<Map>> emSbjbbs= emSbjbbService.getBMMCBM();
+
+        return new ResultBean(emSbjbbs);
+    }
 }
 

src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java

@@ -70,17 +70,5 @@ public class DmSygdMxController {
         return service.tqSygd();
     }
 
-    public static void main(String[] agrs){
-//        String[] a={"序号","产品","批量","分段","板数","上料","型材抛丸","抛丸","一垮龙门板数","一垮数控板数","坡口切割结束","二垮数控板数","数控切割开始","坡口切割结束","三垮数控板数","数控切割开始","坡口切割结束","三垮平铁板数","平铁切割开始","平铁切割结束","曲平铁转结束","曲平铁结束","曲外板结束","组立","数控   板数","数控切割开始","坡口切割结束","面板挤边","七垮型  材米数","型材  面板","小组配送结束","光电  结束","备注"};
-//        String[] a={"船名","批量","图名","科室","套料图下发","套料图生产需求期","套料图接收","板材领取表下发","板材领取表生产需求期","板材领取表接收","零件配套表下发","零件配套表生产需求期","零件配套表接收"};
-//        String[] a={"船号","订货清单号","期次","需求日期","实际到货日期","物料号","材质MATERIAL","厚度THICK.mm","宽度WIDTHmm","长度LENGTHmm","重量吨/张WEIGHTTON/PIECE","设计数量张DESIGNPIECE","裕量张MARGINPIECE","总数量张TOTALPIECE","总重量吨TOTALTON ","利库数量张STOREPIECE","利库重量吨STORETON","实订数量张ORDERPIECE","实订重量吨ORDERTON","备注NOTE"};
-//        for (int i = 0; i < a.length; i++) {
-//            System.out.println("{ field: '', title: '"+a[i]+"', width: 120, editRender: { name: 'input' },\n" +
-//                    " filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],\n" +
-//                    " filterRender: { name: 'FilterCombination', },\n" +
-//                    " },");
-//        }
-
-    }
 }
 

src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java

@@ -41,7 +41,7 @@ public class DmXbjhController {
     @ApiOperation(value = "导入excel")
     @PostMapping(value = "/upload")
     public ResultBean upload(@RequestParam(value = "file") MultipartFile file) throws IOException {
-        List<DmXbjh> dmXbjhs= dmXbjhService.upload(file);
+        JSONObject dmXbjhs= dmXbjhService.upload(file);
         return new ResultBean(dmXbjhs);
     }
 

src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java

@@ -16,4 +16,7 @@ public interface EmSbjbbRepository extends JpaRepository<EmSbjbb,String> {
 
     @Query(nativeQuery = true,value = "SELECT bm,bmsm,bmjb FROM dm_fjbmgl")
     List<Map> sblx();
+
+    @Query(nativeQuery = true,value = "SELECT szcs,sbbh,sbmc FROM EM_SBJBB")
+    List<Map> BMMCBM();
 }

src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java

@@ -2,6 +2,7 @@ package com.dsic.gj_erp.dao.sy;
 
 
 import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -28,8 +29,12 @@ public interface Dm_zhbmpRepository extends JpaRepository<Dm_zhbmp,Dm_zhbmp.Prim
     @Query(nativeQuery = true,value = "select bm, bmsm as  mc from dm_zhbmp where bmlb='BMBM' and (left(bm,3)='023' ) and isnull(ylzd3,'N')<>'Y' ")
     List<Map> findbmqx();
 
+    @Query(nativeQuery = true,value = "SELECT bm,bmsm FROM DM_ZHBMP WHERE bmlb=:bmlb")
+    List<Map> findjldw(@Param("bmlb") String bmlb);
 
+    @Query(nativeQuery = true,value = "SELECT bm,bmsm FROM DM_ZHBMP WHERE bmlb='bmbm' AND bm like 'FP%'")
+    List<Map> findbmbm();
 
-
+    @Query(nativeQuery = true,value = "SELECT bm,bmsm FROM DM_ZHBMP WHERE bmlb='qgkw' and CAST(bm as int)>4")
-
+    List<Map> findqgkw();
 }

src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java

@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.service.jcsj;
 
 
+import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.request.EmSbjbbBean;
@@ -31,4 +32,6 @@ public interface EmSbjbbService extends IService<EmSbjbb> {
     List<Map> getGYS();
 
     List<Map> getSBLX();
+
+    Map<String,List<Map>> getBMMCBM();
 }

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java

@@ -44,6 +44,7 @@ public class EmGcrlServiceImpl extends ServiceImpl<EmGcrlMapper, EmGcrl> impleme
         if(StringUtils.isNotEmpty(json.getString("nf"))){
             queryWrapper.eq("NF",json.getString("nf"));
         }
+        queryWrapper.orderByDesc("gl");
         List<EmGcrl> emGcrls=emGcrlMapper.selectList(queryWrapper);
         return emGcrls;
     }
@@ -67,7 +68,9 @@ public class EmGcrlServiceImpl extends ServiceImpl<EmGcrlMapper, EmGcrl> impleme
             String dateString = dateFormat.format(date);
             emGcrl.setNf(nf);
             emGcrl.setGl(dateString);
+         //   emGcrl.setXh("1");
             emGcrlMapper.insert(emGcrl);
+          //  this.save(emGcrl);
         }
     }
 }

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java

@@ -36,6 +36,12 @@ public class EmSbcnpServiceImpl extends ServiceImpl<EmSbcnpMapper, EmSbcnp> impl
         if(StringUtils.isNotEmpty(json.getString("sbmc"))){
             queryWrapper.eq("SBMC",json.getString("sbmc"));
         }
+        if(StringUtils.isNotEmpty(json.getString("kw"))){
+            queryWrapper.eq("KW",json.getString("kw"));
+        }
+//        if(StringUtils.isNotEmpty(json.getString("sbmc"))){
+//            queryWrapper.eq("SBMC",json.getString("sbmc"));
+//        }
         List<EmSbcnp> emSbjbbs=emSbcnpMapper.selectList(queryWrapper);
         return emSbjbbs;
     }

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java

@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.service.jcsj.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
@@ -49,6 +50,7 @@ public class EmSbjbbServiceImpl extends ServiceImpl<EmSbjbbMapper, EmSbjbb> impl
         if(StringUtils.isNotEmpty(gysbm)){
             queryWrapper.eq("GYSBM",gysbm);
         }
+        queryWrapper.like("SZCS","FP%");
         queryWrapper.orderByDesc("GRRQ");
         List<EmSbjbb> emSbjbbs=emSbjbbMapper.selectList(queryWrapper);
         return emSbjbbs;
@@ -92,4 +94,13 @@ public class EmSbjbbServiceImpl extends ServiceImpl<EmSbjbbMapper, EmSbjbb> impl
         List<Map> emSbjbbs=emSbjbbRepository.sblx();
         return emSbjbbs;
     }
+
+    @Override
+    public Map<String,List<Map>> getBMMCBM() {
+        List<Map> emSbjbbs=emSbjbbRepository.BMMCBM();
+
+        Map<String,List<Map>> listMap=emSbjbbs.stream().filter(map -> StringUtils.isNotEmpty(map.get("szcs") != null ? map.get("szcs").toString() : "")).collect(Collectors.groupingBy(map -> (String) map.get("szcs")));
+
+        return listMap;
+    }
 }

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbwxjhServiceImpl.java

@@ -36,6 +36,7 @@ public class EmSbwxjhServiceImpl extends ServiceImpl<EmSbwxjhMapper, EmSbwxjh> i
         String sbbh=emSbwxjhBean.getSbbh();
         String beginTime=emSbwxjhBean.getBeginTime();
         String endTime=emSbwxjhBean.getEndTime();
+        String szcs=emSbwxjhBean.getSzcs();
         if(StringUtils.isNotEmpty(sbbh)){
             queryWrapper.eq("SBBH",sbbh);
         }
@@ -45,6 +46,9 @@ public class EmSbwxjhServiceImpl extends ServiceImpl<EmSbwxjhMapper, EmSbwxjh> i
         if(StringUtils.isNotEmpty(endTime)){
             queryWrapper.le("jssj_jh",endTime);
         }
+        if(StringUtils.isNotEmpty(szcs)){
+            queryWrapper.eq("SZCS",szcs);
+        }
         List<EmSbwxjh> emSbjbbs=emSbwxjhMapper.selectList(queryWrapper);
         return emSbjbbs;
     }

src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java

@@ -19,7 +19,7 @@ import java.util.List;
 public interface DmXbjhService extends IService<DmXbjh> {
     List<DmXbjh> getList(JSONObject json);
 
-    List<DmXbjh> upload(MultipartFile file) throws IOException;
+    JSONObject upload(MultipartFile file) throws IOException;
 
     void save(List<DmXbjh> dmXbjhs);
 

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java

@@ -41,8 +41,15 @@ public class DmJtsyjhServiceImpl extends ServiceImpl<DmJtsyjhMapper, DmJtsyjh> i
     @Override
     public List<DmJtsyjh> getList(JSONObject json) {
         QueryWrapper<DmJtsyjh> queryWrapper=new QueryWrapper<>();
-        if(StringUtils.isNotEmpty(json.getString("dcCh"))){
+//        if(StringUtils.isNotEmpty(json.getString("dcCh"))){
-            queryWrapper.eq("dc_ch",json.getString("dcCh"));
+//            queryWrapper.eq("dc_ch",json.getString("dcCh"));
+//        }
+        if(StringUtils.isNotEmpty(json.getString("jhrq"))){
+            String time=json.getString("jhrq");
+            String startTime=time.split("~")[0];
+            String endTime=time.split("~")[1];
+            queryWrapper.gt("jhrq",startTime);
+            queryWrapper.lt("jhrq",endTime);
         }
         if(StringUtils.isNotEmpty(json.getString("Zt"))){
             queryWrapper.eq("zt",json.getString("Zt"));

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmTzjhServiceImpl.java

@@ -38,6 +38,9 @@ public class DmTzjhServiceImpl extends ServiceImpl<DmTzjhMapper, DmTzjh> impleme
         if(StringUtils.isNotEmpty(json.getString("Zt"))){
             queryWrapper.eq("zt",json.getString("Zt"));
         }
+        if(StringUtils.isNotEmpty(json.getString("dcPl"))){
+            queryWrapper.eq("DC_PL",json.getString("dcPl"));
+        }
         List<DmTzjh> dmTzjhs=dmTzjhMapper.selectList(queryWrapper);
         return dmTzjhs;
     }

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java

@@ -43,21 +43,29 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
         if(StringUtils.isNotEmpty(json.getString("Zt"))){
             queryWrapper.eq("zt",json.getString("Zt"));
         }
+        if(StringUtils.isNotEmpty(json.getString("nf"))){
+            String nf=json.getString("nf");
+            String startTime=nf.split("~")[0];
+            String endTime=nf.split("~")[1];
+            queryWrapper.gt("nf",startTime);
+            queryWrapper.lt("nf",endTime);
+        }
         List<DmXbjh> dmTzjhs=dmXbjhMapper.selectList(queryWrapper);
         return dmTzjhs;
     }
 
     @Override
-    public List<DmXbjh> upload(MultipartFile file) throws IOException {
+    public JSONObject upload(MultipartFile file) throws IOException {
     //    ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
-        List<Map<String,Object>> mapList= ExcelUtil.readDmXbjh(file);
+        //List<DmXbjh> dmXbjhs= ExcelUtil.readDmXbjh(file);
-
+        JSONObject dmXbjhs= ExcelUtil.readDmXbjh(file);
-        List<DmXbjh> list=new ArrayList<>();
+//        List<DmXbjh> list=new ArrayList<>();
-        mapList.forEach(stringObjectMap -> {
+//        mapList.forEach(stringObjectMap -> {
-            DmXbjh dmXbjh = modelMapper.map(stringObjectMap, DmXbjh.class);
+//            DmXbjh dmXbjh = modelMapper.map(stringObjectMap, DmXbjh.class);
-            list.add(dmXbjh);
+//            dmXbjh.setZt("0");
-        });
+//            list.add(dmXbjh);
-        return list;
+//        });
+        return dmXbjhs;
     }
 
     @Override

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java

@@ -41,8 +41,15 @@ public class DmZrcjhServiceImpl extends ServiceImpl<DmZrcjhMapper, DmZrcjh> impl
     @Override
     public List<DmZrcjh> getList(JSONObject json) {
         QueryWrapper<DmZrcjh> queryWrapper=new QueryWrapper<>();
-        if(StringUtils.isNotEmpty(json.getString("dcCh"))){
+//        if(StringUtils.isNotEmpty(json.getString("dcCh"))){
-            queryWrapper.eq("DC_CH",json.getString("dcCh"));
+//            queryWrapper.eq("DC_CH",json.getString("dcCh"));
+//        }
+        if(StringUtils.isNotEmpty(json.getString("gjks"))){
+            String time=json.getString("gjks");
+            String startTime=time.split("~")[0];
+            String endTime=time.split("~")[1];
+            queryWrapper.gt("gjks",startTime);
+            queryWrapper.lt("gjks",endTime);
         }
         if(StringUtils.isNotEmpty(json.getString("Zt"))){
             queryWrapper.eq("zt",json.getString("Zt"));

src/main/java/com/dsic/gj_erp/service/sy/SYService.java

@@ -413,6 +413,19 @@ public class SYService {
         return fetch;
     }
 
+    public List<Map>  em_sbjbb_ZM(String bmlb){
+        List<Map> dmZhbmp;
+        if (bmlb.equals("bmbm")){
+            dmZhbmp=dm_zhbmpRepository.findbmbm();
+        }
+        else if(bmlb.equals("qgkw")){
+            dmZhbmp=dm_zhbmpRepository.findqgkw();
+        }
+        else {
+            dmZhbmp=dm_zhbmpRepository.findjldw(bmlb);
+        }
+        return dmZhbmp;
+    }
 
 
 }

src/main/java/com/dsic/gj_erp/util/ExcelUtil.java

@@ -1,6 +1,9 @@
 package com.dsic.gj_erp.util;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
+import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -153,7 +156,7 @@ public class ExcelUtil {
         }
     }
 
-    public static List<Map<String,Object>> readDmXbjh(MultipartFile file) {
+    public static JSONObject readDmXbjh(MultipartFile file) {
         try {
             Workbook workbook=isWorkBook(file);
             // 获取第一张表
@@ -167,15 +170,18 @@ public class ExcelUtil {
                 monthMap.put(index,cell.toString());
             }
            // String year="";
-            List<Map<String,Object>> mapList=new ArrayList<>();
+          //  List<Map<String,Object>> mapList=new ArrayList<>();
+           // List<DmXbjh> dmXbjhs=new ArrayList<>();
+            JSONObject jsonObject=new JSONObject();
             for (int i = 4; i < sheet.getPhysicalNumberOfRows(); i++) {
                 Row row = sheet.getRow(i);
                 String dcch=row.getCell(0).toString();
                 if (dcch.contains("待接")||dcch.contains("已接")||dcch.contains("合计")){
                     break;
                 }
-                Map<String,Object> map=new HashMap<>();
+//                Map<String,Object> map=new HashMap<>();
-                map.put("dcCh",dcch);
+//                map.put("dcCh",dcch);
+                List<Map> mapList=new ArrayList<>();
                 for (int index = 1; index < row.getPhysicalNumberOfCells(); index++) {
                     Cell cell = row.getCell(index);
                     cell.setCellType(CellType.STRING);
@@ -186,11 +192,37 @@ public class ExcelUtil {
                     }
                     String cl=cell+"";
                     String year=getMergedRegionValue(sheet,2,index).toString();
-                    map.put("cl"+year.replace("年","")+String.format("%02d", Integer.parseInt(month.replace("月",""))),cl);
+                 //   DmXbjh dmXbjh=new DmXbjh();
+                    Map map=new HashMap();
+                    map.put("zt","0");
+                    map.put("nf",year.replace("年",""));
+                    map.put("yf",String.format("%02d", Integer.parseInt(month.replace("月",""))));
+                    if (StringUtils.isNotEmpty(cl)){
+                        map.put("zl",Double.parseDouble(cl));
+                    }else {
+                        map.put("zl",0.0);
+                    }
+//                    dmXbjh.setZt("0");
+//                    dmXbjh.setNf(year.replace("年",""));
+//                    dmXbjh.setYf(String.format("%02d", Integer.parseInt(month.replace("月",""))));
+//                    if (StringUtils.isNotEmpty(cl)){
+//                        dmXbjh.setZl(Double.parseDouble(cl));
+//                    }else {
+//                        dmXbjh.setZl(0.0);
+//                    }
+//                    dmXbjh.setDcCh(dcch);
+
+
+               //     dmXbjhs.add(dmXbjh);
+                    mapList.add(map);
+//                    map.put("cl"+year.replace("年","")+String.format("%02d", Integer.parseInt(month.replace("月",""))),cl);
                 }
-                mapList.add(map);
+//                mapList.add(map);
+                jsonObject.put(dcch,mapList);
             }
-            return mapList;
+            return jsonObject;
+//            return mapList;
+          //  return dmXbjhs;
         } catch (Exception e) {
             e.printStackTrace();
             return null;