|
|
@@ -57,7 +57,7 @@
|
|
|
FROM ins_ply_income ipi
|
|
|
WHERE ipi.is_delete = 0
|
|
|
AND ipi.system_code = #{systemCode}
|
|
|
- AND YEAR(ipi.signing_time) between #{param.year[0]} and #{param.year[1]}
|
|
|
+ AND YEAR(ipi.signing_time) = #{param.year[0]}
|
|
|
GROUP BY CONCAT(YEAR(ipi.signing_time), '-', LPAD(MONTH(ipi.signing_time), 2, '0'))
|
|
|
) r
|
|
|
LEFT JOIN (
|
|
|
@@ -68,7 +68,7 @@
|
|
|
WHERE ipii.is_delete = 0
|
|
|
AND ipii.system_code = #{systemCode}
|
|
|
AND ipii.invoice_type IN ('1','2','3','4')
|
|
|
- AND YEAR(ipii.create_time) between #{param.year[0]} and #{param.year[1]}
|
|
|
+ AND YEAR(ipii.create_time) = #{param.year[0]}
|
|
|
GROUP BY CONCAT(YEAR(ipii.create_time), '-', LPAD(MONTH(ipii.create_time), 2, '0'))
|
|
|
) i ON r.year_and_month_time = i.year_and_month_time
|
|
|
LEFT JOIN (
|
|
|
@@ -80,7 +80,7 @@
|
|
|
WHERE ipiis.is_delete = 0
|
|
|
AND ipii.system_code = #{systemCode}
|
|
|
AND ipii.invoice_type IN ('1','2','3','4','5','6')
|
|
|
- AND YEAR(ipiis.create_time) between #{param.year[0]} and #{param.year[1]}
|
|
|
+ AND YEAR(ipiis.create_time) = #{param.year[0]}
|
|
|
GROUP BY CONCAT(YEAR(ipiis.create_time), '-', LPAD(MONTH(ipiis.create_time), 2, '0'))
|
|
|
) s ON r.year_and_month_time = s.year_and_month_time
|
|
|
ORDER BY r.year_and_month_time ASC
|
|
|
@@ -127,7 +127,7 @@
|
|
|
FROM ins_ply_income ipi
|
|
|
WHERE ipi.is_delete = 0
|
|
|
AND ipi.system_code = #{systemCode}
|
|
|
- AND YEAR(ipi.signing_time) between #{param.year[0]} and #{param.year[1]}
|
|
|
+ AND YEAR(ipi.signing_time) = #{param.year[0]}
|
|
|
GROUP BY ipi.company_id, ipi.company_name
|
|
|
) rc
|
|
|
LEFT JOIN (
|
|
|
@@ -139,7 +139,7 @@
|
|
|
WHERE ipii.is_delete = 0
|
|
|
AND ipii.system_code = #{systemCode}
|
|
|
AND ipii.invoice_type IN ('1','2','3','4')
|
|
|
- AND YEAR(ipii.create_time) between #{param.year[0]} and #{param.year[1]}
|
|
|
+ AND YEAR(ipii.create_time) = #{param.year[0]}
|
|
|
GROUP BY ipii.company_id
|
|
|
) i ON rc.company_id = i.company_id
|
|
|
LEFT JOIN (
|
|
|
@@ -160,7 +160,7 @@
|
|
|
AND ipii.is_delete = 0
|
|
|
AND ipii.system_code = #{systemCode}
|
|
|
WHERE ipiis.is_delete = 0
|
|
|
- AND YEAR(ipiis.create_time) between #{param.year[0]} and #{param.year[1]}
|
|
|
+ AND YEAR(ipiis.create_time) = #{param.year[0]}
|
|
|
AND ipii.company_id IS NOT NULL
|
|
|
GROUP BY ipii.company_id
|
|
|
) t
|
|
|
@@ -172,7 +172,7 @@
|
|
|
AND ipii.is_delete = 0
|
|
|
AND ipii.system_code = #{systemCode}
|
|
|
WHERE ipiis.is_delete = 0
|
|
|
- AND YEAR(ipiis.create_time) between #{param.year[0]} and #{param.year[1]}
|
|
|
+ AND YEAR(ipiis.create_time) = #{param.year[0]}
|
|
|
AND ipii.company_id IS NULL
|
|
|
) plat
|
|
|
) s ON rc.company_id = s.company_id
|
|
|
@@ -186,7 +186,7 @@
|
|
|
WHERE ipii.is_delete = 0
|
|
|
AND ipii.system_code = #{systemCode}
|
|
|
AND ipii.invoice_type IN ('1','2','3','4','5','6')
|
|
|
- AND YEAR(ipii.create_time) between #{param.year[0]} and #{param.year[1]}
|
|
|
+ AND YEAR(ipii.create_time) = #{param.year[0]}
|
|
|
GROUP BY ipii.company_id
|
|
|
) us ON rc.company_id = us.company_id
|
|
|
</select>
|