中审报销- 调整

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/domain/ZsReimbursementDetailInfoOther.java

@@ -81,4 +81,14 @@ public class ZsReimbursementDetailInfoOther extends BaseEntity {
      * 报销项目名称
      */
     private String projectName;
+
+    /**
+     * 发票号
+     */
+    private String invoiceNumber;
+
+    /**
+     * 立项号
+     */
+    private String projectApprovalNumber;
 }

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

@@ -13,57 +13,65 @@
 	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 = 1 THEN b4.type_id
+			WHEN a.source_type = 2 THEN b4.type_id
+			WHEN a.source_type = 3 THEN b4.type_id
 			WHEN a.source_type = 4 THEN b4.type_id
+			WHEN a.source_type = 8 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 = 1 THEN t4.name
+			WHEN a.source_type = 2 THEN t4.name
+			WHEN a.source_type = 3 THEN t4.name
 			WHEN a.source_type = 4 THEN t4.name
+			WHEN a.source_type = 8 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 = 1 THEN b4.project_id
+			WHEN a.source_type = 2 THEN b4.project_id
+			WHEN a.source_type = 3 THEN b4.project_id
 			WHEN a.source_type = 4 THEN b4.project_id
+			WHEN a.source_type = 8 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 = 1 THEN b4.project_name
+			WHEN a.source_type = 2 THEN b4.project_name
+			WHEN a.source_type = 3 THEN b4.project_name
 			WHEN a.source_type = 4 THEN b4.project_name
+			WHEN a.source_type = 8 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 = 1 THEN b4.report_number
+			WHEN a.source_type = 2 THEN b4.report_number
+			WHEN a.source_type = 3 THEN b4.report_number
 			WHEN a.source_type = 4 THEN b4.report_number
+			WHEN a.source_type = 8 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 = 1 THEN so4.name
+			WHEN a.source_type = 2 THEN so4.name
+			WHEN a.source_type = 3 THEN so4.name
 			WHEN a.source_type = 4 THEN so4.name
+			WHEN a.source_type = 8 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 = 1 THEN us4.name
+			WHEN a.source_type = 2 THEN us4.name
+			WHEN a.source_type = 3 THEN us4.name
 			WHEN a.source_type = 4 THEN us4.name
+			WHEN a.source_type = 8 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 = 1 THEN b4.`number`
+			WHEN a.source_type = 2 THEN b4.`number`
+			WHEN a.source_type = 3 THEN b4.`number`
 			WHEN a.source_type = 4 THEN b4.`number`
+			WHEN a.source_type = 8 THEN b4.`number`
 			WHEN a.source_type = 6 THEN b6.`number`
 									ELSE b5.`number` END) AS `number`,
 			a.user_name,
@@ -549,6 +557,8 @@
 		a.receipt_number,
 		a.days,
 		a.content,
+		a.invoice_number,
+		a.project_approval_number,
 		su.name as user_name,
 		so.name as dept_name,
 		zs_type.name as type_name,