Преглед изворни кода

修改退房业务报表中的逻辑错误

Ping пре 1 година
родитељ
комит
2c2b1b4e7f
1 измењених фајлова са 6 додато и 5 уклоњено
  1. 6 5
      退房业务报表.sql

+ 6 - 5
退房业务报表.sql

@@ -13,10 +13,10 @@ select crc.tenant_id, crc.id '合同ID', hhb.dept_id '房源所属门店ID', hou
 	_total.direction '费用方向',
 	_total.kind '费用科目',
 	_total.original_money '金额',
-	IF(_total.direction='应收', 1, -1) * _total.original_money '应退款金额',
+	_total.应退款金额 '应退款金额',
 	_detail.info '财务退款备注',
-	IF(_flow_status.avg_status is null, '-', IF(_flow_status.avg_status=1, '待审核', IF(_flow_status.avg_status=3, '审核通过', '部分审核通过'))) '审核状态',
-	IF(_flow_status.avg_status is null, '未处理', IF(_flow_status.avg_status=3, '已退款', IF(_flow_status.avg_status>1, '已部分退款', '未退款'))) '退款信息'
+	IF(_flow_status.avg_status is null, '-', IF(_flow_status.avg_status=1, '待审核', IF(_flow_status.avg_status=2, '审核通过', '部分审核通过'))) '审核状态',
+	IF(_flow_status.avg_status is null, '未处理', IF(_flow_status.avg_status=2, '已退款', IF(_flow_status.avg_status>1, '已部分退款', '未退款'))) '退款信息'
 from yuxin_contract.cont_renter_contract crc 
 left join yuxin_house.hse_house_base hhb on hhb.is_delete=0 and hhb.id=crc.house_id
 left join yuxin_setting.setting_department house_sd on house_sd.id=hhb.dept_id and house_sd.is_delete=0
@@ -26,14 +26,15 @@ left join yuxin_setting.setting_department maintainer_sd on maintainer_sd.id=mai
 left join yuxin_setting.setting_employee_info mt_emp on mt_emp.id=crc.maintainer_id and mt_emp.is_delete=0
 left join yuxin_contract.cont_renter_info cri on cri.is_delete=0 and cri.customer_type=1 and cri.contract_id=crc.id
 left join (
-    select bd.biz_id, sd.name 'kind', IF(bd.fee_direction=1,'应收','应付') 'direction', SUM(bd.original_money) 'original_money'
+    select bd.biz_id, sd.name 'kind', IF(bd.fee_direction=1,'应收','应付') 'direction', SUM(bd.original_money) 'original_money',
+	SUM(IF(bd.fee_direction = 2, 1, -1) * bd.original_money) '应退款金额'
     from yuxin_finance.fin_finance_bill_detail bd
 	left join yuxin_setting.setting_dictionary sd on sd.id=bd.fee_subject_id
     where bd.is_valid=1 and bd.is_delete=0 and bd.biz_type=2
     group by bd.biz_id,sd.name,bd.fee_direction
 ) _total on _total.biz_id= crc.id
 left join (
-	select bd.biz_id, GROUP_CONCAT(CONCAT(sd.name, bd.original_money)) 'info'
+	select bd.biz_id, GROUP_CONCAT(CONCAT(sd.name, IF(bd.fee_direction=1,1,-1)*bd.original_money)) 'info'
 	from yuxin_finance.fin_finance_bill_detail bd 
 	left join yuxin_setting.setting_dictionary sd on sd.id=bd.fee_subject_id
 	where bd.is_valid=1 and bd.is_delete=0 and bd.biz_type=2 and bd.fee_direction=2