Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-17 b69d2017fecdad6a1c9a09c0006e70ecea9efed0

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

@@ -30,6 +30,8 @@
        <id     property="video"      column="video"      />
        <id     property="isTimeout"      column="is_timeout"      />
        <id     property="submitType"      column="submit_type"      />
        <id     property="timeoutTime"      column="timeout_time"      />
        <id     property="isPush"      column="is_push"      />
    </resultMap>

    <sql id="selectGuideRepairOrderVo">
@@ -39,6 +41,8 @@
            matter_id,
            submit_type,
            matter_name,
            timeout_time,
            is_push,
            (select organization_name from automessage_organization_chart where a.department_id=id)organizationName,
            concat(
                    (select classify_name from  automessage_classify_administration  where id=(select parent_id from  automessage_classify_administration  where id=a.classify_id)),
@@ -139,6 +143,7 @@
            <if test="suggest != null and suggest != '' ">suggest=#{suggest},</if>
            <if test="serviceState != null  ">service_state=#{serviceState},</if>
            <if test="isTimeout != null  ">is_timeout=#{isTimeout},</if>
            <if test="timeoutTime != null  ">timeout_time=#{timeoutTime},</if>
            update_time=sysdate()
        </set>
        where  id= #{id}