报销导出添加 付款时间

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

@@ -626,6 +626,7 @@
 		a.remarks,
 		ri.type as "status",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
+		date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
 		su.name as "reimbursementApplicantName",
 		so.name as "officeName",
 		sdv.label as "invoiceTypeStr"

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

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -118,4 +119,8 @@ public class ReimbursementAmountInfoDTO extends BaseEntity {
      */
     //@Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
     private String status;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    private Date paymentTime;
 }

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

@@ -818,7 +818,8 @@
 		a.remarks,
 		ri.type as "status",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
-		su.name as "reimbursementApplicantName",
+        date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
+        su.name as "reimbursementApplicantName",
 		so.name as "officeName",
 		sdv.label as "invoiceTypeStr"
 		from

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

@@ -118,4 +118,8 @@ public class CcpmReimbursementAmountInfoDTO extends BaseEntity {
      */
     //@Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
     private String status;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    private Date paymentTime;
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/controller/ZsReimbursementInfoController.java

@@ -187,7 +187,7 @@ public class ZsReimbursementInfoController {
             String statusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("status");
             Map<String,Object> statusValueDTOs = JSON.parseObject(statusDatas, new TypeReference<Map<String,Object>>() {});
 
-            String cwReimbursementSourceTypeDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_reimbursement_source_type");
+            String cwReimbursementSourceTypeDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("zs_cw_reimbursement_source_type");
             Map<String,Object> cwReimbursementSourceTypeValueDTOs = JSON.parseObject(cwReimbursementSourceTypeDatas, new TypeReference<Map<String,Object>>() {});
 
             String paymentStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("payment_status");

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

@@ -17,16 +17,12 @@
 
 					WHEN a.source_type = 1 THEN
 						b.type_id
-					WHEN a.source_type = 2 THEN
-						b4.type_id
 					WHEN a.source_type = 3 THEN
 						r4.type_id
 					WHEN a.source_type = 4 THEN
 						b4.type_id
 					WHEN a.source_type = 8 THEN
 						zs1.type_id
-					WHEN a.source_type = 6 THEN
-						b6.type_id ELSE b5.type_id
 					END
 				) AS type_id,
 			(
@@ -34,16 +30,12 @@
 
 					WHEN a.source_type = 1 THEN
 						t44.NAME
-					WHEN a.source_type = 2 THEN
-						t4.NAME
 					WHEN a.source_type = 3 THEN
 						r44.NAME
 					WHEN a.source_type = 4 THEN
 						t4.NAME
 					WHEN a.source_type = 8 THEN
 						zs11.NAME
-					WHEN a.source_type = 6 THEN
-						t6.NAME ELSE t5.NAME
 					END
 				) AS type_name,
 			(
@@ -51,14 +43,12 @@
 
 					WHEN a.source_type = 1 THEN
 						b4.project_id
-					WHEN a.source_type = 2 THEN
-						b4.project_id
 					WHEN a.source_type = 3 THEN
 						r4.project_id
 					WHEN a.source_type = 4 THEN
 						b4.project_id
 					WHEN a.source_type = 8 THEN
-						b4.project_id ELSE b5.project_id
+						b4.project_id
 					END
 				) AS project_id,
 			(
@@ -66,16 +56,12 @@
 
 					WHEN a.source_type = 1 THEN
 						b.project_name
-					WHEN a.source_type = 2 THEN
-						b4.project_name
 					WHEN a.source_type = 3 THEN
 						r4.project_name
 					WHEN a.source_type = 4 THEN
 						b4.project_name
 					WHEN a.source_type = 8 THEN
 						zs1.project_name
-					WHEN a.source_type = 6 THEN
-						b6.reimbuser_name ELSE b5.project_name
 					END
 				) AS project_name,
 			(
@@ -83,14 +69,12 @@
 
 					WHEN a.source_type = 1 THEN
 						b4.report_number
-					WHEN a.source_type = 2 THEN
-						b4.report_number
 					WHEN a.source_type = 3 THEN
 						r4.report_number
 					WHEN a.source_type = 4 THEN
 						b4.report_number
 					WHEN a.source_type = 8 THEN
-						b4.report_number ELSE b5.report_number
+						b4.report_number
 					END
 				) AS report_number,
 			(
@@ -98,16 +82,12 @@
 
 					WHEN a.source_type = 1 THEN
 						so44.NAME
-					WHEN a.source_type = 2 THEN
-						so4.NAME
 					WHEN a.source_type = 3 THEN
 						r444.NAME
 					WHEN a.source_type = 4 THEN
 						so4.NAME
 					WHEN a.source_type = 8 THEN
 						zs111.NAME
-					WHEN a.source_type = 6 THEN
-						so6.NAME ELSE so5.NAME
 					END
 				) AS dept_name,
 			(
@@ -115,16 +95,12 @@
 
 					WHEN a.source_type = 1 THEN
 						usxg.NAME
-					WHEN a.source_type = 2 THEN
-						us4.NAME
 					WHEN a.source_type = 3 THEN
 						us44.NAME
 					WHEN a.source_type = 4 THEN
 						us4.NAME
 					WHEN a.source_type = 8 THEN
 						uszs.NAME
-					WHEN a.source_type = 6 THEN
-						us6.NAME ELSE us5.NAME
 					END
 				) AS NAME,
 			(
@@ -132,16 +108,12 @@
 
 					WHEN a.source_type = 1 THEN
 						b.`number`
-					WHEN a.source_type = 2 THEN
-						b4.`number`
 					WHEN a.source_type = 3 THEN
 						r4.`number`
 					WHEN a.source_type = 4 THEN
 						b4.`number`
 					WHEN a.source_type = 8 THEN
 						zs1.`number`
-					WHEN a.source_type = 6 THEN
-						b6.`number` ELSE b5.`number`
 					END
 				) AS `number`,
 			(
@@ -204,40 +176,22 @@
 			a.approval_time
 		FROM
 			zs_reimbursement_info a
+				--兴光项目报销
 				LEFT JOIN zs_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 t ON b.type_id = t.id
+				AND t.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 zs_reimbursement_detail_info_other b4 ON a.id = b4.info_id
 				AND b4.del_flag = 0
+				--中审项目报销
 				LEFT JOIN zs_reimbursement_detail_info_zs_project zs1 ON a.id = zs1.info_id
 				AND zs1.del_flag = 0
+				--兴光报告报销
 				LEFT JOIN zs_reimbursement_detail_info_report r4 ON a.id = r4.info_id
 				AND r4.del_flag = 0
 				LEFT JOIN cw_reimbursement_type_info t4 ON b4.type_id = t4.id
@@ -248,8 +202,6 @@
 				AND zs11.del_flag = 0
 				LEFT JOIN cw_reimbursement_type_info t44 ON b.type_id = t44.id
 				AND t44.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_office r444 ON r444.id = r4.dept_id
@@ -267,27 +219,16 @@
 				AND usxg.del_flag = 0
 				LEFT JOIN sys_user uszs ON uszs.id = zs1.user_id
 				AND uszs.del_flag = 0
-
-				LEFT JOIN zs_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_office so3 ON so3.id = b3.dept_id
+				AND so3.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 sys_user us3 ON us3.id = b3.user_id
+				AND us3.del_flag = 0
 				LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
+				LEFT JOIN sys_user c ON a.create_by_id = c.id
 				LEFT JOIN material_management_pruchase_request_basics pru ON pru.id = a.purchase_id
 				AND pru.del_flag = '0'
 			${ew.customSqlSegment}
@@ -950,6 +891,7 @@
 		a.remarks,
 		ri.type as "status",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
+		date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
 		su.name as "reimbursementApplicantName",
 		so.name as "officeName",
 		sdv.label as "invoiceTypeStr"

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

@@ -127,8 +127,6 @@ public class ZsReimbursementInfoService {
             queryWrapper.apply("(b.project_id = {0} OR p.project_name LIKE {1})", dto.getProject(), "%" + dto.getProject() + "%");
             queryWrapper.or().apply("(b3.project_id = {0} OR p3.project_name LIKE {1})", dto.getProject(), "%" + dto.getProject() + "%");
             queryWrapper.or().apply("(b4.project_id = {0} OR b4.project_name LIKE {1})", dto.getProject(), "%" + dto.getProject() + "%");
-            queryWrapper.or().apply("(b5.project_id = {0} OR b5.project_name LIKE {1})", dto.getProject(), "%" + dto.getProject() + "%");
-
         }
         // 报销时间
         if (dto.getDates() != null) {
@@ -158,13 +156,14 @@ public class ZsReimbursementInfoService {
                         if (i > 0) {
                             wrapper.or();
                         }
-                        wrapper.apply("(b.user_id LIKE {0} OR us.name LIKE {1} " +
-                                        "OR b2.user_id LIKE {0} OR us2.name LIKE {1} " +
+                        wrapper.apply(
+                                "(b.user_id LIKE {0} OR us.name LIKE {1} " +
                                         "OR zs1.user_id LIKE {0} OR us3.name LIKE {1} " +
                                         "OR b4.user_id LIKE {0} OR us4.name LIKE {1} " +
-                                        "OR r4.user_id LIKE {0}" +
-                                        "OR b5.user_id LIKE {0} OR us5.name LIKE {1})",
-                                "%" + userdto.getId() + "%", "%" + dto.getReimBy() + "%");
+                                        "OR r4.user_id LIKE {0})",
+                                "'%" + userdto.getId() + "%'",
+                                "'%" + dto.getReimBy() + "%'"
+                        );
                     }
                 });
             }else{
@@ -179,49 +178,39 @@ public class ZsReimbursementInfoService {
         if (StringUtils.isNotEmpty(dto.getDepartment())) {
             OfficeDTO officeDto = officeApi.getOfficeByName(dto.getDepartment());
             queryWrapper.apply("( b.dept_id like {0} OR so.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b2.dept_id like {0} OR so2.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
             queryWrapper.or().apply("( b3.dept_id like {0} OR so3.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
             queryWrapper.or().apply("( b4.dept_id like {0} OR so4.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
-            queryWrapper.or().apply("( b5.dept_id like {0} OR so5.name LIKE {1} )", "%" +officeDto.getId()+ "%", "%" + dto.getDepartment() + "%");
 
         }
         // 报销类别
         if (StringUtils.isNotEmpty(dto.getRemiType())) {
             queryWrapper.apply(" (b.type_id = {0} OR t.name LIKE {1}) ", dto.getRemiType(), "%" + dto.getRemiType() + "%");
-            queryWrapper.or().apply(" (b2.type_id = {0} OR t2.name LIKE {1}) ", dto.getRemiType(), "%" + dto.getRemiType() + "%");
             queryWrapper.or().apply(" (b3.type_id = {0} OR t3.name LIKE {1}) ", dto.getRemiType(), "%" + dto.getRemiType() + "%");
             queryWrapper.or().apply(" (b4.type_id = {0} OR t4.name LIKE {1}) ", dto.getRemiType(), "%" + dto.getRemiType() + "%");
-            queryWrapper.or().apply(" (b5.type_id = {0} OR t5.name LIKE {1}) ", dto.getRemiType(), "%" + dto.getRemiType() + "%");
 
         }
         // 报销金额
         if (dto.getAmounts() != null) {
             if (StringUtils.isNotEmpty(dto.getAmounts()[0])) {
                 queryWrapper.and(w ->
-                    w.ge("b.number", Double.parseDouble(dto.getAmounts()[0]))
-                        .or().ge("b2.number", Double.parseDouble(dto.getAmounts()[0]))
-                        .or().ge("b3.number", Double.parseDouble(dto.getAmounts()[0]))
-                        .or().ge("b4.number", Double.parseDouble(dto.getAmounts()[0]))
-                        .or().ge("b5.number", Double.parseDouble(dto.getAmounts()[0]))
+                        w.ge("b.number", Double.parseDouble(dto.getAmounts()[0]))
+                                .or().ge("b3.number", Double.parseDouble(dto.getAmounts()[0]))
+                                .or().ge("b4.number", Double.parseDouble(dto.getAmounts()[0]))
                 );
             }
             if (StringUtils.isNotEmpty(dto.getAmounts()[1])) {
                 queryWrapper.and(w ->
-                    w.le("b.number", Double.parseDouble(dto.getAmounts()[1]))
-                        .or().le("b2.number", Double.parseDouble(dto.getAmounts()[1]))
-                        .or().le("b3.number", Double.parseDouble(dto.getAmounts()[1]))
-                        .or().le("b4.number", Double.parseDouble(dto.getAmounts()[1]))
-                        .or().le("b5.number", Double.parseDouble(dto.getAmounts()[1]))
+                        w.le("b.number", Double.parseDouble(dto.getAmounts()[1]))
+                                .or().le("b3.number", Double.parseDouble(dto.getAmounts()[1]))
+                                .or().le("b4.number", Double.parseDouble(dto.getAmounts()[1]))
                 );
             }
         }
         // 报告号
         if (StringUtils.isNotEmpty(dto.getReportNumber())) {
             queryWrapper.like("b.report_number", dto.getReportNumber());
-            queryWrapper.or().like("b2.report_number", dto.getReportNumber());
             queryWrapper.or().like("b3.report_number", dto.getReportNumber());
             queryWrapper.or().like("b4.report_number", dto.getReportNumber());
-            queryWrapper.or().like("b5.report_number", dto.getReportNumber());
         }
         // 报销类型
         if (StringUtils.isNotBlank(dto.getSourceType())) {

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

@@ -117,4 +117,12 @@ public class ZsReimbursementAmountInfoDTO extends BaseEntity {
      */
     //@Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
     private String status;
+
+    /**
+     * 付款时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    private Date paymentTime;
+
 }

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

@@ -788,6 +788,7 @@
 		a.remarks,
 		ri.type as "status",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
+		date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
 		su.name as "reimbursementApplicantName",
 		so.name as "officeName",
 		sdv.label as "invoiceTypeStr"

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

@@ -118,4 +118,11 @@ public class ConsultancyReimbursementAmountInfoDTO extends BaseEntity {
      */
     //@Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
     private String status;
+
+    /**
+     * 报销日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    private Date paymentTime;
 }

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

@@ -861,6 +861,7 @@
 		a.remarks,
 		ri.type as "status",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
+		date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
 		su.name as "reimbursementApplicantName",
 		so.name as "officeName",
 		sdv.label as "invoiceTypeStr"

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

@@ -118,4 +118,11 @@ public class CwReimbursementAmountInfoDTO extends BaseEntity {
      */
     //@Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
     private String status;
+
+    /**
+     * 付款时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    private Date paymentTime;
 }