Merge remote-tracking branch 'origin/master'

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/DictApiFallbackFactory.java

@@ -35,6 +35,11 @@ public class DictApiFallbackFactory implements FallbackFactory <IDictApi> {
             public String getDictMap(String dict) {
                 return null;
             }
+
+            @Override
+            public String getDictListMapByDict(String dict) {
+                return null;
+            }
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IDictApi.java

@@ -37,4 +37,13 @@ public interface IDictApi {
      */
     @GetMapping(value = "/feign/sys/dict/getDictMap")
     String getDictMap(@RequestParam(value = "dict") String dict);
+
+    /**
+     * 获取字典标签
+     *
+     * @param dict
+     * @return
+     */
+    @GetMapping(value = "/feign/sys/dict/getDictListMapByDict")
+    String getDictListMapByDict(@RequestParam(value = "dict") String dict);
 }

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

@@ -709,7 +709,7 @@ public class ReimbursementInfoService {
         if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())){
             for (RoleDTO roleDTO : userDTO.getRoleDTOList()) {
                 RoleDTO roleDTOById = SpringUtil.getBean(IRoleApi.class).getRoleDTOById(roleDTO.getId());
-                if (roleDTOById.getEnName().equals("dgsbx")|| roleDTOById.getEnName().equals("zjbry")){
+                if (null != roleDTOById && (roleDTOById.getEnName().equals("dgsbx")|| roleDTOById.getEnName().equals("zjbry"))){
                     List<TreeUserDto> officeList2 = infoMapper.findOfficeList2();
                     filterList.addAll(officeList2);
                     List<TreeUserDto> users=infoMapper.finduserAllList(name);

jeeplus-modules/jeeplus-assess/src/main/resources/application-assess.yml

@@ -1,2 +1,2 @@
-active: development
-#active: production
+#active: development
+active: production

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/controller/CwFinanceInvoiceController.java

@@ -1,5 +1,8 @@
 package com.jeeplus.finance.invoice.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.jeeplus.aop.demo.annotation.DemoMode;
@@ -18,6 +21,7 @@ import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
 //import com.jeeplus.sys.utils.DictUtils;
 //import com.jeeplus.sys.utils.SpringContextHolder;
+import com.jeeplus.sys.feign.IDictApi;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
@@ -39,10 +43,7 @@ import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Api("财务管理-发票")
@@ -365,6 +366,116 @@ public class CwFinanceInvoiceController {
         }
         //对导出数据进行处理
         List<CwFinanceInvoiceDTO> resultList = cwFinanceInvoiceService.disposeExportList(result);
+
+
+        //获取字典数据
+        String cwWorkClientReportTypeDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_work_client_report_type");
+        Map<String,Object> cwWorkClientReportTypeValueDTOs = JSON.parseObject(cwWorkClientReportTypeDatas, new TypeReference<Map<String,Object>>() {});
+
+        String projectClassificationDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("project_classification");
+        Map<String,Object> projectClassificationValueDTOs = JSON.parseObject(projectClassificationDatas, new TypeReference<Map<String,Object>>() {});
+
+        String invoiceBillingContentDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("invoice_billing_content");
+        Map<String,Object> invoiceBillingContentValueDTOs = JSON.parseObject(invoiceBillingContentDatas, new TypeReference<Map<String,Object>>() {});
+
+        String invoiceTypeDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("invoice_type");
+        Map<String,Object> invoiceTypeValueDTOs = JSON.parseObject(invoiceTypeDatas, new TypeReference<Map<String,Object>>() {});
+
+        String invoiceStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("invoice_status");
+        Map<String,Object> invoiceStatusValueDTOs = JSON.parseObject(invoiceStatusDatas, new TypeReference<Map<String,Object>>() {});
+
+        for (CwFinanceInvoiceDTO info : resultList) {
+            if(StringUtils.isNotBlank(info.getReportType())){
+                for (String key : cwWorkClientReportTypeValueDTOs.keySet()) {
+                    if(info.getReportType().equals(key)){
+                        info.setReportType(String.valueOf(cwWorkClientReportTypeValueDTOs.get(key)));
+                        break;
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(info.getProjectClassification())){
+                for (String key : projectClassificationValueDTOs.keySet()) {
+                    if(info.getProjectClassification().equals(key)){
+                        info.setProjectClassification(String.valueOf(projectClassificationValueDTOs.get(key)));
+                        break;
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(info.getBillingContent())){
+                for (String key : invoiceBillingContentValueDTOs.keySet()) {
+                    if(info.getBillingContent().equals(key)){
+                        info.setBillingContent(String.valueOf(invoiceBillingContentValueDTOs.get(key)));
+                        break;
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(info.getType())){
+                for (String key : invoiceTypeValueDTOs.keySet()) {
+                    if(info.getType().equals(key)){
+                        info.setType(String.valueOf(invoiceTypeValueDTOs.get(key)));
+                        break;
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(info.getStatus())){
+                for (String key : invoiceStatusValueDTOs.keySet()) {
+                    if(info.getStatus().equals(key)){
+                        info.setStatus(String.valueOf(invoiceStatusValueDTOs.get(key)));
+                        break;
+                    }
+                }
+            }
+
+            if(StringUtils.isNotBlank(info.getReceivablesStatus())){
+                switch (info.getReceivablesStatus()){
+                    case "1":
+                        info.setReceivablesStatus("是");
+                        break;
+                    case "0":
+                        info.setReceivablesStatus("否");
+                        break;
+                    default:
+                        info.setReceivablesStatus("");
+                        break;
+                }
+            }else{
+                info.setReceivablesStatus("");
+            }
+
+            if(StringUtils.isNotBlank(info.getIsPreInvoice())){
+                switch (info.getIsPreInvoice()){
+                    case "1":
+                        info.setIsPreInvoice("是");
+                        break;
+                    case "0":
+                        info.setIsPreInvoice("否");
+                        break;
+                    default:
+                        info.setIsPreInvoice("");
+                        break;
+                }
+            }else{
+                info.setIsPreInvoice("");
+            }
+
+            if(StringUtils.isNotBlank(info.getIsCompleteInvoice())){
+                switch (info.getIsCompleteInvoice()){
+                    case "1":
+                    case "2":
+                        info.setIsCompleteInvoice("是");
+                        break;
+                    case "0":
+                        info.setIsCompleteInvoice("否");
+                        break;
+                    default:
+                        info.setIsCompleteInvoice("");
+                        break;
+                }
+            }else{
+                info.setIsCompleteInvoice("");
+            }
+
+        }
         EasyPoiUtil.exportExcel ( resultList, sheetName,  sheetName, CwFinanceInvoiceDTO.class, fileName, response );
 
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/dto/CwFinanceInvoiceDTO.java

@@ -77,22 +77,22 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     @Excel(name = "发票金额（元）",width = 16,type = 10)
     private String accountDetail;
 
-    @Excel(name = "报备类型",width = 20,dict = "cw_work_client_report_type")
+    @Excel(name = "报备类型",width = 20)
     private String reportType;
 
-    @Excel(name = "项目分类", width = 20, dict = "project_classification")
+    @Excel(name = "项目分类", width = 20)
     private String projectClassification;
 
     /**
      * 开票内容
      */
-    @Excel(name = "开票内容",width = 30,dict = "invoice_billing_content")
+    @Excel(name = "开票内容",width = 30)
     private String billingContent;
 
     /**
      * 发票类型
      */
-    @Excel(name = "发票类型",width = 20,dict = "invoice_type")
+    @Excel(name = "发票类型",width = 20)
     private String type;
 
     /**
@@ -106,7 +106,7 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     /**
      * 状态
      */
-    @Excel(name = "开票状态",width = 20,dict = "invoice_status")
+    @Excel(name = "开票状态",width = 20)
     private String status;
 
     /**
@@ -120,7 +120,7 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     /**
      * 是否确认收款
      */
-    @Excel(name = "是否确认收款",width = 14, replace = {"是_1", "否_0"})
+    @Excel(name = "是否确认收款",width = 14)
     private String receivablesStatus;
 
     /**
@@ -361,7 +361,7 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     /**
      * 是否预开票
      */
-    @Excel(name = "是否预开票",width = 14, replace = {"是_1", "否_0"," _null"})
+    @Excel(name = "是否预开票",width = 14)
     private String isPreInvoice;
 
     private String createName;
@@ -369,7 +369,7 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     /*8
     预开票已关联
      */
-    @Excel(name = "预开票已关联",width = 14, replace = {"是_2","是_1", "否_0"," _null"})
+    @Excel(name = "预开票已关联",width = 14)
     private String isCompleteInvoice;
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/controller/CwProjectRecordsController.java

@@ -3,6 +3,7 @@ package com.jeeplus.finance.projectRecords.controller;
 import cn.hutool.core.util.ObjectUtil;
 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.jeeplus.common.excel.ExcelOptions;
@@ -28,6 +29,7 @@ import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -262,11 +264,27 @@ public class CwProjectRecordsController {
             page.setCurrent (0);
             result = cwProjectRecordsService.findList (page,cwProjectRecordsDTO).getRecords();
         }
-        result.stream().forEach(item -> {
+
+        if(result.size()>0){
+            String cwStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_status");
+            Map<String,Object> cwStatusDictValueDTOs = JSON.parseObject(cwStatusDatas, new TypeReference<Map<String,Object>>() {});
+
+            for (CwProjectRecordsDTO info : result) {
+                if(StringUtils.isNotBlank(info.getStatus())){
+                    for (String key : cwStatusDictValueDTOs.keySet()) {
+                        if(info.getStatus().equals(key)){
+                            info.setStatus(String.valueOf(cwStatusDictValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        /*result.stream().forEach(item -> {
             if (StringUtils.isNotBlank(item.getStatus())){
                 item.setStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getStatus(),"cw_status",""));
             }
-        });
+        });*/
         EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwProjectRecordsDTO.class, fileName, response );
 
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -3,6 +3,8 @@ package com.jeeplus.finance.projectReport.controller;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 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;
@@ -33,6 +35,7 @@ import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
+import com.jeeplus.sys.service.dto.DictValueInfoDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 //import com.jeeplus.sys.utils.DictUtils;
 //import com.jeeplus.sys.utils.UserUtils;
@@ -635,26 +638,56 @@ public class CwProjectReportController {
             result = projectReportService.findList ( page, cwProjectReportData ).getRecords();
         }
         if(result.size()>0){
+            String cwStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_status");
+            Map<String,Object> cwStatusDictValueDTOs = JSON.parseObject(cwStatusDatas, new TypeReference<Map<String,Object>>() {});
+
+            String cwProjectReportSignStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_project_report_sign_status");
+            Map<String,Object> cwProjectReportSignStatusDictValueDTOs = JSON.parseObject(cwProjectReportSignStatusDatas, new TypeReference<Map<String,Object>>() {});
+
             for (CwProjectReportData info : result) {
 //                if(StringUtils.isNotBlank(info.getStatus())){
 //                    info.setStatus(DictUtils.getDictLabel(info.getStatus(), "cw_status", ""));
 //                }
                 if(StringUtils.isNotBlank(info.getReviewStatus())){
-                    info.setReviewStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getReviewStatus(), "cw_status", ""));
+                    for (String key : cwStatusDictValueDTOs.keySet()) {
+                        if(info.getReviewStatus().equals(key)){
+                            info.setReviewStatus(String.valueOf(cwStatusDictValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                    //info.setReviewStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getReviewStatus(), "cw_status", ""));
                 }
                 if ("1".equals(info.getSignatureType())) {
                     if(StringUtils.isNotBlank(info.getStatus1())){
-                        info.setStatus1(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus1(), "cw_status", ""));
+                        for (String key : cwStatusDictValueDTOs.keySet()) {
+                            if(info.getStatus1().equals(key)){
+                                info.setStatus1(String.valueOf(cwStatusDictValueDTOs.get(key)));
+                                break;
+                            }
+                        }
+                        //info.setStatus1(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus1(), "cw_status", ""));
                     }
                 }
                 if ("2".equals(info.getSignatureType())) {
                     if(StringUtils.isNotBlank(info.getStatus2())){
-                        info.setStatus1(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus2(), "cw_project_report_sign_status", ""));
+                        for (String key : cwProjectReportSignStatusDictValueDTOs.keySet()) {
+                            if(info.getStatus1().equals(key)){
+                                info.setStatus1(String.valueOf(cwProjectReportSignStatusDictValueDTOs.get(key)));
+                                break;
+                            }
+                        }
+                        //info.setStatus1(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus2(), "cw_project_report_sign_status", ""));
                     }
                 }
                 if ("3".equals(info.getSignatureType())) {
                     if(StringUtils.isNotBlank(info.getStatus3())){
-                        info.setStatus1(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus3(), "cw_project_report_sign_status", ""));
+                        for (String key : cwProjectReportSignStatusDictValueDTOs.keySet()) {
+                            if(info.getStatus1().equals(key)){
+                                info.setStatus1(String.valueOf(cwProjectReportSignStatusDictValueDTOs.get(key)));
+                                break;
+                            }
+                        }
+                        //info.setStatus1(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus3(), "cw_project_report_sign_status", ""));
                     }
                 }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwSignatureAnnotatorMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 财务-修改签字注师记录表
  */
@@ -14,6 +16,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface CwSignatureAnnotatorMapper extends BaseMapper<CwSignatureAnnotator> {
     CwSignatureAnnotator getSigById(String id);
 
+    /**
+     * 根据报告id查询修改签字注师表中信息
+     * @param reportIdList
+     * @return
+     */
+    List<CwSignatureAnnotator> getSigByIdList(@Param("reportIdList") List<String> reportIdList);
+
     void updateStatusById(CwSignatureAnnotator cwSignatureAnnotator);
 
     void setClearReason(@Param("id")String id);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwSignatureAnnotatorMapper.xml

@@ -48,6 +48,27 @@
 
 
 
+    <select id="getSigByIdList" resultType="com.jeeplus.finance.projectReport.domain.CwSignatureAnnotator">
+        SELECT
+            rsa.id,
+            rsa.status,
+            rsa.json_data,
+            rsa.proc_ins_id,
+            rsa.reason,
+            rsa.report_id,
+            art.ID_ as taskId
+        FROM
+            cw_project_report_signature_annotator rsa
+        left join act_ru_task art on rsa.proc_ins_id = art.PROC_INST_ID_
+        WHERE
+            report_id in
+            <foreach collection="reportIdList" open="(" close=")" separator="," item="id">
+                #{id}
+            </foreach>
+            AND del_flag = 0
+            ORDER BY create_time desc limit 1
+    </select>
+
 
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -710,6 +710,17 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         }
         ArrayList<User> users = new ArrayList<>();
         List<UserDTO> finalAllUserInfo = allUserInfo;
+
+        List<CwProjectReportData> records = list.getRecords();
+        //获取查询的所有报告id
+        List<String> reportIdList = Lists.newArrayList();
+
+        for (CwProjectReportData record : records) {
+            reportIdList.add(record.getId());
+        }
+        //根据报告id查询修改签字注师记录表信息
+        List<CwSignatureAnnotator> sigByIdList = cwSignatureAnnotatorMapper.getSigByIdList(reportIdList);
+
         list.getRecords().forEach(li->{
             if (StringUtils.isBlank(li.getProjectMasterName())){
                 //根据项目经理1的id去查项目经理去名称
@@ -746,11 +757,18 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             if(StringUtils.isEmpty(li.getSignatureAnnotatorStatus())){
                 li.setSignatureAnnotatorStatus("0");
             }
-            CwSignatureAnnotator sigById = cwSignatureAnnotatorMapper.getSigById(li.getId());
+            /*CwSignatureAnnotator sigById = cwSignatureAnnotatorMapper.getSigById(li.getId());
             if (ObjectUtil.isNotEmpty(sigById)){
                 li.setProcInsSigId(sigById.getProcInsId());
                 li.setSigReason(sigById.getReason());
                 li.setTaskSigId(sigById.getTaskId());
+            }*/
+            for (CwSignatureAnnotator annotator : sigByIdList) {
+                if(li.getId().equals(annotator.getReportId())){
+                    li.setProcInsSigId(annotator.getProcInsId());
+                    li.setSigReason(annotator.getReason());
+                    li.setTaskSigId(annotator.getTaskId());
+                }
             }
 
             //如果质控审核已经完成且审核通过时间存在，则判断审核时间是否已经超过一天，若不超过，则可以重复发起质控审核

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/controller/CwProjectReportArchiveController.java

@@ -1,6 +1,8 @@
 package com.jeeplus.finance.projectReportArchive.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.jeeplus.common.excel.ExcelOptions;
@@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -169,11 +172,28 @@ public class CwProjectReportArchiveController {
             page.setCurrent (0);
             result = cwProjectReportArchiveService.findList (page, cwProjectReportArchiveDTO).getRecords();
         }
-        result.stream().forEach(item -> {
+
+        if(result.size()>0){
+            String cwStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_status");
+            Map<String,Object> cwStatusDictValueDTOs = JSON.parseObject(cwStatusDatas, new TypeReference<Map<String,Object>>() {});
+
+            for (CwProjectReportArchiveDTO info : result) {
+                if(StringUtils.isNotBlank(info.getStatus())){
+                    for (String key : cwStatusDictValueDTOs.keySet()) {
+                        if(info.getStatus().equals(key)){
+                            info.setStatus(String.valueOf(cwStatusDictValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        /*result.stream().forEach(item -> {
             if (StringUtils.isNotBlank(item.getStatus())){
                 item.setStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getStatus(),"cw_status",""));
             }
-        });
+        });*/
         EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwProjectReportArchiveDTO.class, fileName, response );
 
     }

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

@@ -1,5 +1,8 @@
 package com.jeeplus.finance.reimbursementApproval.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;
@@ -16,6 +19,7 @@ import com.jeeplus.finance.reimbursementApproval.approvalInfo.service.dto.*;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -193,6 +197,36 @@ public class CwReimbursementInfoController {
             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 ("cw_reimbursement_source_type");
+            Map<String,Object> cwReimbursementSourceTypeValueDTOs = JSON.parseObject(cwReimbursementSourceTypeDatas, new TypeReference<Map<String,Object>>() {});
+
+            for (RetureListDto 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;
+                        }
+                    }
+                }
+            }
+        }
+
         EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, RetureListDto.class, fileName, response );
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/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;
 
     /**
@@ -111,7 +111,7 @@ public class RetureListDto {
      */
     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;

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/DictController.java

@@ -181,5 +181,16 @@ public class DictController {
         return ResponseEntity.ok ( DictUtils.getDictMap ( ) );
     }
 
+    /**
+     * 获取字典集
+     *
+     * @return
+     */
+    @ApiLog("获取字典集")
+    @GetMapping("getDictListMapByDict")
+    public ResponseEntity getDictListMapByDict() {
+        return ResponseEntity.ok ( DictUtils.getDictMap ( ) );
+    }
+
 
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -342,12 +342,8 @@ public class UserController {
                 }else{
                     info.setAccountantUserFlag(1);
                 }*/
-                if("庞广新".equals(info.getName())){
-                    info.setAccountantUserCount(99);
-                }else{
-                    Integer accountantUserCount = userService.getAccountantUserCount(info.getId());
-                    info.setAccountantUserCount(accountantUserCount);
-                }
+                Integer accountantUserCount = userService.getAccountantUserCount(info.getId());
+                info.setAccountantUserCount(accountantUserCount);
             }
         }
         return ResponseEntity.ok ( result );

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/DictApiImpl.java

@@ -1,10 +1,15 @@
 package com.jeeplus.sys.feign;
 
 import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
+import com.jeeplus.sys.service.dto.DictValueDTO;
 import com.jeeplus.sys.utils.DictUtils;
+import com.jeeplus.utils.StringUtils;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class DictApiImpl implements IDictApi {
@@ -24,4 +29,16 @@ public class DictApiImpl implements IDictApi {
     public String getDictMap(String dict) {
         return JSON.toJSONString(DictUtils.getDictMap().get(dict));
     }
+
+    @Override
+    public String getDictListMapByDict(String dict) {
+        List<DictValueDTO> dictValueDTOS = DictUtils.getDictMap().get(dict);
+        Map<String,Object> resultMap = new HashMap<>();
+        for (DictValueDTO dictValueDTO : dictValueDTOS) {
+            if(StringUtils.isNotBlank(dictValueDTO.getLabel()) && StringUtils.isNotBlank(dictValueDTO.getValue())){
+                resultMap.put(dictValueDTO.getValue(),dictValueDTO.getLabel());
+            }
+        }
+        return JSON.toJSONString(resultMap);
+    }
 }