Merge branch 'dev_house_export_syc'

3 years ago · de0bb7f660
3 changed files with 3 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls
--- a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_old_20221108.xls
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
@ -8,7 +8,9 @@
        UPDATE ic_epidemic_special_attention
        SET UPDATED_TIME = NOW(),
            IS_ATTENTION = 0,
-            IS_HISTORY = '1'
+            IS_HISTORY = '1',
+            <!-- 重点关注人群名单，隔离防疫中取消关注时，隔离状态自动更改为已出隔离期 -->
+            ISOLATED_STATE = '3'
        WHERE del_flag = 0
          AND attention_type = #{attentionType}
          AND id IN (