|
|
@@ -375,13 +375,13 @@ public interface ChargeFeeVoMapper {
|
|
|
"sum ( amount) zjss," +
|
|
|
"sum ( case when pay_mark ='0' then amount else 0 end ) zjsk," +
|
|
|
"sum ( case when pay_mark <![CDATA[<>]]>'0' then amount else 0 end ) zjtk," +
|
|
|
- "sum ( case when ((cheque_type='W' or cheque_type='E') and op_id ='99999') then amount else 0 end ) wxzzss," +
|
|
|
- "sum ( case when ((cheque_type='W' or cheque_type='E') and op_id ='99999') and pay_mark ='0' then amount else 0 end ) wxzzsk," +
|
|
|
+ "sum ( case when ((cheque_type='W' or cheque_type='E' or cheque_type='Y') and op_id ='99999') then amount else 0 end ) wxzzss," +
|
|
|
+ "sum ( case when ((cheque_type='W' or cheque_type='E' or cheque_type='Y') and op_id ='99999') and pay_mark ='0' then amount else 0 end ) wxzzsk," +
|
|
|
"sum ( case when ((cheque_type='M' or cheque_type='F') and op_id ='99999') then amount else 0 end ) zfbzzss," +
|
|
|
"sum ( case when ((cheque_type='M' or cheque_type='F') and op_id ='99999') and pay_mark ='0' then amount else 0 end ) zfbzzsk," +
|
|
|
- "count ( distinct case when ((cheque_type='W' or cheque_type='E') and op_id ='99999') and pay_mark ='0' then receipt_sn else null end ) wxzzbs," +
|
|
|
- " count ( distinct case when ((cheque_type='W' or cheque_type='E') and op_id ='99999') and pay_mark > '0' then receipt_sn else null end ) wxzztfbs," +
|
|
|
- "sum ( case when ((cheque_type='W' or cheque_type='E') and op_id ='99999') and pay_mark ='1' then amount else 0 end ) wxzztf," +
|
|
|
+ "count ( distinct case when ((cheque_type='W' or cheque_type='E' or cheque_type='Y') and op_id ='99999') and pay_mark ='0' then receipt_sn else null end ) wxzzbs," +
|
|
|
+ " count ( distinct case when ((cheque_type='W' or cheque_type='E' or cheque_type='Y') and op_id ='99999') and pay_mark > '0' then receipt_sn else null end ) wxzztfbs," +
|
|
|
+ "sum ( case when ((cheque_type='W' or cheque_type='E' or cheque_type='Y') and op_id ='99999') and pay_mark ='1' then amount else 0 end ) wxzztf," +
|
|
|
"sum ( case when ((cheque_type='M' or cheque_type='F') and op_id ='99999') and pay_mark ='1' then amount else 0 end ) zfbzztf," +
|
|
|
"count ( distinct case when ((cheque_type='M' or cheque_type='F') and op_id ='99999') and pay_mark ='0' then receipt_sn else null end ) zfbzzbs," +
|
|
|
" count ( distinct case when ((cheque_type='M' or cheque_type='F') and op_id ='99999') and pay_mark > '0' then receipt_sn else null end ) zfbzztfbs," +
|
|
|
@@ -869,7 +869,7 @@ public interface ChargeFeeVoMapper {
|
|
|
" from " +
|
|
|
" ${tableName} " +
|
|
|
" where dcount_date>=#{beginDate} and " +
|
|
|
- " dcount_date<=#{endDate} " +
|
|
|
+ " dcount_date<=#{endDate} and pay_mark <> 2 " +
|
|
|
"group by op_id,dcount_date " +
|
|
|
"order by op_id ")
|
|
|
List<WorkloadVo> selectSfWorkloadVo(@Param("tableName") String tableName, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
|