浏览代码

代码合并

xiexiang 2 年之前
父节点
当前提交
fcabca9229

+ 27 - 498
.idea/workspace.xml

@@ -5,465 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="代码合并">
-      <change afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/invalidReReport/ProofStrVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_10.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_10.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_dev33_sa_token_core_1_29_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_dev33_sa_token_dao_redis_jackson_1_29_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_dev33_sa_token_servlet_1_29_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_dev33_sa_token_spring_boot_starter_1_29_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_6_5.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson2_fastjson2_2_0_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson2_fastjson2_extension_2_0_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_2_0_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_5_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_deepoove_poi_ooxml_schemas_extra_4_1_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_deepoove_poi_tl_1_10_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_ejlchina_data_core_1_0_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_ejlchina_okhttps_3_1_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_13_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_7.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_13_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_9_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_17_5.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_7.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_twelvemonkeys_common_common_image_3_8_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_twelvemonkeys_common_common_io_3_8_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_twelvemonkeys_common_common_lang_3_8_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_twelvemonkeys_imageio_imageio_batik_3_8_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_twelvemonkeys_imageio_imageio_core_3_8_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_6.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__de_rototor_snuggletex_snuggletex_core_1_3_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_138.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_draco1023_poi_tl_ext_0_4_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_6_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_74_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_74_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_74_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_74_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_74_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_tcnative_classes_2_0_48_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_74_Final.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_15.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_core_v3_swagger_core_2_1_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_12.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_13_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_saxon_Saxon_HE_11_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_29.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_11_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_client5_httpclient5_5_1_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_core5_httpcore5_5_1_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_core5_httpcore5_h2_5_1_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_ooxml_schemas_1_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_58.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_58.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_58.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_0_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_extension_1_15.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_rasterizer_ext_1_15.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svgrasterizer_1_15.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_14.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_6.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jsoup_jsoup_1_15_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springdoc_springdoc_openapi_common_1_6_6.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springdoc_springdoc_openapi_ui_1_6_6.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springdoc_springdoc_openapi_webmvc_core_1_6_6.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_4_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_4_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_6_4.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_6_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_6_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_3_1.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_3_16.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_webjars_swagger_ui_4_5_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_webjars_webjars_locator_core_0_48.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlresolver_xmlresolver_4_4_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlresolver_xmlresolver_data_4_4_3.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xalan_serializer_2_7_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xalan_xalan_2_7_2.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/dto/invalidReReport/InvalidReasonFieldDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/dto/invalidReReport/InvalidReasonFieldDTO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidReasonFieldService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidReasonFieldService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/ProofStrService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/ProofStrService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/Application.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/GlobalException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/AsyncExceptionHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/AsyncTaskPoolConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/InnerInterceptor/LizzMybatisIntercepts.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/MailConstants.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/MetaObjectHandlerConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/MybatisPlusConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/RabbitMQConfig$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/RabbitMQConfig$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/RabbitMQConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/SaTokenConfigure.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/SpringDocConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/WebSocketConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/Convert.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/annotation/AnnotationParse.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/annotation/Permission.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/annotation/PermissionAspect.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/base/Constants.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/base/DocFlag.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/base/EStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/base/RedisConf.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/base/RequestHolder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/exception/BaseException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/exception/CustomException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/core/exception/PermissionException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/BaseEntity.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/BaseVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/DataSource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Field.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Sort.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Tree.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/ProjectSourceVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/SystemMO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/delete/PatentList.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/delete/Patents.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/AreaAddressDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/AvoidDesignDirectionDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/AvoidDesignLittleDirectionDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/AvoidFeaturesDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/ClassNumberDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/CommonData.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/CustomFieldDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/CustomFieldLabelDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/LabelDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/PageDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/PatentQueryFieldSourceDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/ProductIncludeFilesDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/ProjectFieldOrderDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/TaskTDO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/TaskWebSocketDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/UploadFileDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/AssignTaskVO$assignPatents.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/AssignTaskVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/AuditTaskVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/AvoidDesignRightVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/AvoidDesignWholeVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/AvoidFeaturesVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareFileVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareFilesVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareMessageVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareRecordsVO$DFeatureObjects.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareRecordsVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareScenariosVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/FileVO$ReportVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/FileVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/LoginVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentField.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentIndexSettingVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentQueryFieldSourceVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentRightVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO$DP.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO$PerRole.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/ProductIncludeFilesVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/ReportFieldVO$dataType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/ReportFieldVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/ReportFileStandardVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/ReportVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/SourceVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/SplitVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/SystemDictVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskParams.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskReportVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO$personPatents.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/BackupUtils$Backup.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/BackupUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/CacheUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/DataUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/DateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/ExcelUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/FileUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/FormatUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/JsonUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/JsonUtils$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/JsonUtils$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/JsonUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/LogExceptionUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/PatentUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/RedisUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/RequestDataHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/Response.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/ResponseEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/SecurityUtils/LoginUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/SecurityUtils/SecurityUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/ServletUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/SoMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/SpringContextUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/SpringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/StpAdminUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/StringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/TestUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/WebSocketServer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/auth/AuthAop.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/auth/TreeUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/auth/checkAuth.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/utils/message/MessageUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/AssoTaskPersonelController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/AvoidDesignDirectionController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/BaseController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareFilesController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareMessageController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareRecordsController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareScenariosController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/DownloadController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/FeatureController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/InvalidRecordController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/LitigationHistoryController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/PatentFiledController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ReferencesController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ReportController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ReportDocumentController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ReportFileController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ReviewHistoryController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/TaskController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/TempleController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AssoAvoidDesignWholeLittleDirection.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AssoComapareFiel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AssoProductFile.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AssoScenarIOS.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AvoidDesignLittleDirection.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AvoidDesignWholeDirection.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AvoidFeatures.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/CompareFiles.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/CompareMessage.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/CompareRecords.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/CompareScenarios.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Descriptions.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Features.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ImportTask.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/InvalidRecord.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/LitigationHistory.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/PatentRight.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Personnel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Picture.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Product.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/References.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Report.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportDocument.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportField$dataType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportField.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportFieldExpand.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportFieldOption.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportFieldPatentLink.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportFieldText.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportFieldTree.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportFiles.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReportReferences.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/ReviewHistory.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/SysDictItem.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Task.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Template.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoInvalidRecordFile.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoLitigationHisFile.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoRecordsFeature.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoReferenceFile.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoReportFile.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoReportReferences.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoReviewHisFile.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoTaskPatentSplit.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoTaskPersonel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/exception/XiaoShiException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoAvoidDesignWholeLittleDirectionMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoComapareFielMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoInvalidRecordFileMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoLitigationHisFileMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoProductFileMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoRecordsFeatureMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoReferenceFileMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoReportFileMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoReportReferencesMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoReviewHisFileMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoScenarIOSMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoTaskPatentSplitMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AssoTaskPersonelMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AvoidDesignLittleDirectionMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AvoidDesignWholeDirectionMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AvoidFeatureMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/CompareFilesMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/CompareMessageMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/CompareRecordsMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/CompareScenariosAndRecordsMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/CompareScenariosMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/FeatureMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ImportTaskMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/InvalidRecordMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/LitigationHistoryMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ProductMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReferencesMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReportDocumentMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReportFieldMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReportFieldOptionMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReportFieldPatentLinkMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReportFieldTextMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReportFieldTreeMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReportFileMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReportMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReportReferencesMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ReviewHistoryMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/SystemDictItemMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/TaskMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/TemplateMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/BaseService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IAssoProductFileService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IAvoidDesignDirectionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IProductService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoComapareFielService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoInvalidRecordFileService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoLitigationHisFileService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoRecordsFeatureService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoReferenceFileService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoReportFileService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoReportReferencesService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoReviewHisFileService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoScenarIOSService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoTaskPatentSplitService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/AssoTaskPersonelService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareRecordsService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareScenariosAndRecordsService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareScenariosService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/FeatureService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ImportTaskService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/InvalidRecordService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/LitigationHistoryService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReferencesService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportDocumentService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldOptionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldPatentLinkService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldTextService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldTreeService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFileService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportReferencesService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReviewHistoryService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/SystemDictItemService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TaskService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TemplateService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AvoidDesignDirectionServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/mapper/FeatureMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/mapper/FeatureMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AssoAvoidDesignWholeLittleDirectionMapperTests.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AvoidDesignLittleDirectionMapperTests.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AvoidDesignWholeDirectionMapperTests.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AvoidFeatureMapperTests.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-debug.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/rms/rms-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-error.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-info.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidReasonService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidReasonService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -495,30 +37,30 @@
     </file-type-list>
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/InnerInterceptor/LizzMybatisIntercepts.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportReferencesService.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareMessageController.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/ReportController.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/FeatureController.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportService.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/BaseController.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/BaseService.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/FeatureController.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/entity/asso/AssoReportReferences.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/resources/application-dev.yml" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/entity/CompareMessage.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareMessageController.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/AssoReportReferencesService.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/utils/auth/TreeUtils.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/PersonnelVO.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/entity/ReportReferences.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/InnerInterceptor/LizzMybatisIntercepts.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/PersonnelVO.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/BaseService.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/ProofGroupController.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/InvalidProcessController.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/ArgumentsController.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/entity/ReportReferences.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/entity/CompareMessage.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/resources/application-dev.yml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportReferencesService.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/resources/application.yml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/BaseController.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/ArgumentsScenarioController.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/ArgumentsController.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/utils/auth/TreeUtils.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="ProjectId" id="2JADGkpubIwxnMp31DlLxSpGoB3" />
   <component name="ProjectLevelVcsManager">
@@ -574,6 +116,17 @@
     </key>
   </component>
   <component name="RunManager" selected="Spring Boot.Application">
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="ArgumentsService" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="cn.cslg.report.service.business.InvalidReReport.ArgumentsService" />
       <module name="RMS" />
@@ -600,30 +153,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType">
-      <module name="RMS_Backend" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
-      <module name="RMS_Backend" />
-      <option name="filePath" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="RMS" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="cn.cslg.report.Application" />

+ 31 - 0
RMS/src/main/java/cn/cslg/report/common/model/vo/invalidReReport/ExportInvalidReasonVO.java

@@ -0,0 +1,31 @@
+package cn.cslg.report.common.model.vo.invalidReReport;
+
+import lombok.Data;
+
+/**
+ * @Author xiexiang
+ * @Date 2023/7/26
+ */
+@Data
+public class ExportInvalidReasonVO {
+
+    /**
+     * 无效理由
+     */
+    private Integer invalidName;
+
+    /**
+     * 涉及内容
+     */
+    private Integer content;
+
+    /**
+     * 陈述意见
+     */
+    private String argumentStr;
+
+    /**
+     * 相关证据
+     */
+    private String proofStr;
+}

+ 65 - 0
RMS/src/main/java/cn/cslg/report/common/model/vo/invalidReReport/ProofGroupDetailVO.java

@@ -0,0 +1,65 @@
+package cn.cslg.report.common.model.vo.invalidReReport;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProofGroupDetailVO {
+    private Integer id;
+    /**
+     * 无效理由id
+     */
+    private Integer invalidReasonId;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 陈述意见
+     */
+    private String argumentStr;
+
+
+    private List<ProofIn> proofs;
+
+    private List<ProofDetailIn> proofDetails;
+
+    @Data
+    public static class  ProofDetailIn{
+
+        private Integer featureId;
+
+        private String featureContent;
+        private Integer featuresOrder;
+        private Integer sort;
+
+        private Integer proofId;
+
+        private String proofStr;
+
+        private Integer proofStrId;
+        private List<ArgumentIn> arguments;
+
+    }
+
+    @Data
+    public static class ProofIn{
+
+        private Integer id;
+        private Integer sort;
+        private Integer fileType;
+        private String patentNo;
+        private Integer fileId;
+    }
+    @Data
+    public static class ArgumentIn{
+        private Integer id;
+        private String argumentStr;
+    }
+
+
+}

+ 0 - 49
RMS/src/main/java/cn/cslg/report/controller/InvalidReReport/ProofStrController.java

@@ -1,49 +0,0 @@
-package cn.cslg.report.controller.InvalidReReport;
-
-import cn.cslg.report.common.core.base.Constants;
-import cn.cslg.report.common.model.dto.ProofAddNewDTO;
-import cn.cslg.report.common.model.dto.ReportDTO;
-import cn.cslg.report.common.model.dto.ShareReportDTO;
-import cn.cslg.report.common.model.dto.invalidReReport.ProofQueryDTO;
-import cn.cslg.report.common.model.dto.invalidReReport.ProofStrDTO;
-import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.service.business.InvalidReReport.ProofStrService;
-import cn.cslg.report.service.business.asso.AssoReportPersonService;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.mail.Multipart;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * 文献证据的Controller层
- *
- * @Author lrj
- * @Data 2023/4/1
- */
-@Tag(name = "无效证据管理")
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping(Constants.REPORT_API + "/proof")
-public class ProofStrController {
-    private final ProofStrService proofStrService;
-
-    @Operation(summary = "删除无效证据")
-    @PostMapping("/deleteProofStr")
-    public String deleteProofStr(@RequestBody List<Integer> ids){
-        return   proofStrService.deleteProofStr(ids);
-    }
-
-
-
-}

+ 108 - 0
RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidReasonService.java

@@ -5,6 +5,7 @@ import cn.cslg.report.common.model.dto.invalidReReport.InvalidReasonDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.ProofGroupDTO;
 import cn.cslg.report.common.model.dto.invalidReReport.QueryInvalidReasonDTO;
 import cn.cslg.report.common.model.vo.PersonnelVO;
+import cn.cslg.report.common.model.vo.invalidReReport.ExportInvalidReasonVO;
 import cn.cslg.report.common.model.vo.invalidReReport.PagingVO;
 import cn.cslg.report.common.model.vo.invalidReReport.QueryAllFeaturesVO;
 import cn.cslg.report.common.model.vo.invalidReReport.QueryInvalidReasonVO;
@@ -582,4 +583,111 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
                         return null;
                     }
                 }
+
+    /**
+     * 导出无效理由所需的查询
+     * @param reportId
+     * @return
+     */
+    public List<ExportInvalidReasonVO> exportInvalidReason(Integer reportId){
+        List<ExportInvalidReasonVO> exportInvalidReasonVOS = new ArrayList<>();
+        //根据报告id查询出所有无效理由,无效理由(0权利要求不清楚 1说明书公开不充分 2不具备创造性 3不具备新颖性)
+        LambdaQueryWrapper<InvalidReason> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(InvalidReason::getReportId,reportId);
+        List<InvalidReason> invalidReasons = this.list(queryWrapper);
+        for(InvalidReason invalidReason : invalidReasons){
+            if(invalidReason != null){
+                ExportInvalidReasonVO exportInvalidReasonVO = this.invalidReasonToExport(invalidReason);
+                exportInvalidReasonVOS.add(exportInvalidReasonVO);
+            }
+        }
+        return exportInvalidReasonVOS;
+    }
+
+    /**
+     * 根据无效理由对象转换成返回的VO类
+     * @param invalidReason
+     * @return
+     */
+    public ExportInvalidReasonVO invalidReasonToExport(InvalidReason invalidReason){
+        ExportInvalidReasonVO exportInvalidReasonVO = new ExportInvalidReasonVO();
+        //陈述意见
+        exportInvalidReasonVO.setArgumentStr(invalidReason.getArgumentStr());
+        Integer invalidName = invalidReason.getInvalidName();
+        //无效理由类型为0,为权利要求不清楚
+        if(invalidName.equals(0)){
+            //无效理由
+            exportInvalidReasonVO.setInvalidName(invalidName);
+            //涉及内容(权要排序)
+            exportInvalidReasonVO.setContent(invalidReason.getRightSort());
+            //相关证据
+            exportInvalidReasonVO.setProofStr(invalidReason.getProofStr());
+
+            return exportInvalidReasonVO;
+        } else if(invalidName.equals(1)){//无效理由类型为1,为说明书公开不充分
+            //无效理由
+            exportInvalidReasonVO.setInvalidName(invalidName);
+            //涉及内容(说明书为-1)
+            exportInvalidReasonVO.setContent(-1);
+            //相关证据
+            exportInvalidReasonVO.setProofStr(invalidReason.getProofStr());
+            return exportInvalidReasonVO;
+        } else if(invalidName.equals(2) || invalidName.equals(3)){//无效理由类型为2,为不具备创造性;无效理由类型为3,为不具备新颖性
+            //无效理由
+            exportInvalidReasonVO.setInvalidName(invalidName);
+            //涉及内容(权要排序)
+            exportInvalidReasonVO.setContent(invalidReason.getRightSort());
+            //相关证据是证据组合字符串
+            Integer invalidReasonId = invalidReason.getId();
+            String proofStr = this.proofGroupToString(invalidReasonId);
+            exportInvalidReasonVO.setProofStr(proofStr);
+            return exportInvalidReasonVO;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 根据无效理由id,返回相关证据的字符串
+     * @param invalidReasonId
+     * @return
+     */
+    public String proofGroupToString(Integer invalidReasonId){
+        //1.根据无效理由id查询出多个证据组合id
+        LambdaQueryWrapper<ProofGroup> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ProofGroup::getInvalidReasonId, invalidReasonId);
+        List<ProofGroup> proofGroups = proofGroupService.list(queryWrapper);
+        List<Integer> proofGroupIds = proofGroups.stream().map(ProofGroup::getId).collect(Collectors.toList());
+        //2.根据每个证据组合id到关联表中查询出所有的证据ids,并拼接成字符串
+        LambdaQueryWrapper<AssoProofGroup> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.in(AssoProofGroup::getGroupId, proofGroupIds);
+        List<AssoProofGroup> assoProofGroups = assoProofGroupService.list(queryWrapper1);
+        List<String> results = new ArrayList<>();
+        StringBuilder SB = new StringBuilder();
+        for(Integer proofGroupId : proofGroupIds){
+            List<Integer> proofIds = assoProofGroups.stream().filter(item->item.getGroupId().equals(proofGroupId)).map(AssoProofGroup::getProofId).collect(Collectors.toList());
+            //3.根据证据ids,到证据表中查询出所有证据,并拼接成字符串
+            if(proofIds.size() > 0){
+                //根据证据ids查询证据排序字段
+                LambdaQueryWrapper<CompareFiles> queryWrapper2 = new LambdaQueryWrapper<CompareFiles>();
+                queryWrapper2.in(CompareFiles::getId, proofIds);
+                List<CompareFiles> proofs = compareFilesService.list(queryWrapper2);
+                List<Integer> sysorders = proofs.stream().map(CompareFiles::getSysOrder).collect(Collectors.toList());
+                StringBuilder sb = new StringBuilder();
+                for(Integer sysorder : sysorders){
+                    sb.append("证据").append(sysorder).append("+");
+                }
+                sb.deleteCharAt(sb.length() - 1);
+                sb.append("\n");
+                String result = sb.toString();
+                results.add(result);
+            }
+        }
+        for(String resultStr : results){
+            SB.append(resultStr);
+        }
+        String STR = SB.toString();
+        return STR;
+    }
+
 }