报销导出

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/controller/ReimbursementInfoController.java

@@ -1,5 +1,8 @@
 package com.jeeplus.assess.reimbursement.reimbursementInfo.controller;
 
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
@@ -13,6 +16,7 @@ import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjec
 import com.jeeplus.assess.reimbursement.reimbursementInfo.domain.ReimbursementInfo;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.service.ReimbursementInfoService;
 import com.jeeplus.logging.annotation.ApiLog;
+import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -140,6 +144,51 @@ public class ReimbursementInfoController {
             page.setCurrent (0);
             result = service.list (page,cwDTO).getRecords();
         }
+
+        if(result.size()>0){
+            //获取字典数据
+            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 ("pg_reimbursement_source_type");
+            Map<String,Object> cwReimbursementSourceTypeValueDTOs = JSON.parseObject(cwReimbursementSourceTypeDatas, new TypeReference<Map<String,Object>>() {});
+
+            String paymentStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("payment_status");
+            Map<String,Object> paymentStatusValueDTOs = JSON.parseObject(paymentStatusDatas, new TypeReference<Map<String,Object>>() {});
+
+            for (RetureListDto info : result) {
+
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(info.getType())){
+                    for (String key : statusValueDTOs.keySet()) {
+                        if(info.getType().equals(key)){
+                            info.setType(String.valueOf(statusValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(info.getSourceType())){
+                    for (String key : cwReimbursementSourceTypeValueDTOs.keySet()) {
+                        if(info.getSourceType().equals(key)){
+                            info.setSourceType(String.valueOf(cwReimbursementSourceTypeValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(info.getPaymentStatus())){
+                    for (String key : paymentStatusValueDTOs.keySet()) {
+                        if(info.getPaymentStatus().equals(key)){
+                            info.setPaymentStatus(String.valueOf(paymentStatusValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }else {
+                    info.setPaymentStatus("未付款");
+                }
+            }
+        }
+
+
+
         EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, RetureListDto.class, fileName, response );
 
     }

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

@@ -91,7 +91,7 @@ public class RetureListDto {
     /**
      * 报销状态
      */
-    @Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
+    @Excel(name = "报销状态", width = 30, orderNum = "12")
     private String type;
 
     /**
@@ -104,7 +104,7 @@ public class RetureListDto {
      */
     private String processDefinitionId;
 
-    @Excel(name = "报销类型", width = 30, orderNum = "2",dict = "pg_reimbursement_source_type")
+    @Excel(name = "报销类型", width = 30, orderNum = "2")
     private String sourceType;
 
     private String taskId;
@@ -134,11 +134,13 @@ public class RetureListDto {
     /**
      * 付款时间
      */
+    @Excel(name = "付款时间",exportFormat="yyyy-MM-dd", width = 30, orderNum = "14")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date paymentTime;
     /**
      * 付款状态  0:未付款  1:已付款
      */
+    @Excel(name = "付款状态", width = 30, orderNum = "13")
     private String paymentStatus;
 }

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/controller/CcpmReimbursementInfoController.java

@@ -1,5 +1,8 @@
 package com.jeeplus.ccpm.approvalInfo.controller;
 
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
@@ -15,6 +18,7 @@ import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
+import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -169,6 +173,49 @@ public class CcpmReimbursementInfoController {
             page.setCurrent (0);
             result = service.list (page,cwFinanceInvoiceDTO).getRecords();
         }
+
+        if(result.size()>0){
+            //获取字典数据
+            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");
+            Map<String,Object> cwReimbursementSourceTypeValueDTOs = JSON.parseObject(cwReimbursementSourceTypeDatas, new TypeReference<Map<String,Object>>() {});
+
+            String paymentStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("payment_status");
+            Map<String,Object> paymentStatusValueDTOs = JSON.parseObject(paymentStatusDatas, new TypeReference<Map<String,Object>>() {});
+
+            for (CcpmRetureListDto info : result) {
+
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(info.getType())){
+                    for (String key : statusValueDTOs.keySet()) {
+                        if(info.getType().equals(key)){
+                            info.setType(String.valueOf(statusValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(info.getSourceType())){
+                    for (String key : cwReimbursementSourceTypeValueDTOs.keySet()) {
+                        if(info.getSourceType().equals(key)){
+                            info.setSourceType(String.valueOf(cwReimbursementSourceTypeValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(info.getPaymentStatus())){
+                    for (String key : paymentStatusValueDTOs.keySet()) {
+                        if(info.getPaymentStatus().equals(key)){
+                            info.setPaymentStatus(String.valueOf(paymentStatusValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }else {
+                    info.setPaymentStatus("未付款");
+                }
+            }
+        }
+
         CcpmEasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CcpmRetureListDto.class, fileName, response );
 
     }

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

@@ -91,7 +91,7 @@ public class CcpmRetureListDto {
     /**
      * 报销状态
      */
-    @Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
+    @Excel(name = "报销状态", width = 30, orderNum = "12")
     private String type;
 
     /**
@@ -111,7 +111,7 @@ public class CcpmRetureListDto {
      */
     private String createId;
 
-    @Excel(name = "报销类型", width = 30, orderNum = "2",dict = "cw_reimbursement_source_type")
+    @Excel(name = "报销类型", width = 30, orderNum = "2")
     private String sourceType;
 
     private String purchaseNo;
@@ -134,11 +134,13 @@ public class CcpmRetureListDto {
     /**
      * 付款时间
      */
+    @Excel(name = "付款时间",exportFormat="yyyy-MM-dd", width = 30, orderNum = "14")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date paymentTime;
     /**
      * 付款状态  0:未付款  1:已付款
      */
+    @Excel(name = "付款状态", width = 30, orderNum = "13")
     private String paymentStatus;
 }

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

@@ -1,4 +1,7 @@
 package com.jeeplus.centrecareful.approvalInfo.controller;
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
@@ -14,6 +17,7 @@ import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
+import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -167,6 +171,48 @@ public class ZsReimbursementInfoController {
             page.setCurrent (0);
             result = service.list (page,cwFinanceInvoiceDTO).getRecords();
         }
+
+        if(result.size()>0){
+            //获取字典数据
+            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");
+            Map<String,Object> cwReimbursementSourceTypeValueDTOs = JSON.parseObject(cwReimbursementSourceTypeDatas, new TypeReference<Map<String,Object>>() {});
+
+            String paymentStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("payment_status");
+            Map<String,Object> paymentStatusValueDTOs = JSON.parseObject(paymentStatusDatas, new TypeReference<Map<String,Object>>() {});
+
+            for (ZsRetureListDto info : result) {
+
+                if(StringUtils.isNotBlank(info.getType())){
+                    for (String key : statusValueDTOs.keySet()) {
+                        if(info.getType().equals(key)){
+                            info.setType(String.valueOf(statusValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+                if(StringUtils.isNotBlank(info.getSourceType())){
+                    for (String key : cwReimbursementSourceTypeValueDTOs.keySet()) {
+                        if(info.getSourceType().equals(key)){
+                            info.setSourceType(String.valueOf(cwReimbursementSourceTypeValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+                if(StringUtils.isNotBlank(info.getPaymentStatus())){
+                    for (String key : paymentStatusValueDTOs.keySet()) {
+                        if(info.getPaymentStatus().equals(key)){
+                            info.setPaymentStatus(String.valueOf(paymentStatusValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }else {
+                    info.setPaymentStatus("未付款");
+                }
+            }
+        }
         ZSEasyPoiUtil.exportExcel ( result, sheetName,  sheetName, ZsRetureListDto.class, fileName, response );
 
     }

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

@@ -92,7 +92,7 @@ public class ZsRetureListDto {
     /**
      * 报销状态
      */
-    @Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
+    @Excel(name = "报销状态", width = 30, orderNum = "12")
     private String type;
 
     /**
@@ -112,7 +112,7 @@ public class ZsRetureListDto {
      */
     private String createId;
 
-    @Excel(name = "报销类型", width = 30, orderNum = "2",dict = "cw_reimbursement_source_type")
+    @Excel(name = "报销类型", width = 30, orderNum = "2")
     private String sourceType;
 
     private String purchaseNo;
@@ -136,11 +136,13 @@ public class ZsRetureListDto {
     /**
      * 付款时间
      */
+    @Excel(name = "付款时间",exportFormat="yyyy-MM-dd", width = 30, orderNum = "14")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date paymentTime;
     /**
      * 付款状态  0:未付款  1:已付款
      */
+    @Excel(name = "付款状态", width = 30, orderNum = "13")
     private String paymentStatus;
 }

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/controller/ConsultancyReimbursementInfoController.java

@@ -1,5 +1,8 @@
 package com.jeeplus.consultancy.approvalInfo.controller;
 
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
@@ -15,6 +18,7 @@ import com.jeeplus.consultancy.util.ConsultancyEasyPoiUtil;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
+import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -169,6 +173,48 @@ public class ConsultancyReimbursementInfoController {
             page.setCurrent (0);
             result = service.list (page,cwFinanceInvoiceDTO).getRecords();
         }
+        if(result.size()>0){
+            //获取字典数据
+            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");
+            Map<String,Object> cwReimbursementSourceTypeValueDTOs = JSON.parseObject(cwReimbursementSourceTypeDatas, new TypeReference<Map<String,Object>>() {});
+
+            String paymentStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("payment_status");
+            Map<String,Object> paymentStatusValueDTOs = JSON.parseObject(paymentStatusDatas, new TypeReference<Map<String,Object>>() {});
+
+            for (ConsultancyRetureListDto info : result) {
+
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(info.getType())){
+                    for (String key : statusValueDTOs.keySet()) {
+                        if(info.getType().equals(key)){
+                            info.setType(String.valueOf(statusValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(info.getSourceType())){
+                    for (String key : cwReimbursementSourceTypeValueDTOs.keySet()) {
+                        if(info.getSourceType().equals(key)){
+                            info.setSourceType(String.valueOf(cwReimbursementSourceTypeValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(info.getPaymentStatus())){
+                    for (String key : paymentStatusValueDTOs.keySet()) {
+                        if(info.getPaymentStatus().equals(key)){
+                            info.setPaymentStatus(String.valueOf(paymentStatusValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }else {
+                    info.setPaymentStatus("未付款");
+                }
+            }
+        }
+
         ConsultancyEasyPoiUtil.exportExcel ( result, sheetName,  sheetName, ConsultancyRetureListDto.class, fileName, response );
 
     }

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

@@ -91,7 +91,7 @@ public class ConsultancyRetureListDto {
     /**
      * 报销状态
      */
-    @Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
+    @Excel(name = "报销状态", width = 30, orderNum = "12")
     private String type;
 
     /**
@@ -111,7 +111,7 @@ public class ConsultancyRetureListDto {
      */
     private String createId;
 
-    @Excel(name = "报销类型", width = 30, orderNum = "2",dict = "cw_reimbursement_source_type")
+    @Excel(name = "报销类型", width = 30, orderNum = "2")
     private String sourceType;
 
     private String purchaseNo;
@@ -135,11 +135,13 @@ public class ConsultancyRetureListDto {
     /**
      * 付款时间
      */
+    @Excel(name = "付款时间",exportFormat="yyyy-MM-dd", width = 30, orderNum = "14")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date paymentTime;
     /**
      * 付款状态  0:未付款  1:已付款
      */
+    @Excel(name = "付款状态", width = 30, orderNum = "13")
     private String paymentStatus;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/controller/CwReimbursementInfoController.java

@@ -206,6 +206,9 @@ public class CwReimbursementInfoController {
             String cwReimbursementSourceTypeDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("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");
+            Map<String,Object> paymentStatusValueDTOs = JSON.parseObject(paymentStatusDatas, new TypeReference<Map<String,Object>>() {});
+
             for (RetureListDto info : result) {
 
                 if(StringUtils.isNotBlank(info.getType())){
@@ -224,6 +227,16 @@ public class CwReimbursementInfoController {
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(info.getPaymentStatus())){
+                    for (String key : paymentStatusValueDTOs.keySet()) {
+                        if(info.getPaymentStatus().equals(key)){
+                            info.setPaymentStatus(String.valueOf(paymentStatusValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }else {
+                    info.setPaymentStatus("未付款");
+                }
             }
         }
 

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

@@ -145,12 +145,14 @@ public class RetureListDto {
     /**
      * 付款时间
      */
+    @Excel(name = "付款时间",exportFormat="yyyy-MM-dd", width = 30, orderNum = "14")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date paymentTime;
     /**
      * 付款状态  0:未付款  1:已付款
      */
+    @Excel(name = "付款状态", width = 30, orderNum = "13")
     private String paymentStatus;
 
 }