|
|
@@ -24,28 +24,26 @@
|
|
|
cib.year_begin_borrow_amount
|
|
|
FROM (SELECT ccd.id,
|
|
|
ccd.account_subjects_id,
|
|
|
- IF(cc.trade_type = 10, cc.apply_time, ap.expenses_time) AS expenses_time,
|
|
|
- IF(cc.trade_type = 10, ccd.money, - ccd.money) AS tradeAmount,
|
|
|
+ IF(cc.trade_type = 10, cc.apply_time, ap.expenses_time) AS expenses_time,
|
|
|
+ IF(cc.trade_type = 10, ccd.money, - ccd.money) AS tradeAmount,
|
|
|
asj.subjects_code,
|
|
|
asj.subjects_name,
|
|
|
asj.sort,
|
|
|
t2.calculate_item_ids,
|
|
|
t2.calculate_item_types,
|
|
|
t2.calculate_item_names,
|
|
|
- CONCAT(ccd.account_subjects_id, ',', t2.calculate_item_ids) AS subjects_calculate_item_ids,
|
|
|
--- CONCAT(asj.subjects_name, ' - ', IFNULL(ccd.calculate_item_name1, ''),
|
|
|
--- IF(ccd.calculate_item_name2 IS NULL, '',
|
|
|
--- CONCAT(' - ', ccd.calculate_item_name2))) AS calculate_item_str0,
|
|
|
+ CONCAT(ccd.account_subjects_id, '-', t2.calculate_item_type_ids) AS subjects_calculate_item_ids,
|
|
|
CONCAT(asj.subjects_name, ' - ',
|
|
|
- REPLACE(t2.calculate_item_names, ',', ' - ')) AS calculate_item_str
|
|
|
+ REPLACE(t2.calculate_item_names, ',', ' - ')) AS calculate_item_str
|
|
|
FROM cost_control cc
|
|
|
JOIN cost_control_detail ccd ON ccd.cost_control_id = cc.id
|
|
|
LEFT JOIN account_payment ap ON ap.business_id = cc.id
|
|
|
LEFT JOIN account_subjects asj ON ccd.account_subjects_id = asj.id
|
|
|
LEFT JOIN (SELECT cci.cost_control_detail_id,
|
|
|
- GROUP_CONCAT(cci.business_id) AS calculate_item_ids,
|
|
|
- GROUP_CONCAT(cci.type) AS calculate_item_types,
|
|
|
- GROUP_CONCAT(cciv.calculate_item_name) AS calculate_item_names
|
|
|
+ GROUP_CONCAT(cci.business_id) AS calculate_item_ids,
|
|
|
+ GROUP_CONCAT(cci.type) AS calculate_item_types,
|
|
|
+ GROUP_CONCAT(cciv.calculate_item_name) AS calculate_item_names,
|
|
|
+ GROUP_CONCAT(cci.type, '-', cci.business_id SEPARATOR '-') AS calculate_item_type_ids
|
|
|
FROM cost_calculate_item cci
|
|
|
JOIN calculate_item_view cciv
|
|
|
ON FIND_IN_SET(cci.type, cciv.calculate_item_type)
|
yzc