浏览代码

no message

ly 1 年之前
父节点
当前提交
b9ad3a80ef
共有 1 个文件被更改,包括 13 次插入2 次删除
  1. 13 2
      src/main/resources/mybatis/business/BizCollectionMapper.xml

+ 13 - 2
src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -175,13 +175,19 @@
         END AS isProject,
         t2.amount AS detailAllAmount,
         CASE WHEN t1.STATUS = 1 THEN t2.arrive_amount ELSE 0 END  AS reallyDetailAmount,
-        t1.verify_date as examineTime
+        t1.verify_date as examineTime,
+        t1.applier_id,
+        t6.nick_name AS applierName,
+        t2.task_type_id,
+        t7.name as typeName,
+        date_format(  t1.arrive_date, '%Y-%m-%d') as receiptDate
         FROM
         biz_collection t1 right join biz_collection_detail t2 ON t1.id = t2.collection_id
         LEFT JOIN biz_company t3 ON t3.id = t1.company_id
         LEFT JOIN biz_task_type t4 ON t4.id = t2.task_type_id
         LEFT JOIN biz_archive_input t5 ON t5.id = t1.contract_id
         LEFT JOIN sys_user t6 ON t6.user_id = t1.applier_id
+        LEFT JOIN biz_task_type t7 on t7.id = t2.task_type_id
         WHERE
         t1.contract_id = #{conditions.contractId}
         AND
@@ -214,13 +220,18 @@
         t1.verify_date AS examineTime,
         t2.task_type_id,
         t1.company_id,
-        t1.contract_id
+        t1.contract_id,
+        t1.applier_id,
+        t7.name as typeName,
+        t6.nick_name AS applierName
+
         FROM biz_payment t1
         RIGHT JOIN biz_payment_detail t2 ON t1.id = t2.payment_id
         LEFT JOIN biz_company t3 ON t3.id = t1.company_id
         LEFT JOIN biz_task_type t4 ON t4.id = t2.task_type_id
         LEFT JOIN biz_archive_input t5 ON t5.id = t1.contract_id
         LEFT JOIN sys_user t6 ON t6.user_id = t1.applier_id
+        LEFT JOIN biz_task_type t7 on t7.id = t2.task_type_id
         WHERE t1.contract_id = #{conditions.contractId}
         AND t2.task_type_id = #{conditions.taskTypeIds[0]}
         <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">