列表

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/JiMuReportOpenFeignClient.java

@@ -0,0 +1,14 @@
+package com.epmet.commons.feignclient.feigns;
+
+import com.epmet.commons.feignclient.feigns.fallback.JiMuReportOpenFeignClientFallback;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/8 13:52
+ * @DESC
+ */
+@FeignClient(name = ServiceConstant.JM_REPORT, fallbackFactory = JiMuReportOpenFeignClientFallback.class)
+public interface JiMuReportOpenFeignClient {
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/fallback/JiMuReportOpenFeignClientFallback.java

@@ -0,0 +1,11 @@
+package com.epmet.commons.feignclient.feigns.fallback;
+
+import com.epmet.commons.feignclient.feigns.JiMuReportOpenFeignClient;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/8 13:53
+ * @DESC
+ */
+public class JiMuReportOpenFeignClientFallback implements JiMuReportOpenFeignClient {
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java

@@ -143,4 +143,9 @@ public interface ServiceConstant {
      * 聚合查询服务
      */
     String DATA_AGGREGATOR_SERVER = "data-aggregator-server";
+
+    /**
+     *
+     */
+    String JM_REPORT = "";
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/DictListFormDTO.java

@@ -1,6 +1,8 @@
 package com.epmet.commons.tools.dto.form;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 
@@ -9,6 +11,8 @@ import javax.validation.constraints.NotBlank;
  * @Author sun
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DictListFormDTO {
 
     /**

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ReportResultDTO.java

@@ -57,7 +57,7 @@ public class ReportResultDTO implements Serializable {
 
 
     @Data
-    static class CustomerList implements Serializable{
+    public static class CustomerList implements Serializable{
 
         private static final long serialVersionUID = 7146198312265513418L;
 

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/CustomerFunctionConstant.java

@@ -23,5 +23,7 @@ public interface CustomerFunctionConstant {
      */
     String PARAMETER_EXCEPTION = "请至少勾选一条默认功能或定制功能数据";
 
+    String REPORT_CATEGORY = "jmreport_category";
+
 
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java

@@ -4,13 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.form.DictListFormDTO;
+import com.epmet.commons.tools.dto.result.DictListResultDTO;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.CustomerFunctionConstant;
 import com.epmet.dao.IcCustomerReportDao;
+import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.IcCustomerReportDTO;
 import com.epmet.dto.result.ReportResultDTO;
 import com.epmet.entity.IcCustomerReportEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.service.IcCustomerReportService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -22,6 +30,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 客户报表关系表
@@ -34,6 +43,8 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
 
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
+    @Autowired
+    private OperCrmOpenFeignClient operCrmOpenFeignClient;
 
     @Override
     public PageData<IcCustomerReportDTO> page(Map<String, Object> params) {
@@ -99,8 +110,31 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
         if (CollectionUtils.isEmpty(reportList)){
             return new ArrayList<>();
         }
-
-        return null;
+        Result<List<DictListResultDTO>> dictList = adminOpenFeignClient.dictList(new DictListFormDTO(CustomerFunctionConstant.REPORT_CATEGORY));
+        if (!dictList.success()){
+            throw new EpmetException("查询字典信息失败：" + CustomerFunctionConstant.REPORT_CATEGORY);
+        }
+        if (CollectionUtils.isNotEmpty(dictList.getData())){
+            dictList.getData().forEach(d -> reportList.stream().filter(r -> d.getValue().equals(r.getCategoryKey())).forEach(r -> r.setCategoryName(d.getLabel())));
+        }
+        Result<List<CustomerDTO>> allCustomerList = operCrmOpenFeignClient.getAllCustomerList();
+        if (!allCustomerList.success()){
+            throw new EpmetException("获取客户信息失败...");
+        }
+        if (CollectionUtils.isNotEmpty(allCustomerList.getData())){
+            allCustomerList.getData().forEach(c -> reportList.stream().filter(r -> c.getId().equals(r.getCustomerId())).forEach(r -> r.setCustomerName(c.getCustomerName())));
+        }
+        // todo 报表
+        List<ReportResultDTO> result = new ArrayList<>();
+        Map<String, List<ReportResultDTO>> groupByReport = reportList.stream().collect(Collectors.groupingBy(ReportResultDTO::getReportId));
+        groupByReport.forEach((reportId,l) -> {
+            ReportResultDTO dto = new ReportResultDTO();
+            dto.setReportId(reportId);
+            dto.setReportName(l.get(NumConstant.ZERO).getReportName());
+            dto.setCustomerList(ConvertUtils.sourceToTarget(l, ReportResultDTO.CustomerList.class));
+            result.add(dto);
+        });
+        return result;
     }
 
 }