定时失能人员退出

account/account-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml

@@ -22,8 +22,10 @@
      left join ch_disable_info info on plan.DISAB_INFO_ID = info.DISAB_INFO_ID
      left join  CH_DISABLE_APPLY apply on apply.APPLY_ID = info.APPLY_ID
      left join ch_srv_organ_emp emp on plan.emp_id = emp.emp_id
+     left join CH_SRV_TASK_DETAIL detail on detail.TASK_DETAIL_ID = plan.TASK_DETAIL_ID
      left join CH_SRV_ORGAN organ on organ.SRV_ORGAN_ID = plan.SRV_ORGAN_ID
          <where>
+             <![CDATA[   detail.STATUS<>3 ]]>
              <if test="req.status != null  and req.status != ''">
                 and plan.IS_STATUS = #{req.status}
              </if>

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvTaskMapper.xml

@@ -222,8 +222,8 @@
         select max(t.SRV_TASK_ID) srvTaskId,max(program.PROGRAM_ID) programId,info.REAL_NAME,t.SRV_EMP_ID from CH_SRV_TASK t
         left join  CH_DISABLE_INFO info on t.DISAB_INFO_ID = info.DISAB_INFO_ID
         left join CH_SRV_PROGRAM program on program.program_id = t.program_id
-        where <![CDATA[   t.SRV_DATE  <  sysdate  and
-         (info.EXIT_TIME   >  sysdate or info.EXIT_TIME is null)
+        where <![CDATA[   t.SRV_DATE  <  sysdate
+      --  and (info.EXIT_TIME   >  sysdate or info.EXIT_TIME is null)
          and sysdate < program.PROGRAM_EDN_DATE
           and  program.PROG_STATUS <>'2' and t.STATUS <>'2'
          group by info.REAL_NAME,t.SRV_EMP_ID  ]]>