Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-12-06 6c84eff9302df57bc41a5200c2f88f67b669c460

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

@@ -33,6 +33,8 @@
        <id     property="timeoutTime"      column="timeout_time"      />
        <id     property="isPush"      column="is_push"      />
        <id     property="isHideComments"      column="is_hide_comments"      />
        <id     property="isRemindPush"      column="is_remind_push"      />

    </resultMap>

    <sql id="selectGuideRepairOrderVo">
@@ -291,6 +293,12 @@
        </where>
    </select>

    <select id="selectNoticeTime"  resultMap="GuideRepairOrderResult">
        <include refid="selectGuideRepairOrderVo"/>
        <where>
       state=2 and is_remind_push=2 and  SYSDATE()>subdate(timeout_time, interval    ${minute}  minute ) and  1>(select count(*)  from automessage_guide_evolve where state=9 and  a.id=guide_id )
     </where>
        </select>
    <select id="selectEvaluate"  resultMap="GuideRepairOrderResult">
        <include refid="selectGuideRepairOrderVo"/>
        <where>