报销调整代码提交

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementDetailInfo.java

@@ -67,11 +67,31 @@ public class ReimbursementDetailInfo extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -85,4 +105,14 @@ public class ReimbursementDetailInfo extends BaseEntity {
      * 排序
      */
     private String sort;
+
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementDetailInfoContract.java

@@ -77,11 +77,30 @@ public class ReimbursementDetailInfoContract extends BaseEntity implements Seria
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementDetailInfoOther.java

@@ -74,13 +74,31 @@ public class ReimbursementDetailInfoOther extends BaseEntity implements Serializ
      * 费用(元)
      */
     private String number;
+    /**
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
 
     /**
-     * 收据张数
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+    /**
      * 出差天数
      */
     private Integer days;
@@ -97,4 +115,14 @@ public class ReimbursementDetailInfoOther extends BaseEntity implements Serializ
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementDetailInfoProcured.java

@@ -76,11 +76,30 @@ public class ReimbursementDetailInfoProcured extends BaseEntity implements Seria
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/InvoiceConfirmStatusMapper.java

@@ -1,10 +1,13 @@
 package com.jeeplus.assess.reimbursement.reimbursementInfo.mapper;
 
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.domain.InvoiceConfirmStatus;
 import org.apache.ibatis.annotations.Mapper;
 
+
+@InterceptorIgnore(tenantLine = "true")
 @Mapper
 public interface InvoiceConfirmStatusMapper extends BaseMapper<InvoiceConfirmStatus> {
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -104,7 +104,8 @@
 			attachment_name AS `name`,
 			create_by_id AS `by`,
 			attachment_flag AS `attachmentFlag`,
-			create_time
+			create_time,
+			remarks
 		FROM
 			work_attachment
 		WHERE
@@ -236,10 +237,9 @@
 		FROM
 		sys_user a
 		LEFT JOIN sys_office b ON a.office_id = b.id
-		left join sys_cert sc on a.id = sc.user_id and sc.del_flag = '0' and (sc.status = '5' or sc.status IS NULL)
+		left join sys_cert sc on a.id = sc.user_id and sc.del_flag = '0'
 		WHERE
-		a.del_flag = 0 and a.is_admin is null and a.login_flag = 1 and sc.type = '6'
-
+		a.del_flag = 0 and a.is_admin is null and a.login_flag = 1 and sc.type = '6' and a.tenant_id = '10003'
 		<if test="name != null and name != ''">
 			and a.`name` LIKE CONCAT ('%', #{name}, '%')
 		</if>
@@ -357,7 +357,11 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -386,9 +390,15 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
+		a.reimbursement_type,
+		a.unique_id,
 		su.name as user_name,
 		so.name as dept_name,
 		pg_type.name as type_name,
@@ -415,9 +425,15 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
+		a.reimbursement_type,
+		a.unique_id,
 		su.name as user_name,
 		so.name as dept_name,
 		pg_type.name as type_name,
@@ -444,7 +460,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -480,6 +480,7 @@ public class ReimbursementInfoService {
                 i.setAttachmentName(dto.getName());
                 i.setAttachmentFlag(attachmentFlag);
                 i.setFileSize(dto.getSize());
+                i.setRemarks(dto.getRemarks());
                 i.setSort(j);
 //            ossServiceMapper.insertWorkAttachment(i, userDTO);
                 Map<String,String> map = new HashMap<>();
@@ -539,8 +540,6 @@ public class ReimbursementInfoService {
         }
 
         infoMapper.updateById(info);
-
-        infoMapper.updateById(info);
         // 修改报销详情列表信息
         // 删除原有数据
         LambdaQueryWrapper<ReimbursementDetailInfo> detailWrapper = new LambdaQueryWrapper<>();
@@ -750,6 +749,7 @@ public class ReimbursementInfoService {
                     i.setAttachmentName(dto.getName());
                     i.setAttachmentFlag(attachmentFlag);
                     i.setFileSize(dto.getSize());
+                    i.setRemarks(dto.getRemarks());
                     i.setSort(j);
                     Map<String,String> map = new HashMap<>();
                     String workAttachment = JSON.toJSONString((i));

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfo.java

@@ -69,11 +69,31 @@ public class CcpmReimbursementDetailInfo extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfoContract.java

@@ -72,11 +72,31 @@ public class CcpmReimbursementDetailInfoContract extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfoOther.java

@@ -58,11 +58,31 @@ public class CcpmReimbursementDetailInfoOther extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -81,4 +101,13 @@ public class CcpmReimbursementDetailInfoOther extends BaseEntity {
      * 报销项目名称
      */
     private String projectName;
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
 }

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfoProcured.java

@@ -58,11 +58,31 @@ public class CcpmReimbursementDetailInfoProcured extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfoReport.java

@@ -72,11 +72,31 @@ public class CcpmReimbursementDetailInfoReport extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

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

@@ -1,10 +1,12 @@
 package com.jeeplus.ccpm.approvalInfo.mapper;
 
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.ccpm.approvalInfo.domain.InvoiceConfirmStatus;
 import org.apache.ibatis.annotations.Mapper;
 
+@InterceptorIgnore(tenantLine = "true")
 @Mapper
 public interface InvoiceConfirmStatusMapper extends BaseMapper<InvoiceConfirmStatus> {
 

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
@@ -181,7 +201,8 @@
 			attachment_name AS `name`,
 			create_by_id AS `by`,
 			attachment_flag AS `attachmentFlag`,
-			create_time
+			create_time,
+			remarks
 		FROM
 			work_attachment
 		WHERE
@@ -494,7 +515,11 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -521,7 +546,11 @@
 		a.report_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -549,7 +578,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -576,8 +609,14 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -604,7 +643,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,

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

@@ -445,6 +445,7 @@ public class CcpmReimbursementInfoService {
                 i.setAttachmentName(dto.getName());
                 i.setAttachmentFlag(attachmentFlag);
                 i.setFileSize(dto.getSize());
+                i.setRemarks(dto.getRemarks());
                 i.setSort(j);
 //            ossServiceMapper.insertWorkAttachment(i, userDTO);
                 Map<String,String> map = new HashMap<>();

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-ccpm/src/main/java/com/jeeplus/ccpm/approvalType/service/CcpmReimbursementTypeService.java

@@ -297,6 +297,7 @@ public class CcpmReimbursementTypeService {
                 i.setAttachmentName(dto.getName());
                 i.setAttachmentFlag(attachmentFlag);
                 i.setFileSize(dto.getSize());
+                i.setRemarks(dto.getRemarks());
                 i.setSort(j);
                 Map<String,String> map = new HashMap<>();
                 String workAttachment = JSON.toJSONString((i));
@@ -344,6 +345,7 @@ public class CcpmReimbursementTypeService {
             i.setAttachmentName(dto.getName());
             i.setAttachmentFlag("cwWorkContract");
             i.setFileSize(dto.getSize());
+            i.setRemarks(dto.getRemarks());
             i.setSort(j);
 //            ossServiceMapper.insertWorkAttachment(i, userDTO);
             Map<String,String> map = new HashMap<>();

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

@@ -65,16 +65,35 @@ public class ZsReimbursementDetailInfo extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+    /**
      * 出差天数
      */
     private Integer days;
@@ -83,4 +102,19 @@ public class ZsReimbursementDetailInfo extends BaseEntity {
      * 内容
      */
     private String content;
+
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
+
+    /**
+     * 排序
+     */
+    private String sort;
 }

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

@@ -65,18 +65,38 @@ public class ZsReimbursementDetailInfoContract extends BaseEntity {
      * 报告号
      */
     private String reportNumber;
-
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -85,4 +105,13 @@ public class ZsReimbursementDetailInfoContract extends BaseEntity {
      * 内容
      */
     private String content;
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
 }

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

@@ -53,16 +53,37 @@ public class ZsReimbursementDetailInfoOther extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -91,4 +112,13 @@ public class ZsReimbursementDetailInfoOther extends BaseEntity {
      * 立项号
      */
     private String projectApprovalNumber;
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
 }

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

@@ -53,16 +53,37 @@ public class ZsReimbursementDetailInfoProcured extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

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

@@ -50,16 +50,36 @@ public class ZsReimbursementDetailInfoProject extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -88,4 +108,13 @@ public class ZsReimbursementDetailInfoProject extends BaseEntity {
      * 立项号
      */
     private String projectApprovalNumber;
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
 }

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

@@ -64,16 +64,36 @@ public class ZsReimbursementDetailInfoReport extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -94,4 +114,15 @@ public class ZsReimbursementDetailInfoReport extends BaseEntity {
     private String projectName;
 
 
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
+
+
 }

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

@@ -1,10 +1,12 @@
 package com.jeeplus.centrecareful.approvalInfo.mapper;
 
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.centrecareful.approvalInfo.domain.InvoiceConfirmStatus;
 import org.apache.ibatis.annotations.Mapper;
 
+@InterceptorIgnore(tenantLine = "true")
 @Mapper
 public interface InvoiceConfirmStatusMapper extends BaseMapper<InvoiceConfirmStatus> {
 

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,
@@ -261,12 +274,14 @@
 			attachment_name AS `name`,
 			create_by_id AS `by`,
 			attachment_flag AS `attachmentFlag`,
-			create_time
+			create_time,
+			remarks
 		FROM
 			work_attachment
 		WHERE
 			del_flag = 0
 			AND attachment_id = #{id}
+		ORDER BY create_time DESC
 	</select>
 	<select id="findOfficeList"
 			resultType="com.jeeplus.centrecareful.approvalInfo.service.dto.ZsTreeUserDto">
@@ -556,8 +571,14 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -583,7 +604,11 @@
 		a.report_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -611,9 +636,15 @@
 			a.project_id,
 			a.report_number,
 			a.number,
+			a.ordinary_number,
 			a.receipt_number,
+			a.ordinary_receipt_number,
+			a.receipt_number_count,
+			a.number_count,
 			a.days,
 			a.content,
+			a.reimbursement_type,
+			a.unique_id,
 			su.name as user_name,
 			so.name as dept_name,
 			zs_type.name as type_name,
@@ -639,9 +670,15 @@
 			a.project_id,
 			a.report_number,
 			a.number,
+			a.ordinary_number,
 			a.receipt_number,
+			a.ordinary_receipt_number,
+			a.receipt_number_count,
+			a.number_count,
 			a.days,
 			a.content,
+			a.reimbursement_type,
+			a.unique_id,
 			su.name as user_name,
 			so.name as dept_name,
 			zs_type.name as type_name,
@@ -651,7 +688,7 @@
 				 left join sys_office so on a.dept_id = so.id and so.del_flag = '0'
 				 left join cw_reimbursement_type_info zs_type on zs_type.id = a.type_id and zs_type.del_flag = '0'
 		where a.del_flag = '0' and a.info_id = #{id}
-		order by a.number asc
+		order by a.create_time asc
 	</select>
 
 	<select id="getOtherDetailList" resultType="com.jeeplus.centrecareful.approvalInfo.domain.ZsReimbursementDetailInfoOther">
@@ -667,8 +704,14 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -696,9 +739,15 @@
 			a.project_id,
 			a.report_number,
 			a.number,
+			a.ordinary_number,
 			a.receipt_number,
+			a.ordinary_receipt_number,
+			a.receipt_number_count,
+			a.number_count,
 			a.days,
 			a.content,
+			a.reimbursement_type,
+			a.unique_id,
 			su.name as user_name,
 			so.name as dept_name,
 			zs_type.name as type_name,
@@ -727,7 +776,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,

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

@@ -1,6 +1,7 @@
 package com.jeeplus.centrecareful.approvalInfo.service;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jeeplus.centrecareful.approvalInfo.domain.InvoiceConfirmStatus;
 import com.jeeplus.centrecareful.approvalInfo.mapper.InvoiceConfirmStatusMapper;

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

@@ -322,10 +322,13 @@ public class ZsReimbursementInfoService {
         infoMapper.insert(info);
         // 保存项目详情列表信息
         if (CollectionUtils.isNotEmpty(dto.getDetailInfos())) {
+            int i = 0;
             for (ZsReimbursementDetailInfo detailInfo : dto.getDetailInfos()) {
                 // 保存基础表信息主键值
                 detailInfo.setInfoId(id);
+                detailInfo.setSort(String.valueOf(i));
                 detailInfoMapper.insert(detailInfo);
+                i++;
             }
         }
         // 保存合同详情列表信息
@@ -477,6 +480,8 @@ public class ZsReimbursementInfoService {
                 i.setAttachmentFlag(attachmentFlag);
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
+                i.setRemarks(dto.getRemarks());
+
 //            ossServiceMapper.insertWorkAttachment(i, userDTO);
                 Map<String,String> map = new HashMap<>();
                 String workAttachment = JSON.toJSONString((i));
@@ -752,6 +757,7 @@ public class ZsReimbursementInfoService {
                     i.setAttachmentName(dto.getName());
                     i.setAttachmentFlag(attachmentFlag);
                     i.setFileSize(dto.getSize());
+                    i.setRemarks(dto.getRemarks());
                     i.setSort(j);
                     Map<String,String> map = new HashMap<>();
                     String workAttachment = JSON.toJSONString((i));

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-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalType/service/ZsReimbursementTypeService.java

@@ -296,6 +296,7 @@ public class ZsReimbursementTypeService {
                 i.setAttachmentName(dto.getName());
                 i.setAttachmentFlag(attachmentFlag);
                 i.setFileSize(dto.getSize());
+                i.setRemarks(dto.getRemarks());
                 i.setSort(j);
                 Map<String,String> map = new HashMap<>();
                 String workAttachment = JSON.toJSONString((i));
@@ -344,6 +345,7 @@ public class ZsReimbursementTypeService {
             i.setAttachmentFlag("cwWorkContract");
             i.setFileSize(dto.getSize());
             i.setSort(j);
+            i.setRemarks(dto.getRemarks());
 //            ossServiceMapper.insertWorkAttachment(i, userDTO);
             Map<String,String> map = new HashMap<>();
             String workAttachment = JSON.toJSONString((i));

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfo.java

@@ -67,13 +67,34 @@ public class ConsultancyReimbursementDetailInfo extends BaseEntity {
      * 费用(元)
      */
     private String number;
+    /**
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
 
     /**
-     * 收据张数
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfoContract.java

@@ -72,11 +72,33 @@ public class ConsultancyReimbursementDetailInfoContract extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfoOther.java

@@ -56,13 +56,34 @@ public class ConsultancyReimbursementDetailInfoOther extends BaseEntity {
      * 费用(元)
      */
     private String number;
+    /**
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
 
     /**
-     * 收据张数
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -81,4 +102,13 @@ public class ConsultancyReimbursementDetailInfoOther extends BaseEntity {
      * 报销项目名称
      */
     private String projectName;
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
 }

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfoProcured.java

@@ -58,11 +58,33 @@ public class ConsultancyReimbursementDetailInfoProcured extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfoReport.java

@@ -72,11 +72,33 @@ public class ConsultancyReimbursementDetailInfoReport extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;

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

@@ -1,10 +1,12 @@
 package com.jeeplus.consultancy.approvalInfo.mapper;
 
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.consultancy.approvalInfo.domain.InvoiceConfirmStatus;
 import org.apache.ibatis.annotations.Mapper;
 
+@InterceptorIgnore(tenantLine = "true")
 @Mapper
 public interface InvoiceConfirmStatusMapper extends BaseMapper<InvoiceConfirmStatus> {
 

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,
@@ -181,7 +194,8 @@
 			attachment_name AS `name`,
 			create_by_id AS `by`,
 			attachment_flag AS `attachmentFlag`,
-			create_time
+			create_time,
+			remarks
 		FROM
 			work_attachment
 		WHERE
@@ -476,7 +490,11 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -503,7 +521,11 @@
 		a.report_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -531,7 +553,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -558,8 +584,14 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -586,7 +618,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,

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

@@ -445,6 +445,7 @@ public class ConsultancyReimbursementInfoService {
                 i.setAttachmentName(dto.getName());
                 i.setAttachmentFlag(attachmentFlag);
                 i.setFileSize(dto.getSize());
+                i.setRemarks(dto.getRemarks());
                 i.setSort(j);
 //            ossServiceMapper.insertWorkAttachment(i, userDTO);
                 Map<String,String> map = new HashMap<>();
@@ -708,6 +709,7 @@ public class ConsultancyReimbursementInfoService {
                     i.setAttachmentName(dto.getName());
                     i.setAttachmentFlag(attachmentFlag);
                     i.setFileSize(dto.getSize());
+                    i.setRemarks(dto.getRemarks());
                     i.setSort(j);
                     Map<String,String> map = new HashMap<>();
                     String workAttachment = JSON.toJSONString((i));

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-consult/src/main/java/com/jeeplus/consultancy/approvalType/service/ConsultancyReimbursementTypeService.java

@@ -297,6 +297,7 @@ public class ConsultancyReimbursementTypeService {
                 i.setAttachmentName(dto.getName());
                 i.setAttachmentFlag(attachmentFlag);
                 i.setFileSize(dto.getSize());
+                i.setRemarks(dto.getRemarks());
                 i.setSort(j);
                 Map<String,String> map = new HashMap<>();
                 String workAttachment = JSON.toJSONString((i));
@@ -344,6 +345,7 @@ public class ConsultancyReimbursementTypeService {
             i.setAttachmentName(dto.getName());
             i.setAttachmentFlag("cwWorkContract");
             i.setFileSize(dto.getSize());
+            i.setRemarks(dto.getRemarks());
             i.setSort(j);
 //            ossServiceMapper.insertWorkAttachment(i, userDTO);
             Map<String,String> map = new HashMap<>();

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfo.java

@@ -68,13 +68,33 @@ public class CwReimbursementDetailInfo extends BaseEntity {
      * 费用(元)
      */
     private String number;
+    /**
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
 
     /**
-     * 收据张数
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -83,4 +103,15 @@ public class CwReimbursementDetailInfo extends BaseEntity {
      * 内容
      */
     private String content;
+
+
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfoContract.java

@@ -72,11 +72,32 @@ public class CwReimbursementDetailInfoContract extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfoOther.java

@@ -58,11 +58,32 @@ public class CwReimbursementDetailInfoOther extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -82,4 +103,14 @@ public class CwReimbursementDetailInfoOther extends BaseEntity {
      */
     private String projectName;
 
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfoProcured.java

@@ -58,11 +58,32 @@ public class CwReimbursementDetailInfoProcured extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfoReport.java

@@ -72,11 +72,32 @@ public class CwReimbursementDetailInfoReport extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;
@@ -97,4 +118,13 @@ public class CwReimbursementDetailInfoReport extends BaseEntity {
     @TableField(exist = false)
     private String projectName;
 
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
 }

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"
@@ -229,7 +234,8 @@
 			attachment_name AS `name`,
 			create_by_id AS `by`,
 			attachment_flag AS `attachmentFlag`,
-			create_time
+			create_time,
+			remarks
 		FROM
 			work_attachment
 		WHERE
@@ -558,7 +564,11 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -587,9 +597,17 @@
 		a.report_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
+		a.unique_id,
+		a.reimbursement_type,
+		a.unique_id,
+		a.reimbursement_type,
 		su.name as user_name,
 		so.name as dept_name,
 		cw_type.name as type_name,
@@ -619,8 +637,14 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
+		a.unique_id,
+		a.reimbursement_type,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -648,9 +672,15 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
+		a.unique_id,
+		a.reimbursement_type,
 		su.name as user_name,
 		so.name as dept_name,
 		cw_type.name as type_name,
@@ -677,7 +707,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,

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

@@ -687,6 +687,7 @@ public class CwReimbursementInfoService {
                 i.setAttachmentFlag(attachmentFlag);
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
+                i.setRemarks(dto.getRemarks());
 //            ossServiceMapper.insertWorkAttachment(i, userDTO);
                 Map<String,String> map = new HashMap<>();
                 String workAttachment = JSON.toJSONString((i));
@@ -957,6 +958,7 @@ public class CwReimbursementInfoService {
                     i.setAttachmentName(dto.getName());
                     i.setAttachmentFlag(attachmentFlag);
                     i.setFileSize(dto.getSize());
+                    i.setRemarks(dto.getRemarks());
                     i.setSort(j);
                     Map<String,String> map = new HashMap<>();
                     String workAttachment = JSON.toJSONString((i));

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

@@ -1192,4 +1192,26 @@ public class FlowableTaskController {
         return JSON.toJSONString(noticeList);
     }
 
+    /**
+     * 根据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,13 @@ public interface FlowMapper extends BaseMapper <Flow> {
     @InterceptorIgnore(tenantLine = "true")
     int updateProcInsIdByBusinessId(Flow act);
 
+    @InterceptorIgnore(tenantLine = "true")
+    String getApprovalTimeByProcInsId(Flow act);
+
+    @InterceptorIgnore(tenantLine = "true")
+    String getCreateTimeByProcInsId(Flow act);
+
+
     /**
      * 根据流程id查询流程信息
      * @param taskId

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

@@ -69,4 +69,19 @@
 		limit 1
 	</select>
 
+	<select id="getApprovalTimeByProcInsId"  resultType="java.lang.String">
+		select
+			approval_time
+		FROM  ${businessTable}
+		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>
+
 </mapper>

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

@@ -1397,4 +1397,19 @@ public class FlowTaskService {
     public String getActNameByDefId(String procDefId) {
         return flowMapper.getActNameByDefId(procDefId);
     }
+
+    /**
+     * 根据procInsId获取当前流程的表单的提交审核日期
+     * @param act
+     * @return
+     */
+    public String getApprovalTimeByProcInsId(Flow act){
+        return flowMapper.getApprovalTimeByProcInsId(act);
+    }
+
+    public String getCreateTimeByProcInsId(Flow act){
+        return flowMapper.getCreateTimeByProcInsId(act);
+    }
+
+
 }