文件补充调整

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/mapper/xml/CcpmReimbursementInfoMapper.xml

@@ -9,170 +9,190 @@
 
 	<select id="findList"
             resultType="com.jeeplus.ccpm.approvalInfo.service.dto.CcpmRetureListDto">
-        SELECT
-	DISTINCT a.id,
-	a.`no`,
-	(
-	CASE
-
-		WHEN a.source_type = 1 THEN
-		b.type_id
-		WHEN a.source_type = 2 THEN
-		b2.type_id
-		WHEN a.source_type = 3 THEN
-		b3.type_id
-		WHEN a.source_type = 4 THEN
-		b4.type_id ELSE b5.type_id
-	END
-	) AS type_id,
-	(
-	CASE
-
-		WHEN a.source_type = 1 THEN
-		t.NAME
-		WHEN a.source_type = 2 THEN
-		t2.NAME
-		WHEN a.source_type = 3 THEN
-		t3.NAME
-		WHEN a.source_type = 4 THEN
-		t4.NAME ELSE t5.NAME
-	END
-	) AS type_name,
-	(
-	CASE
-
-		WHEN a.source_type = 1 THEN
-		b.project_id
-		WHEN a.source_type = 2 THEN
-		b2.contract_id
-		WHEN a.source_type = 3 THEN
-		b3.project_id
-		WHEN a.source_type = 4 THEN
-		b4.project_id ELSE b5.project_id
-	END
-	) AS project_id,
-	(
-	CASE
-
-		WHEN a.source_type = 4 THEN
-		b4.project_name ELSE b5.project_name
-	END
-	) AS project_name,
-	(
-	CASE
-
-		WHEN a.source_type = 1 THEN
-		b.report_number
-		WHEN a.source_type = 2 THEN
-		b2.report_number
-		WHEN a.source_type = 3 THEN
-		b3.report_number
-		WHEN a.source_type = 4 THEN
-		b4.report_number ELSE b5.report_number
-	END
-	) AS report_number,
-	(
-	CASE
-
-		WHEN a.source_type = 1 THEN
-		so.NAME
-		WHEN a.source_type = 2 THEN
-		so2.NAME
-		WHEN a.source_type = 3 THEN
-		so3.NAME
-		WHEN a.source_type = 4 THEN
-		so4.NAME ELSE so5.NAME
-	END
-	) AS dept_name,
-	(
-	CASE
-
-			WHEN a.source_type = 1 THEN
-			us.NAME
-			WHEN a.source_type = 2 THEN
-			us2.NAME
-			WHEN a.source_type = 3 THEN
-			us3.NAME
-			WHEN a.source_type = 4 THEN
-			us4.NAME ELSE us5.NAME
-		END
-		) AS NAME,
-		(
-		CASE
-
-				WHEN a.source_type = 1 THEN
-				b.`number`
-				WHEN a.source_type = 2 THEN
-				b2.`number`
-				WHEN a.source_type = 3 THEN
-				b3.`number`
-				WHEN a.source_type = 4 THEN
-				b4.`number` ELSE b5.`number`
-			END
-			) AS `number`,
-			a.user_name,
-			a.reim_date,
-			a.type,
-			a.proc_ins_id,
-			a.process_definition_id,
-			d.ID_ AS task_id,
-			a.create_by_id AS create_id,
-			a.source_type,
-			a.purchase_id,
-			a.reimbursement_type,
-			a.payment_status,
-			a.payment_time,
-			pru.purchase_no,
-                         a.update_time,
-                         a.approval_time
-		FROM
-			ccpm_reimbursement_info a
-			LEFT JOIN ccpm_reimbursement_detail_info b ON a.id = b.info_id
-			AND b.del_flag = 0
-			LEFT JOIN cw_reimbursement_type_info t ON b.type_id = t.id
-			AND t.del_flag = 0
-			LEFT JOIN sys_office so ON so.id = b.dept_id
-			AND so.del_flag = 0
-			LEFT JOIN sys_user us ON us.id = b.user_id
-			AND us.del_flag = 0
-			LEFT JOIN ccpm_reimbursement_detail_info_contract b2 ON a.id = b2.info_id
-			AND b2.del_flag = 0
-			LEFT JOIN cw_reimbursement_type_info t2 ON b2.type_id = t2.id
-			AND t2.del_flag = 0
-			LEFT JOIN sys_office so2 ON so2.id = b2.dept_id
-			AND so2.del_flag = 0
-			LEFT JOIN sys_user us2 ON us2.id = b2.user_id
-			AND us2.del_flag = 0
-			LEFT JOIN ccpm_reimbursement_detail_info_report b3 ON a.id = b3.info_id
-			AND b3.del_flag = 0
-			LEFT JOIN cw_reimbursement_type_info t3 ON b3.type_id = t3.id
-			AND t3.del_flag = 0
-			LEFT JOIN sys_office so3 ON so3.id = b3.dept_id
-			AND so3.del_flag = 0
-			LEFT JOIN sys_user us3 ON us3.id = b3.user_id
-			AND us3.del_flag = 0
-			LEFT JOIN ccpm_reimbursement_detail_info_other b4 ON a.id = b4.info_id
-			AND b4.del_flag = 0
-			LEFT JOIN cw_reimbursement_type_info t4 ON b4.type_id = t4.id
-			AND t4.del_flag = 0
-			LEFT JOIN sys_office so4 ON so4.id = b4.dept_id
-			AND so4.del_flag = 0
-			LEFT JOIN sys_user us4 ON us4.id = b4.user_id
-			AND us4.del_flag = 0
-			LEFT JOIN ccpm_reimbursement_detail_info_procured b5 ON a.id = b5.info_id
-			AND b5.del_flag = 0
-			LEFT JOIN cw_reimbursement_type_info t5 ON b5.type_id = t5.id
-			AND t5.del_flag = 0
-			LEFT JOIN sys_office so5 ON so5.id = b5.dept_id
-			AND so5.del_flag = 0
-			LEFT JOIN sys_user us5 ON us5.id = b5.user_id
-			AND us5.del_flag = 0
-			LEFT JOIN sys_user c ON a.create_by_id = c.id
-			LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
-			LEFT JOIN material_management_pruchase_request_basics pru ON pru.id = a.purchase_id
-			AND pru.del_flag = '0'
-			${ew.customSqlSegment}
-		ORDER BY a.update_time DESC
+        SELECT DISTINCT a.id,
+                        a.`no`,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    b.type_id
+                                WHEN a.source_type = 2 THEN
+                                    b2.type_id
+                                WHEN a.source_type = 3 THEN
+                                    b3.type_id
+                                WHEN a.source_type = 4 THEN
+                                    b4.type_id
+                                ELSE b5.type_id
+                                END
+                            )          AS type_id,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    t.NAME
+                                WHEN a.source_type = 2 THEN
+                                    t2.NAME
+                                WHEN a.source_type = 3 THEN
+                                    t3.NAME
+                                WHEN a.source_type = 4 THEN
+                                    t4.NAME
+                                ELSE t5.NAME
+                                END
+                            )          AS type_name,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    b.project_id
+                                WHEN a.source_type = 2 THEN
+                                    b2.contract_id
+                                WHEN a.source_type = 3 THEN
+                                    b3.project_id
+                                WHEN a.source_type = 4 THEN
+                                    b4.project_id
+                                ELSE b5.project_id
+                                END
+                            )          AS project_id,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 4 THEN
+                                    b4.project_name
+                                ELSE b5.project_name
+                                END
+                            )          AS project_name,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    b.report_number
+                                WHEN a.source_type = 2 THEN
+                                    b2.report_number
+                                WHEN a.source_type = 3 THEN
+                                    b3.report_number
+                                WHEN a.source_type = 4 THEN
+                                    b4.report_number
+                                ELSE b5.report_number
+                                END
+                            )          AS report_number,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    so.NAME
+                                WHEN a.source_type = 2 THEN
+                                    so2.NAME
+                                WHEN a.source_type = 3 THEN
+                                    so3.NAME
+                                WHEN a.source_type = 4 THEN
+                                    so4.NAME
+                                ELSE so5.NAME
+                                END
+                            )          AS dept_name,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    us.NAME
+                                WHEN a.source_type = 2 THEN
+                                    us2.NAME
+                                WHEN a.source_type = 3 THEN
+                                    us3.NAME
+                                WHEN a.source_type = 4 THEN
+                                    us4.NAME
+                                ELSE us5.NAME
+                                END
+                            )          AS NAME,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    b.`number`
+                                WHEN a.source_type = 2 THEN
+                                    b2.`number`
+                                WHEN a.source_type = 3 THEN
+                                    b3.`number`
+                                WHEN a.source_type = 4 THEN
+                                    b4.`number`
+                                ELSE b5.`number`
+                                END
+                            )          AS `number`,
+                        (
+                            CASE
+
+                                WHEN a.source_type = 1 THEN
+                                    b.`number_count`
+                                WHEN a.source_type = 2 THEN
+                                    b2.`number_count`
+                                WHEN a.source_type = 3 THEN
+                                    b3.`number_count`
+                                WHEN a.source_type = 4 THEN
+                                    b4.`number_count`
+                                ELSE b5.`number_count`
+                                END
+                            )          AS `number_count`,
+                        a.user_name,
+                        a.reim_date,
+                        a.type,
+                        a.proc_ins_id,
+                        a.process_definition_id,
+                        d.ID_          AS task_id,
+                        a.create_by_id AS create_id,
+                        a.source_type,
+                        a.purchase_id,
+                        a.reimbursement_type,
+                        a.payment_status,
+                        a.payment_time,
+                        pru.purchase_no,
+                        a.update_time,
+                        a.approval_time
+        FROM ccpm_reimbursement_info a
+                 LEFT JOIN ccpm_reimbursement_detail_info b ON a.id = b.info_id
+            AND b.del_flag = 0
+                 LEFT JOIN cw_reimbursement_type_info t ON b.type_id = t.id
+            AND t.del_flag = 0
+                 LEFT JOIN sys_office so ON so.id = b.dept_id
+            AND so.del_flag = 0
+                 LEFT JOIN sys_user us ON us.id = b.user_id
+            AND us.del_flag = 0
+                 LEFT JOIN ccpm_reimbursement_detail_info_contract b2 ON a.id = b2.info_id
+            AND b2.del_flag = 0
+                 LEFT JOIN cw_reimbursement_type_info t2 ON b2.type_id = t2.id
+            AND t2.del_flag = 0
+                 LEFT JOIN sys_office so2 ON so2.id = b2.dept_id
+            AND so2.del_flag = 0
+                 LEFT JOIN sys_user us2 ON us2.id = b2.user_id
+            AND us2.del_flag = 0
+                 LEFT JOIN ccpm_reimbursement_detail_info_report b3 ON a.id = b3.info_id
+            AND b3.del_flag = 0
+                 LEFT JOIN cw_reimbursement_type_info t3 ON b3.type_id = t3.id
+            AND t3.del_flag = 0
+                 LEFT JOIN sys_office so3 ON so3.id = b3.dept_id
+            AND so3.del_flag = 0
+                 LEFT JOIN sys_user us3 ON us3.id = b3.user_id
+            AND us3.del_flag = 0
+                 LEFT JOIN ccpm_reimbursement_detail_info_other b4 ON a.id = b4.info_id
+            AND b4.del_flag = 0
+                 LEFT JOIN cw_reimbursement_type_info t4 ON b4.type_id = t4.id
+            AND t4.del_flag = 0
+                 LEFT JOIN sys_office so4 ON so4.id = b4.dept_id
+            AND so4.del_flag = 0
+                 LEFT JOIN sys_user us4 ON us4.id = b4.user_id
+            AND us4.del_flag = 0
+                 LEFT JOIN ccpm_reimbursement_detail_info_procured b5 ON a.id = b5.info_id
+            AND b5.del_flag = 0
+                 LEFT JOIN cw_reimbursement_type_info t5 ON b5.type_id = t5.id
+            AND t5.del_flag = 0
+                 LEFT JOIN sys_office so5 ON so5.id = b5.dept_id
+            AND so5.del_flag = 0
+                 LEFT JOIN sys_user us5 ON us5.id = b5.user_id
+            AND us5.del_flag = 0
+                 LEFT JOIN sys_user c ON a.create_by_id = c.id
+                 LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
+                 LEFT JOIN material_management_pruchase_request_basics pru ON pru.id = a.purchase_id
+            AND pru.del_flag = '0'
+            ${ew.customSqlSegment}
+        ORDER BY a.update_time DESC
     </select>
 	<select id="findFiles" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/dto/CcpmRetureListDto.java

@@ -88,6 +88,14 @@ public class CcpmRetureListDto {
     @Excel(name = "报销金额", width = 30, orderNum = "11",type = 10)
     private BigDecimal number;
 
+
+
+
+    /**
+     * 报销金额汇总
+     */
+    private String numberCount;
+
     /**
      * 报销状态
      */

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/xml/ZsReimbursementInfoMapper.xml

@@ -144,6 +144,19 @@
 						b6.`number` ELSE b5.`number`
 					END
 				) AS `number`,
+			(
+				CASE
+
+					WHEN a.source_type = 1 THEN
+						b.`number_count`
+					WHEN a.source_type = 3 THEN
+						r4.`number_count`
+					WHEN a.source_type = 4 THEN
+						b4.`number_count`
+					WHEN a.source_type = 8 THEN
+						zs1.`number_count`
+					END
+				) AS `number_count`,
 			a.user_name,
 			a.reim_date,
 			a.type,

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/dto/ZsRetureListDto.java

@@ -99,6 +99,11 @@ public class ZsRetureListDto {
      * 流程id
      */
     private String procInsId;
+    /**
+     * 报销金额汇总
+     */
+    private String numberCount;
+
 
     /**
      *

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/mapper/xml/ConsultancyReimbursementInfoMapper.xml

@@ -110,6 +110,19 @@
 				b4.`number` ELSE b5.`number`
 			END
 			) AS `number`,
+			 (
+						 CASE
+
+							 WHEN a.source_type = 1 THEN
+								 b.`number_count`
+							 WHEN a.source_type = 2 THEN
+								 b2.`number_count`
+							 WHEN a.source_type = 3 THEN
+								 b3.`number_count`
+							 WHEN a.source_type = 4 THEN
+								 b4.`number_count` ELSE b5.`number_count`
+							 END
+						 )          AS `number_count`,
 			a.user_name,
 			a.reim_date,
 			a.type,

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/dto/ConsultancyRetureListDto.java

@@ -89,6 +89,11 @@ public class ConsultancyRetureListDto {
     private BigDecimal number;
 
     /**
+     * 报销金额汇总
+     */
+    private String numberCount;
+
+    /**
      * 报销状态
      */
     @Excel(name = "报销状态", width = 30, orderNum = "12")

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -9,125 +9,130 @@
 
 	<select id="findList"
             resultType="com.jeeplus.finance.reimbursementApproval.approvalInfo.service.dto.RetureListDto">
-        SELECT
-		DISTINCT a.id,
-			a.`no`,
-			(CASE
-			WHEN a.source_type = 1 THEN b.type_id
-			WHEN a.source_type = 2 THEN b2.type_id
-			WHEN a.source_type = 3 THEN b3.type_id
-			WHEN a.source_type = 4 THEN b4.type_id
-			WHEN a.source_type = 6 THEN b6.type_id
-									ELSE b5.type_id END) AS type_id,
-			(CASE
-			WHEN a.source_type = 1 THEN t.name
-			WHEN a.source_type = 2 THEN t2.name
-			WHEN a.source_type = 3 THEN t3.name
-			WHEN a.source_type = 4 THEN t4.name
-			WHEN a.source_type = 6 THEN t6.name
-									ELSE t5.name END) AS type_name,
-			(CASE
-			WHEN a.source_type = 1 THEN b.project_id
-			WHEN a.source_type = 2 THEN b2.contract_id
-			WHEN a.source_type = 3 THEN b3.project_id
-			WHEN a.source_type = 4 THEN b4.project_id
-									ELSE b5.project_id END) AS project_id,
-			(CASE
-			WHEN a.source_type = 1 THEN p.project_name
-			WHEN a.source_type = 2 THEN contr2.contract_name
-			WHEN a.source_type = 3 THEN p3.project_name
-			WHEN a.source_type = 4 THEN b4.project_name
-			WHEN a.source_type = 6 THEN b6.reimbuser_name
-									ELSE b5.project_name END) AS project_name,
-			(CASE
-			WHEN a.source_type = 1 THEN b.report_number
-			WHEN a.source_type = 2 THEN b2.report_number
-			WHEN a.source_type = 3 THEN b3.report_number
-			WHEN a.source_type = 4 THEN b4.report_number
-									ELSE b5.report_number END) AS report_number,
-			(CASE
-			WHEN a.source_type = 1 THEN so.name
-			WHEN a.source_type = 2 THEN so2.name
-			WHEN a.source_type = 3 THEN so3.name
-			WHEN a.source_type = 4 THEN so4.name
-			WHEN a.source_type = 6 THEN so6.name
-									ELSE so5.name END) AS dept_name,
-			(CASE
-			WHEN a.source_type = 1 THEN us.name
-			WHEN a.source_type = 2 THEN us2.name
-			WHEN a.source_type = 3 THEN us3.name
-			WHEN a.source_type = 4 THEN us4.name
-			WHEN a.source_type = 6 THEN us6.name
-									ELSE us5.name END) AS name,
-			(CASE
-			WHEN a.source_type = 1 THEN b.`number`
-			WHEN a.source_type = 2 THEN b2.`number`
-			WHEN a.source_type = 3 THEN b3.`number`
-			WHEN a.source_type = 4 THEN b4.`number`
-			WHEN a.source_type = 6 THEN b6.`number`
-									ELSE b5.`number` END) AS `number`,
-
-			a.reimbursement_type,
-			a.user_name,
-			a.reim_date,
-			a.approval_time,
-			a.type,
-			a.proc_ins_id,
-			a.process_definition_id,
-			d.ID_ AS task_id,
-			a.create_by_id as create_id,
-			a.source_type,
-			a.purchase_id,
-			a.payment_time,
-			a.payment_status,
-			b.user_id as projectUser,
-			b.dept_id as projectOffice,
-			b3.user_id as reportUser,
-			b3.dept_id as reportOffice,
-			pru.purchase_no
-		FROM
-			cw_reimbursement_info a
-			LEFT JOIN cw_reimbursement_detail_info b ON a.id = b.info_id AND b.del_flag = 0
-			left join cw_reimbursement_type_info t on b.type_id = t.id and t.del_flag = 0
-			left join cw_project_records p on p.id = b.project_id and p.del_flag = 0
-			left join sys_office so on so.id = b.dept_id and so.del_flag = 0
-			left join sys_user us on us.id = b.user_id and us.del_flag = 0
-
-			LEFT JOIN cw_reimbursement_detail_info_contract b2 ON a.id = b2.info_id AND b2.del_flag = 0
-			left join cw_reimbursement_type_info t2 on b2.type_id = t2.id and t2.del_flag = 0
-			left join cw_work_contract_info contr2 on contr2.id = b2.contract_id and contr2.del_flag = 0
-			left join sys_office so2 on so2.id = b2.dept_id and so2.del_flag = 0
-			left join sys_user us2 on us2.id = b2.user_id and us2.del_flag = 0
-
-			LEFT JOIN cw_reimbursement_detail_info_report b3 ON a.id = b3.info_id AND b3.del_flag = 0
-			left join cw_reimbursement_type_info t3 on b3.type_id = t3.id and t3.del_flag = 0
-			left join cw_project_records p3 on p3.id = b3.project_id and p3.del_flag = 0
-			left join sys_office so3 on so3.id = b3.dept_id and so3.del_flag = 0
-			left join sys_user us3 on us3.id = b3.user_id and us3.del_flag = 0
-
-			LEFT JOIN cw_reimbursement_detail_info_other b4 ON a.id = b4.info_id AND b4.del_flag = 0
-			left join cw_reimbursement_type_info t4 on b4.type_id = t4.id and t4.del_flag = 0
-			left join cw_project_records p4 on p4.id = b4.project_id and p4.del_flag = 0
-			left join sys_office so4 on so4.id = b4.dept_id and so4.del_flag = 0
-			left join sys_user us4 on us4.id = b4.user_id and us4.del_flag = 0
-
-			LEFT JOIN cw_reimbursement_detail_info_procured b5 ON a.id = b5.info_id AND b5.del_flag = 0
-			left join cw_reimbursement_type_info t5 on b5.type_id = t5.id and t5.del_flag = 0
-			left join cw_project_records p5 on p5.id = b5.project_id and p5.del_flag = 0
-			left join sys_office so5 on so5.id = b5.dept_id and so5.del_flag = 0
-			left join sys_user us5 on us5.id = b5.user_id and us5.del_flag = 0
-
-			LEFT JOIN human_reimbursement_detail_info_procured b6 ON a.id = b6.info_id AND b6.del_flag = 0
-			left join cw_reimbursement_type_info t6 on b6.type_id = t6.id and t6.del_flag = 0
-			left join sys_office so6 on so6.id = b6.dept_id and so6.del_flag = 0
-			left join sys_user us6 on us6.id = b6.user_id and us6.del_flag = 0
-
-			LEFT JOIN sys_user c ON a.create_by_id =  c.id
-			left join sys_user_manage_office sumo on sumo.office_id = c.office_id
-			LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
-			left join material_management_pruchase_request_basics pru on pru.id = a.purchase_id and pru.del_flag = '0'
-			${ew.customSqlSegment}
-		ORDER BY a.update_time DESC
+        SELECT DISTINCT a.id,
+                        a.`no`,
+                        (CASE
+                             WHEN a.source_type = 1 THEN b.type_id
+                             WHEN a.source_type = 2 THEN b2.type_id
+                             WHEN a.source_type = 3 THEN b3.type_id
+                             WHEN a.source_type = 4 THEN b4.type_id
+                             WHEN a.source_type = 6 THEN b6.type_id
+                             ELSE b5.type_id END)        AS type_id,
+                        (CASE
+                             WHEN a.source_type = 1 THEN t.name
+                             WHEN a.source_type = 2 THEN t2.name
+                             WHEN a.source_type = 3 THEN t3.name
+                             WHEN a.source_type = 4 THEN t4.name
+                             WHEN a.source_type = 6 THEN t6.name
+                             ELSE t5.name END)           AS type_name,
+                        (CASE
+                             WHEN a.source_type = 1 THEN b.project_id
+                             WHEN a.source_type = 2 THEN b2.contract_id
+                             WHEN a.source_type = 3 THEN b3.project_id
+                             WHEN a.source_type = 4 THEN b4.project_id
+                             ELSE b5.project_id END)     AS project_id,
+                        (CASE
+                             WHEN a.source_type = 1 THEN p.project_name
+                             WHEN a.source_type = 2 THEN contr2.contract_name
+                             WHEN a.source_type = 3 THEN p3.project_name
+                             WHEN a.source_type = 4 THEN b4.project_name
+                             WHEN a.source_type = 6 THEN b6.reimbuser_name
+                             ELSE b5.project_name END)   AS project_name,
+                        (CASE
+                             WHEN a.source_type = 1 THEN b.report_number
+                             WHEN a.source_type = 2 THEN b2.report_number
+                             WHEN a.source_type = 3 THEN b3.report_number
+                             WHEN a.source_type = 4 THEN b4.report_number
+                             ELSE b5.report_number END)  AS report_number,
+                        (CASE
+                             WHEN a.source_type = 1 THEN so.name
+                             WHEN a.source_type = 2 THEN so2.name
+                             WHEN a.source_type = 3 THEN so3.name
+                             WHEN a.source_type = 4 THEN so4.name
+                             WHEN a.source_type = 6 THEN so6.name
+                             ELSE so5.name END)          AS dept_name,
+                        (CASE
+                             WHEN a.source_type = 1 THEN us.name
+                             WHEN a.source_type = 2 THEN us2.name
+                             WHEN a.source_type = 3 THEN us3.name
+                             WHEN a.source_type = 4 THEN us4.name
+                             WHEN a.source_type = 6 THEN us6.name
+                             ELSE us5.name END)          AS name,
+                        (CASE
+                             WHEN a.source_type = 1 THEN b.`number`
+                             WHEN a.source_type = 2 THEN b2.`number`
+                             WHEN a.source_type = 3 THEN b3.`number`
+                             WHEN a.source_type = 4 THEN b4.`number`
+                             WHEN a.source_type = 6 THEN b6.`number`
+                             ELSE b5.`number_count` END) AS `number`,
+                        (CASE
+                             WHEN a.source_type = 1 THEN b.`number_count`
+                             WHEN a.source_type = 2 THEN b2.`number_count`
+                             WHEN a.source_type = 3 THEN b3.`number_count`
+                             WHEN a.source_type = 4 THEN b4.`number_count`
+                             ELSE b5.`number_count` END) AS `number_count`,
+
+                        a.reimbursement_type,
+                        a.user_name,
+                        a.reim_date,
+                        a.approval_time,
+                        a.type,
+                        a.proc_ins_id,
+                        a.process_definition_id,
+                        d.ID_                            AS task_id,
+                        a.create_by_id                   as create_id,
+                        a.source_type,
+                        a.purchase_id,
+                        a.payment_time,
+                        a.payment_status,
+                        b.user_id                        as projectUser,
+                        b.dept_id                        as projectOffice,
+                        b3.user_id                       as reportUser,
+                        b3.dept_id                       as reportOffice,
+                        pru.purchase_no
+        FROM cw_reimbursement_info a
+                 LEFT JOIN cw_reimbursement_detail_info b ON a.id = b.info_id AND b.del_flag = 0
+                 left join cw_reimbursement_type_info t on b.type_id = t.id and t.del_flag = 0
+                 left join cw_project_records p on p.id = b.project_id and p.del_flag = 0
+                 left join sys_office so on so.id = b.dept_id and so.del_flag = 0
+                 left join sys_user us on us.id = b.user_id and us.del_flag = 0
+
+                 LEFT JOIN cw_reimbursement_detail_info_contract b2 ON a.id = b2.info_id AND b2.del_flag = 0
+                 left join cw_reimbursement_type_info t2 on b2.type_id = t2.id and t2.del_flag = 0
+                 left join cw_work_contract_info contr2 on contr2.id = b2.contract_id and contr2.del_flag = 0
+                 left join sys_office so2 on so2.id = b2.dept_id and so2.del_flag = 0
+                 left join sys_user us2 on us2.id = b2.user_id and us2.del_flag = 0
+
+                 LEFT JOIN cw_reimbursement_detail_info_report b3 ON a.id = b3.info_id AND b3.del_flag = 0
+                 left join cw_reimbursement_type_info t3 on b3.type_id = t3.id and t3.del_flag = 0
+                 left join cw_project_records p3 on p3.id = b3.project_id and p3.del_flag = 0
+                 left join sys_office so3 on so3.id = b3.dept_id and so3.del_flag = 0
+                 left join sys_user us3 on us3.id = b3.user_id and us3.del_flag = 0
+
+                 LEFT JOIN cw_reimbursement_detail_info_other b4 ON a.id = b4.info_id AND b4.del_flag = 0
+                 left join cw_reimbursement_type_info t4 on b4.type_id = t4.id and t4.del_flag = 0
+                 left join cw_project_records p4 on p4.id = b4.project_id and p4.del_flag = 0
+                 left join sys_office so4 on so4.id = b4.dept_id and so4.del_flag = 0
+                 left join sys_user us4 on us4.id = b4.user_id and us4.del_flag = 0
+
+                 LEFT JOIN cw_reimbursement_detail_info_procured b5 ON a.id = b5.info_id AND b5.del_flag = 0
+                 left join cw_reimbursement_type_info t5 on b5.type_id = t5.id and t5.del_flag = 0
+                 left join cw_project_records p5 on p5.id = b5.project_id and p5.del_flag = 0
+                 left join sys_office so5 on so5.id = b5.dept_id and so5.del_flag = 0
+                 left join sys_user us5 on us5.id = b5.user_id and us5.del_flag = 0
+
+                 LEFT JOIN human_reimbursement_detail_info_procured b6 ON a.id = b6.info_id AND b6.del_flag = 0
+                 left join cw_reimbursement_type_info t6 on b6.type_id = t6.id and t6.del_flag = 0
+                 left join sys_office so6 on so6.id = b6.dept_id and so6.del_flag = 0
+                 left join sys_user us6 on us6.id = b6.user_id and us6.del_flag = 0
+
+                 LEFT JOIN sys_user c ON a.create_by_id = c.id
+                 left join sys_user_manage_office sumo on sumo.office_id = c.office_id
+                 LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
+                 left join material_management_pruchase_request_basics pru
+                           on pru.id = a.purchase_id and pru.del_flag = '0'
+            ${ew.customSqlSegment}
+        ORDER BY a.update_time DESC
     </select>
 
 	<select id="computerList"

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/dto/RetureListDto.java

@@ -89,6 +89,11 @@ public class RetureListDto {
     private BigDecimal number;
 
     /**
+     * 报销金额汇总
+     */
+    private String numberCount;
+
+    /**
      * 报销状态
      */
     @Excel(name = "报销状态", width = 30, orderNum = "12")

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -1214,5 +1214,26 @@ public class FlowableTaskController {
         }
     }
 
+    /**
+     * 根据procInsId获取当前流程的表单的提交审核日期（仅限报销流程）
+     *
+     * @param flow
+     * @return
+     */
+    @GetMapping("/getCreateTimeByProcInsId")
+    public ResponseEntity<String> getCreateTimeByProcInsId(Flow flow) {
+        try {
+            if (flow.getProcInsId() != null) {
+                if (flowTaskService.getProcIns(flow.getProcInsId()) != null) {
+                    flow.setProcIns(flowTaskService.getProcIns(flow.getProcInsId()));
+                }
+            }
+            String res = flowTaskService.getCreateTimeByProcInsId(flow);
+            return ResponseEntity.ok(res);
+        } catch (Exception e) {
+            return  null;
+        }
+    }
+
 
 }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/FlowMapper.java

@@ -26,6 +26,9 @@ public interface FlowMapper extends BaseMapper <Flow> {
     @InterceptorIgnore(tenantLine = "true")
     String getApprovalTimeByProcInsId(Flow act);
 
+    @InterceptorIgnore(tenantLine = "true")
+    String getCreateTimeByProcInsId(Flow act);
+
 
     @InterceptorIgnore(tenantLine = "true")
     int updateProcInsIdByBusinessId(Flow act);

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/xml/FlowMapper.xml

@@ -24,6 +24,14 @@
 		WHERE proc_ins_id = #{procInsId}
 		AND del_flag = '0'
 	</select>
+	<select id="getCreateTimeByProcInsId"  resultType="java.lang.String">
+		select
+			create_time
+		FROM  ${businessTable}
+		WHERE proc_ins_id = #{procInsId}
+		  AND del_flag = '0'
+	</select>
+
     <select id="getTaskInfoByTaskId" resultType="com.jeeplus.flowable.model.ActRuTaskInfo">
 		select
 		  ID_ as "id",

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -1408,4 +1408,10 @@ public class FlowTaskService {
        return flowMapper.getApprovalTimeByProcInsId(act);
     }
 
+    public String getCreateTimeByProcInsId(Flow act){
+        return flowMapper.getCreateTimeByProcInsId(act);
+    }
+
+
+
 }