Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-13 71df1c0a0a92ac0635e579d6a77d9ced7e9ccf23

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -347,12 +347,12 @@

    <select id="selectSearch" resultType="com.dg.core.db.manual.pojo.Search">
        select  id,title,content,views, type FROM(
                                                     select  id,organization_name title,resume content,null views,1 type  from   automessage_organization_chart  UNION
                                                     select  id,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,2 type from automessage_transaction_event
                                                 ) k
                 select  id,organization_name title,resume content,null views,1 type  from   automessage_organization_chart  UNION
                 select  id,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,2 type from automessage_transaction_event
             ) k
        where  k.title like concat('%',#{keyWord}, '%') or k.content  like concat('%', #{keyWord}, '%')
    </select>

@@ -366,26 +366,24 @@
    </select>

    <select id="selectSearchAssociate" resultType="com.dg.core.db.manual.pojo.Search">
               select  id,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 ,3 type from automessage_transaction_event where  associate_names like   concat('%',#{keyWord}, '%')
       select  id,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 ,3 type from automessage_transaction_event where  associate_names like   concat('%',#{keyWord}, '%')
    </select>


    <!--  首页统计  勿动  -->
    <select id="countStatisticsNum" resultType="integer">
        select count(id) from automessage_transaction_event
        <where>
            <if test="classifyIds != null">
                and classify_id IN
                <foreach collection="classifyIds" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>

    <select id="selectDataIfExist" resultType="string">
        select id from automessage_transaction_event
        where department_id=#{departmentId}
        and matter_name=#{matterName}
    </select>

    <select id="selectclassifyId" resultType="string">
        select id from automessage_transaction_event
        where classify_id=#{classifyId}
    </select>