lidongdong
2022-09-23 9262903741555c335f59392008d1a80542d4d839
数据库迁移修改
4个文件已删除
19个文件已修改
417 ■■■■ 已修改文件
.gitignore 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/springcloud_k8s_panzhihuazhihuishequ.iml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/vcs.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/1.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/application.properties 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/AgreementMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/GuideEvolveMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/KeywordMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/MenuMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/OrganizationChartMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/RoleManagementMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/SysUserMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/TransactionEventMapper.xml 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hs_err_pid36404.log 198 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_app/grid_app.iml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/grid_backstage.iml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_api/service_api.iml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/service_grid.iml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/service_property.iml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.gitignore
File was deleted
.idea/springcloud_k8s_panzhihuazhihuishequ.iml
File was deleted
.idea/vcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
    <mapping directory="" vcs="Git" />
  </component>
</project>
flower_city/1.txt
File was deleted
flower_city/src/main/resources/application.properties
@@ -1,8 +1,8 @@
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
spring.datasource.url=jdbc:mysql://10.8.0.74:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://localhost:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://localhost:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
server.port=8080
#server.port=8088
flower_city/src/main/resources/mapper/AgreementMapper.xml
@@ -16,7 +16,7 @@
               (select user_name from sys_user where user_id=a.update_user_id)updateUserName,
               update_user_id,create_time,
               (select user_name from sys_user where user_id=a.create_user_id)createUserName,
               create_user_id,agreement_content FROM agreement a
               create_user_id,agreement_content FROM automessage_agreement a
   </sql>
    <select id="selectConfigList" resultMap="AgreementResult">
flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
@@ -20,11 +20,11 @@
            create_time,
            update_time,
            parent_id,
            (select ca.classify_name from classify_administration as ca where ca.id= classify_administration.parent_id) as parentName,
            (select ca.classify_name from automessage_classify_administration as ca where ca.id= automessage_classify_administration.parent_id) as parentName,
            classify_name,
            classify_icon
        FROM
            classify_administration
            automessage_classify_administration
    </sql>
    <select id="selectConfigList"  resultMap="ClassifyAdministrationEntityResult">
@@ -53,7 +53,7 @@
    </select>
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.ClassifyAdministration">
        insert into classify_administration (
        insert into automessage_classify_administration (
        <if test="id != null">id,</if>
        <if test="classifyGrade != null and classifyGrade != '' ">classify_grade,</if>
        <if test="parentId != null">parent_id,</if>
@@ -73,7 +73,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.ClassifyAdministration">
        update classify_administration
        update automessage_classify_administration
        <set>
            <if test="id != null">id=#{id},</if>
            <if test="classifyGrade != null and classifyGrade != '' ">classify_grade=#{classifyGrade},</if>
@@ -86,11 +86,11 @@
    </update>
    <delete id="deleteConfigById" parameterType="String">
        delete from classify_administration where id= #{id}
        delete from automessage_classify_administration where id= #{id}
    </delete>
    <select id="countNum" resultType="integer">
        select count(id) from classify_administration
        select count(id) from automessage_classify_administration
        <where>
            <if test="classifyName != null and classifyName != ''">
                AND classify_name like concat('%', #{classifyName}, '%')
flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml
@@ -22,14 +22,14 @@
            url,
            name
        FROM
            else_accessory
            automessage_else_accessory
    </sql>
    <select id="selectConfigList"  resultMap="ElseAccessoryEntityResult">
        <include refid="selectElseAccessoryEntityVo"/>
        <where>
            <if test="Name != null and Name != ''">
                AND else_accessory.name like concat('%', #{Name}, '%')
                AND automessage_else_accessory.name like concat('%', #{Name}, '%')
            </if>
        </where>
        order by create_time desc
@@ -37,7 +37,7 @@
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.ElseAccessoryEntity">
        insert into else_accessory (
        insert into automessage_else_accessory (
        <if test="id != null">id,</if>
        <if test="departmentId != null and departmentId != '' ">department_id,</if>
        <if test="name != null and name != '' ">name,</if>
@@ -55,7 +55,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.ElseAccessoryEntity">
        update else_accessory
        update automessage_else_accessory
        <set>
            <if test="id != null">id=#{id},</if>
            <if test="departmentId != null and departmentId != '' ">department_id=#{departmentId},</if>
@@ -67,14 +67,14 @@
    </update>
    <delete id="deleteConfigById" parameterType="string">
        delete from else_accessory where id= #{Id}
        delete from automessage_else_accessory where id= #{Id}
    </delete>
    <select id="countNum" resultType="integer">
        select count(id) from else_accessory
        select count(id) from automessage_else_accessory
        <where>
            <if test="Name != null and Name != ''">
                AND else_accessory.name like concat('%', #{Name}, '%')
                AND automessage_else_accessory.name like concat('%', #{Name}, '%')
            </if>
        </where>
    </select>
flower_city/src/main/resources/mapper/GuideEvolveMapper.xml
@@ -37,7 +37,7 @@
            create_time,
            update_time
        FROM
            guide_evolve
            automessage_guide_evolve
    </sql>
    <select id="selectConfigList"  resultMap="GuideEvolveResult">
@@ -52,7 +52,7 @@
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
        insert into guide_evolve (
        insert into automessage_guide_evolve (
        <if test="id != null">id,</if>
        <if test="departmentalId != null and departmentalId != '' ">departmental_id,</if>
        <if test="toUserId != null and toUserId != '' ">to_user_id,</if>
@@ -85,7 +85,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
        update guide_evolve
        update automessage_guide_evolve
        <set>
            <if test="departmentalId != null and departmentalId != '' ">departmental_id=#{departmentalId},</if>
            <if test="toUserId != null and toUserId != '' ">to_user_id=#{toUserId},</if>
@@ -104,11 +104,11 @@
    </update>
    <delete id="deleteConfigById" parameterType="string">
        delete from guide_evolve where id= #{Id}
        delete from automessage_guide_evolve where id= #{Id}
    </delete>
    <select id="countNum" resultType="integer">
        select count(id) from guide_evolve
        select count(id) from automessage_guide_evolve
    </select>
</mapper>
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -52,7 +52,7 @@
            suggest,
            evaluate_state
        FROM
            guide_repair_order
            automessage_guide_repair_order
    </sql>
    <select id="selectConfigData"  resultMap="GuideRepairOrderResult">
@@ -69,7 +69,7 @@
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.GuideRepairOrder">
        update guide_repair_order
        update automessage_guide_repair_order
        <set>
            <if test="guideUserId != null and guideUserId != '' ">guide_user_id=#{guideUserId},</if>
            <if test="guideDepartmentId != null and guideDepartmentId != '' ">guide_department_id=#{guideDepartmentId},</if>
@@ -82,7 +82,7 @@
    <select id="countNum" resultType="integer">
        select count(id) from menu
        select count(id) from automessage_guide_repair_order
    </select>
flower_city/src/main/resources/mapper/KeywordMapper.xml
@@ -19,7 +19,7 @@
            update_time,
            transaction_id
        FROM
            keyword
            automessage_keyword
    </sql>
    <select id="selectConfigList"  resultMap="KeywordEntityResult">
@@ -51,10 +51,10 @@
        <include refid="selectKeywordEntityVo"/>
        <where>
            <if test="Id != null and Id != ''">
                AND keyword.id=#{Id}
                AND automessage_keyword.id=#{Id}
            </if>
             <if test="name != null and name != ''">
                AND keyword.name=#{name}
                AND automessage_keyword.name=#{name}
            </if>
        </where>
    </select>
@@ -67,7 +67,7 @@
    </select>
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.KeywordEntity">
        insert into keyword (
        insert into automessage_keyword (
        <if test="id != null">id,</if>
        <if test="name != null and name != '' ">name,</if>
        <if test="transactionId != null and transactionId !='' ">transaction_id,</if>
@@ -83,7 +83,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.KeywordEntity">
        update keyword
        update automessage_keyword
        <set>
            <if test="id != null">id=#{id},</if>
            <if test="name != null and name != '' ">name=#{name},</if>
@@ -94,11 +94,11 @@
    </update>
    <delete id="deleteConfigById" parameterType="string">
        delete from keyword where id= #{Id}
        delete from automessage_keyword where id= #{Id}
    </delete>
    <select id="countNum" resultType="integer">
        select count(id) from keyword
        select count(id) from automessage_keyword
    </select>
</mapper>
flower_city/src/main/resources/mapper/MenuMapper.xml
@@ -21,7 +21,7 @@
            parent_id,
            remark
        FROM
            menu
            automessage_menu
    </sql>
    <select id="selectConfigList"  resultMap="MenuEntityResult">
@@ -50,7 +50,7 @@
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.MenuEntity">
        insert into menu (
        insert into automessage_menu (
        <if test="id != null">id,</if>
        <if test="title != null and title != '' ">title,</if>
        <if test="parentId != null">parent_id,</if>
@@ -68,7 +68,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.MenuEntity">
        update menu
        update automessage_menu
        <set>
            <if test="id != null">id=#{id},</if>
            <if test="title != null and title != '' ">title=#{title},</if>
@@ -80,11 +80,11 @@
    </update>
    <delete id="deleteConfigById" parameterType="Long">
        delete from menu where id= #{Id}
        delete from automessage_menu where id= #{Id}
    </delete>
    <select id="countNum" resultType="integer">
        select count(id) from menu
        select count(id) from automessage_menu
    </select>
</mapper>
flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
@@ -29,7 +29,7 @@
            create_time,
            update_time,
            parent_id,
            (select organization_name from organization_chart as oc where oc.id=organization_chart.parent_id) as parentName,
            (select organization_name from automessage_organization_chart as oc where oc.id=automessage_organization_chart.parent_id) as parentName,
            city,
            district,
            village,
@@ -37,7 +37,7 @@
            grade,
            resume,contact_number
        FROM
            organization_chart
            automessage_organization_chart
    </sql>
    <select id="selectConfigById" resultMap="OrganizationChartResult">
@@ -71,7 +71,7 @@
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.OrganizationChartEntity">
        insert into organization_chart (
        insert into automessage_organization_chart (
        <if test="id != null">id,</if>
        <if test="organizationName != null and organizationName != '' ">organization_name,</if>
        <if test="parentId != null">parent_id,</if>
@@ -97,7 +97,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.OrganizationChartEntity">
        update organization_chart
        update automessage_organization_chart
        <set>
            <if test="id != null">id=#{id},</if>
            <if test="organizationName != null and organizationName != '' ">organization_name=#{organizationName},</if>
@@ -113,11 +113,11 @@
    </update>
    <delete id="deleteConfigById" parameterType="string">
        delete from organization_chart where id= #{Id}
        delete from automessage_organization_chart where id= #{Id}
    </delete>
    <select id="countNum" resultType="integer">
        select count(id) from organization_chart
        select count(id) from automessage_organization_chart
    </select>
</mapper>
flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml
@@ -39,11 +39,11 @@
            department_id,
            create_user_id,
            accessory_id,
            (select organization_name from organization_chart where organization_chart.id=reply_template.department_id) as departmentName,
            (select user_name from sys_user where sys_user.user_id=reply_template.create_user_id) as createUser,
            (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_reply_template.department_id) as departmentName,
            (select user_name from automessage_sys_user where automessage_sys_user.user_id=automessage_reply_template.create_user_id) as createUser,
            guidance
        FROM
            reply_template
            automessage_reply_template
    </sql>
    <select id="selectConfigList"  resultMap="ReplyTemplateResult">
@@ -64,7 +64,7 @@
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.ReplyTemplateEntity">
        insert into reply_template (
        insert into automessage_reply_template (
        <if test="id != null">id,</if>
        <if test="name != null and name != '' ">name,</if>
        <if test="handleState != null and handleState != '' ">handle_state,</if>
@@ -102,7 +102,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.ReplyTemplateEntity">
        update reply_template
        update automessage_reply_template
        <set>
            <if test="id != null">id=#{id},</if>
            <if test="name != null and name != '' ">name=#{name},</if>
@@ -124,11 +124,11 @@
    </update>
    <delete id="deleteConfigById" parameterType="string">
        delete from reply_template where id= #{Id}
        delete from automessage_reply_template where id= #{Id}
    </delete>
    <select id="countNum" parameterType="string" resultType="integer">
        select count(id) from reply_template
        select count(id) from automessage_reply_template
        <where>
            <if test="Name != null and Name != ''">
                AND name=#{Name}
flower_city/src/main/resources/mapper/RoleManagementMapper.xml
@@ -23,7 +23,7 @@
            create_user_id,
            update_user_id
        FROM
            role_management
            automessage_role_management
    </sql>
    <select id="selectConfigList"  resultMap="RoleManagementEntityResult">
@@ -51,7 +51,7 @@
    </select>
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.RoleManagementEntity">
        insert into role_management (
        insert into automessage_role_management (
        <if test="id != null">id,</if>
        <if test="roleName != null and roleName != '' ">role_name,</if>
        <if test="permission != null">permission,</if>
@@ -71,7 +71,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.RoleManagementEntity">
        update role_management
        update automessage_role_management
        <set>
            <if test="id != null">id=#{id},</if>
            <if test="roleName != null and roleName != '' ">role_name=#{roleName},</if>
@@ -84,11 +84,11 @@
    </update>
    <delete id="deleteConfigById" parameterType="string">
        delete from role_management where id= #{Id}
        delete from automessage_role_management where id= #{Id}
    </delete>
    <select id="countNum" resultType="integer">
        select count(id) from role_management
        select count(id) from automessage_role_management
    </select>
</mapper>
flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -65,7 +65,7 @@
            department_id,
            stair_id,
            second_level_id,
            (select organization_name from organization_chart where sys_user.department_id=organization_chart.id) as department_name,
            (select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name,
            department_area,
            leisure_state,
            master_ids,
@@ -74,7 +74,7 @@
            transaction_names,
            remark
        FROM
            sys_user
            automessage_sys_user
    </sql>
@@ -104,7 +104,7 @@
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
        insert into sys_user (
        insert into automessage_sys_user (
        create_time
        <if test="userId != null and userId != '' ">,user_id</if>
        <if test="loginName != null and loginName != '' ">,login_name</if>
@@ -172,7 +172,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
        update sys_user
        update automessage_sys_user
        <set>
            <if test="userId != null and userId != '' ">user_id=#{userId}</if>
            <if test="loginName != null and loginName != '' ">,login_name=#{loginName}</if>
@@ -210,7 +210,7 @@
    </update>
    <delete id="deleteConfigById" parameterType="string">
        delete from sys_user where user_id= #{id}
        delete from automessage_sys_user where user_id= #{id}
    </delete>
flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -83,11 +83,11 @@
            common_problem_name,
            operational_guideline_video_url,
            concat(
            (select classify_name from  classify_administration  where id=(select parent_id from  classify_administration  where id=transaction_event.classify_id)),
            '>',(select classify_name from  classify_administration  where id=transaction_event.classify_id)
            (select classify_name from  automessage_classify_administration  where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
            '>',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)
            ) sumClassifyName
        FROM
            transaction_event
            automessage_transaction_event
    </sql>
    <sql id="selectTransactionEventList">
@@ -96,7 +96,7 @@
            department_id,
            department_area,
            classify_id,
            (select classify_grade from classify_administration where classify_administration.id=transaction_event.classify_id) as classifyName,
            (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id) as classifyName,
            matter_name,
            associate_ids,
            associate_names,
@@ -105,7 +105,7 @@
            create_time,
            update_time
        FROM
            transaction_event
            automessage_transaction_event
    </sql>
    <select id="selectConfigData" parameterType="string"  resultMap="TransactionEventEntityResult">
@@ -120,14 +120,14 @@
                AND associate_names like concat('%', #{matterAndUser}, '%') or matter_name like concat('%', #{matterAndUser}, '%')
            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from classify_administration where classify_administration.id=classify_id) = #{classifyGrade}
                AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}
            </if>
        </where>
        order by create_time desc
    </select>
    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.TransactionEvent">
        insert into transaction_event (
        insert into automessage_transaction_event (
        <if test="id != null">id,</if>
        <if test="departmentId != null and departmentId != '' ">department_id,</if>
        <if test="departmentArea != null">department_area,</if>
@@ -203,7 +203,7 @@
    </insert>
    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.TransactionEvent">
        update transaction_event
        update automessage_transaction_event
        <set>
            <if test="id != null">id=#{id},</if>
            <if test="departmentId != null and departmentId != '' ">department_id=#{departmentId},</if>
@@ -244,11 +244,11 @@
    </update>
    <delete id="deleteConfigById" parameterType="string">
        delete from transaction_event where id= #{Id}
        delete from automessage_transaction_event where id= #{Id}
    </delete>
    <select id="countNum" resultType="integer">
        select count(id) from transaction_event
        select count(id) from automessage_transaction_event
        <where>
            <if test="matterAndUser != null and matterAndUser != ''">
                AND associate_names like concat('%', #{matterAndUser}, '%') or matter_name like concat('%', #{matterAndUser}, '%')
@@ -272,12 +272,12 @@
    </select>
     <select id="sumTransactionNum"  resultMap="TransactionEventEntityResult">
        select sum(transaction_num)sumTransactionNum,count(*) counttransaction   FROM transaction_event
        select sum(transaction_num)sumTransactionNum,count(*) counttransaction   FROM automessage_transaction_event
    </select>
    <select id="queryByClassifyIdList"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventEntityVo"/>
        where  (classify_id= #{classifyId} or classify_id in (select id FROM classify_administration where parent_id =#{classifyId} ))
        where  (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
        <if test="departmentId!=null">
            and   department_id=#{departmentId}
        </if>
@@ -285,8 +285,8 @@
    </select>
    <select id="countNumByClassifyIdList" resultType="integer">
        select count(id) from transaction_event
        where  (classify_id= #{classifyId} or classify_id in (select id FROM classify_administration where parent_id =#{classifyId} ))
        select count(id) from automessage_transaction_event
        where  (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
        <if test="departmentId!=null">
          and   department_id=#{departmentId}
        </if>
@@ -295,7 +295,7 @@
    <update id="updateConfigByMatterName" parameterType="com.dg.core.db.gen.entity.TransactionEvent">
        update transaction_event
        update automessage_transaction_event
        <set>
            browse_num=browse_num+1,query_time=sysdate()
        </set>
@@ -306,7 +306,7 @@
    </update>
    <select id="countNumByMatterName" resultType="integer">
        select count(id) from transaction_event
        select count(id) from automessage_transaction_event
        <where>
            <if test="matterName != null and matterName != ''">
                AND matter_name like concat('%', #{matterName}, '%')
@@ -317,20 +317,20 @@
    <select id="selectSearch" resultType="com.dg.core.db.manual.pojo.Search">
        select  title,content,views  FROM(
                 select  organization_name title,resume content,null views  from   organization_chart  UNION
                 select  matter_name title,concat((select classify_name from  classify_administration
                 where id=(select parent_id from  classify_administration  where id=transaction_event.classify_id)),
                '>',(select classify_name from  classify_administration  where id=transaction_event.classify_id)) content,
                     transaction_num views from transaction_event
                 select  organization_name title,resume content,null views  from   automessage_organization_chart  UNION
                 select  matter_name title,concat((select classify_name from  automessage_classify_administration
                 where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                '>',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,
                     transaction_num views from automessage_transaction_event
                                           ) k
        where  k.title like concat('%',#{keyWord}, '%') or k.content  like concat('%', #{keyWord}, '%')
    </select>
    <select id="selectSearchAssociate" resultType="com.dg.core.db.manual.pojo.Search">
               select  matter_name title,concat((select classify_name from  classify_administration
                                          where id=(select parent_id from  classify_administration  where id=transaction_event.classify_id)),
                                         '>',(select classify_name from  classify_administration  where id=transaction_event.classify_id)) content,
                transaction_num views from transaction_event where  associate_names like   concat('%',#{keyWord}, '%')
               select  matter_name title,concat((select classify_name from  automessage_classify_administration
                                          where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                         '>',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,
                transaction_num views from automessage_transaction_event where  associate_names like   concat('%',#{keyWord}, '%')
    </select>
hs_err_pid36404.log
File was deleted
springcloud_k8s_panzhihuazhihuishequ/grid_app/grid_app.iml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="web" name="Web">
      <configuration>
        <webroots />
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/grid_backstage.iml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="web" name="Web">
      <configuration>
        <webroots />
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
@@ -271,5 +271,8 @@
    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
  </component>
</module>
springcloud_k8s_panzhihuazhihuishequ/service_api/service_api.iml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="web" name="Web">
      <configuration>
        <webroots />
@@ -13,6 +10,9 @@
        </sourceRoots>
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/target/classes" />
springcloud_k8s_panzhihuazhihuishequ/service_grid/service_grid.iml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="web" name="Web">
      <configuration>
        <webroots />
@@ -12,6 +9,9 @@
          <root url="file://$MODULE_DIR$/src/main/resources" />
        </sourceRoots>
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
@@ -154,6 +154,7 @@
    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.4.RELEASE" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
springcloud_k8s_panzhihuazhihuishequ/service_property/service_property.iml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
    <facet type="web" name="Web">
      <configuration>
        <webroots />
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
@@ -153,6 +153,7 @@
    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.4.RELEASE" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />