Commit 27a9e17a authored by fangxinjiang's avatar fangxinjiang

自动化定时任务优化-fxj

parent 7d21ff8d
......@@ -451,6 +451,7 @@
a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and ((a.timeout_elec_sign = '0' and a.process_status = '0' and a.sign_type = '0') or
a.process_status in ('1','3','5','7','11')) and a.IS_REFUSE ='1'
<!-- 1,3,5,7,11 改为 1 ,5 (待发起、发起失败 -->
a.process_status in ('1','5')) and a.IS_REFUSE ='1'
</select>
</mapper>
......@@ -335,6 +335,7 @@
SELECT
id
FROM t_employee_insurance_pre a
where a.process_status in ('0','1','2','5') and a.IS_REFUSE = '1' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
<!-- 可发起状态有 0 1 2 5 改为 0 1 2 (待确认、待派单、派单失败) -->
where a.process_status in ('0','1','2') and a.IS_REFUSE = '1' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
</select>
</mapper>
......@@ -307,7 +307,8 @@
FROM t_insurance_pre_renew_detail a
JOIN t_insurance_alert b ON b.INSURANCES_PRE_RENEW_DETAIL_ID = a.ID
where b.EXPIRE_IGNORE_FLAG = '1' and b.DELETE_FLAG=0 and a.is_leave = '0' and b.IS_OVERDUE = 0
AND a.process_status in ('0','1','2','5')
<!-- '0','1','2','5' 改为 '0','1','2' (待确认、待派单、派单失败) -->
AND a.process_status in ('0','1','2')
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> DATE_FORMAT(CURDATE(),"%Y-%m-%d")
</select>
......
......@@ -640,12 +640,12 @@
a.BIRTH_START,
a.BIGAILMENT_START,
a.TRUST_REMARK,
a.PENSION_CARDINAL,
a.MEDICAL_CARDINAL,
a.UNEMPLOYMENT_CARDINAL,
a.BIGAILMENT_CARDINAL,
a.WORK_INJURY_CARDINAL,
a.BIRTH_CARDINAL,
CASE WHEN a.PAYMENT_TYPE='0' THEN c.LOWER_LIMIT WHEN a.PAYMENT_TYPE='2' THEN c.UPPER_LIMIT ELSE a.PENSION_CARDINAL END as PENSION_CARDINAL,
CASE WHEN a.PAYMENT_TYPE='0' THEN c.LOWER_LIMIT WHEN a.PAYMENT_TYPE='2' THEN c.UPPER_LIMIT ELSE a.MEDICAL_CARDINAL END as MEDICAL_CARDINAL,
CASE WHEN a.PAYMENT_TYPE='0' THEN c.LOWER_LIMIT WHEN a.PAYMENT_TYPE='2' THEN c.UPPER_LIMIT ELSE a.UNEMPLOYMENT_CARDINAL END as UNEMPLOYMENT_CARDINAL,
CASE WHEN a.PAYMENT_TYPE='0' THEN c.LOWER_LIMIT WHEN a.PAYMENT_TYPE='2' THEN c.UPPER_LIMIT ELSE a.BIGAILMENT_CARDINAL END as BIGAILMENT_CARDINAL,
CASE WHEN a.PAYMENT_TYPE='0' THEN c.LOWER_LIMIT WHEN a.PAYMENT_TYPE='2' THEN c.UPPER_LIMIT ELSE a.WORK_INJURY_CARDINAL END as WORK_INJURY_CARDINAL,
CASE WHEN a.PAYMENT_TYPE='0' THEN c.LOWER_LIMIT WHEN a.PAYMENT_TYPE='2' THEN c.UPPER_LIMIT ELSE a.BIRTH_CARDINAL END as BIRTH_CARDINAL,
a.PAYMENT_TYPE,
a.CONTRACT_ID,
a.CREATE_BY,
......@@ -674,6 +674,9 @@
,if(b.EMP_IDCARD is not null,'0','1') as CONTRACT_STATUS,a.FUND_START_DATE
FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
LEFT JOIN (select t.DEPART_NAME,t.LOWER_LIMIT,t.UPPER_LIMIT from sys_base_set_info t where t.BASE_TYPE = '0' and t.STATUS = 0 and t.DELETE_FLAG = '0' and
DATE_FORMAT(t.APPLY_START_DATE,'%Y%m%d') <![CDATA[ <= ]]> DATE_FORMAT(CURDATE(),'%Y%m%d') and DATE_FORMAT(CURDATE(),'%Y%m%d') <![CDATA[ <= ]]> IFNULL(t.APPLY_END_DATE,DATE_FORMAT(CURDATE(),'%Y%m%d'))
) c on c.DEPART_NAME = a.SOCIAL_HOUSEHOLD_NAME
<where>
a.DELETE_FLAG = '0' and a.IS_REFUSE ='1'
<include refid="tDispatchInfoPre_other_where"/>
......@@ -803,7 +806,8 @@
where
a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status in ('1','2','4','8','9')
<!-- '1','2','4','8','9' 改为 '1','2'-->
and a.process_status in ('1','2')
and a.type_sub = '0' and a.IS_REFUSE='1'
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment