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

yanghui

2022-10-14 4040856595952ea0b8f8b764ba2770d5c244c891

 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">
@@ -46,14 +46,14 @@
            parent_id=#{parentId}
            <if test="departmentId!=null">
                and id in (
                select classify_id from  transaction_event where department_id=#{departmentId} UNION
                select parent_id from  classify_administration   where id in (select classify_id FROM  transaction_event where department_id=#{departmentId})   )
                select classify_id from  automessage_transaction_event where department_id=#{departmentId} UNION
                select parent_id from  automessage_classify_administration   where id in (select classify_id FROM  automessage_transaction_event where department_id=#{departmentId})   )
            </if>
        </where>
    </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}, '%')
@@ -101,4 +101,19 @@
        </where>
    </select>




    <select id="selectParent" resultType="string">
        select id from automessage_classify_administration
        <where>
            <if test="parentId != null and parentId != ''">
                AND parent_id = #{parentId}
            </if>
        </where>
    </select>




</mapper>