|
@@ -35,10 +35,14 @@
|
|
|
tt1.shenheshijian as examineTime,
|
|
|
tt1.verifyName,
|
|
|
tt1.actually_date,
|
|
|
- tt2.zhichu as outAmount
|
|
|
+ tt2.zhichu as outAmount,
|
|
|
+ tt1.input_start_month as inputStartMonth,
|
|
|
+ tt1.input_end_month as inputEndMonth
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ inputdetail.input_start_month,
|
|
|
+ inputdetail.input_end_month,
|
|
|
c.company_id,
|
|
|
GROUP_CONCAT( DISTINCT date_format( c.actually_date, '%Y-%m-%d' )) AS actually_date,
|
|
|
com.NAME,
|
|
@@ -75,6 +79,7 @@
|
|
|
LEFT JOIN sys_user u ON u.user_id = c.applier_id
|
|
|
LEFT JOIN biz_task_type type on type.id = detail.task_type_id
|
|
|
LEFT JOIN sys_user u2 on u2.user_id = c.verify_id
|
|
|
+ left join biz_archive_input_detail inputdetail on c.contract_id = inputdetail.contract_id and detail.task_type_id = inputdetail.task_type_id
|
|
|
WHERE
|
|
|
c.deleted = 0
|
|
|
AND c.STATUS != 2
|
|
@@ -173,7 +178,6 @@
|
|
|
) tt2 ON tt1.company_id = tt2.company_id
|
|
|
AND tt1.task_type_id = tt2.task_type_id
|
|
|
AND tt1.contract_id = tt2.contract_id
|
|
|
-
|
|
|
</select>
|
|
|
<select id="getByContractIn" resultType="cn.ezhizao.project.business.collection.domain.vo.ResStatisticsVo">
|
|
|
SELECT
|