Merge remote-tracking branch 'origin/develop' into develop

src/main/webapp/WEB-INF/classes/rpt/RPT5014/rpt5014_result_query.lwm

@@ -14,7 +14,8 @@
        (select to_char(due_date, 'yyyy-mm-dd')
           from con_contract_cashflow
          where contract_id = ct.contract_id
-           and cf_item = 8) residual_date, -- 合同终了
+           and cf_item = 8
+           and cf_status='RELEASE') residual_date, -- 合同终了
        to_char(ct.et_date, 'yyyy-mm-dd') terminate_date, --合同到期日
        (SELECT i.machine_number
           FROM con_contract_lease_item i
@@ -224,6 +225,7 @@
 
   from con_contract ct
  where ct.contract_status = 'INCEPT'
+   and ct.data_class='NORMAL'
    and con_contract_pkg.get_business_times(p_contract_id => ct.contract_id,
                                                 p_calc_date   => to_date(${@cur_end},
                                                                          'yyyy-mm-dd'),