list

src/main/java/com/ydtech/modules/admin/controller/APPPartnerController.java

@@ -4,7 +4,6 @@ import com.alipay.api.AlipayApiException;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysPartnerAccount;
-import com.ydtech.modules.admin.model.SysPremiumDetails;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.admin.service.SysPartnerService;

src/main/java/com/ydtech/modules/admin/dao/SysPremiumDetailsMapper.java

@@ -20,5 +20,5 @@ public interface SysPremiumDetailsMapper extends BaseMapper<SysPremiumDetails> {
 
     IPage<AgencyUserInsAreaVo> queryInsAreaPageById(Page page,@Param("dto") AgencyUserInsAreaDto agencyUserInsAreaDto);
 
-    Map<String, Object> queryInfoPage(@Param("userId") String userId,  @Param("dto") CommissionInfoDto commissionInfoDto);
+    List<Map<String, Object>> queryInfoPage(@Param("userId") String userId,  @Param("dto") CommissionInfoDto commissionInfoDto);
 }

src/main/java/com/ydtech/modules/admin/model/SysPremiumDetails.java

@@ -119,8 +119,28 @@ public class SysPremiumDetails {
     @ApiModelProperty(value = "费用来源(1，2,3,4,5级)")
     private Integer source;
 
-
-
-
-
+    @Override
+    public String toString() {
+        return "SysPremiumDetails{" +
+                "id=" + id +
+                ", userId='" + userId + '\'' +
+                ", userName='" + userName + '\'' +
+                ", issuerId='" + issuerId + '\'' +
+                ", issuerName='" + issuerName + '\'' +
+                ", orderno='" + orderno + '\'' +
+                ", companyId='" + companyId + '\'' +
+                ", sumpremium=" + sumpremium +
+                ", jqpremium=" + jqpremium +
+                ", sypremium=" + sypremium +
+                ", jypremium=" + jypremium +
+                ", proportional='" + proportional + '\'' +
+                ", extractFee=" + extractFee +
+                ", status=" + status +
+                ", type=" + type +
+                ", industrySector=" + industrySector +
+                ", createTime=" + createTime +
+                ", licenseno='" + licenseno + '\'' +
+                ", source=" + source +
+                '}';
+    }
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -16,6 +16,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
 import com.ydtech.aop.exception.DescribeException;
 import com.ydtech.constants.enums.WechatOpenSystem;
 import com.ydtech.core.page.HttpResult;
@@ -42,6 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
@@ -776,7 +782,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     }
 
     @Override
-    public AppPartnerNumVo getHomePage(Integer type) {
+    public AppPartnerNumVo
+    getHomePage(Integer type) {
         AppPartnerNumVo appPartnerNumVo = new AppPartnerNumVo();
         //合伙人：1 ；工作室管理员：2
         String userId = BaseController.getUserId();
@@ -1402,16 +1409,35 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                         SysPremiumDetails::getCreateTime, commissionInfoDto.getBeginTime(), commissionInfoDto.getEndTime())
                 .orderByDesc(SysPremiumDetails::getId).eq(SysPremiumDetails::getStatus,1));
 
-        Map<String, Object> stringObjectMap = sysPremiumDetailsMapper.queryInfoPage(userId, commissionInfoDto);
+        List<Map<String, Object>> stringObjectList = sysPremiumDetailsMapper.queryInfoPage(userId, commissionInfoDto);
 
-        if (CollectionUtil.isEmpty(stringObjectMap)) return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), 0L, 0L,
+        if (CollectionUtil.isEmpty(stringObjectList)) return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), 0L, 0L,
                 list);
+        Map<String, List<SysPremiumDetails>> listMap = new HashMap<>();
+        for (Map<String, Object> stringObjectMap : stringObjectList) {
+            String companyId = (String) stringObjectMap.get("companyId");
+            Object json = stringObjectMap.get("sysPremiumDetails");
+//            Gson gson = new Gson();
+//            Type type = new TypeToken<List<SysPremiumDetails>>() {}.getType();
+//            List<SysPremiumDetails> sysPremiumDetails1 = gson.fromJson(json.toString(),type);
+            String s ="["+ json.toString()+"]";
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+            List<SysPremiumDetails> sysPremiumDetails1 = null;
+            try {
+                sysPremiumDetails1 = objectMapper.readValue(s , new TypeReference<List<SysPremiumDetails>>() {});
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
 
 
+            listMap.put(companyId,sysPremiumDetails1);
 
+        }
 
-        Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
-                .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
+//        Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
+//                .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
         for (String key : listMap.keySet()) {
             List<SysPremiumInfoVo> proportionList = new ArrayList<>();
             SysPremiumDetailsVo sysPremiumDetailsVo = new SysPremiumDetailsVo();
@@ -1460,10 +1486,10 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             list.add(sysPremiumDetailsVo);
         }
 
-        List<SysPremiumDetailsVo> collect = list.stream().limit(page.getSize()).collect(Collectors.toList());
+//        List<SysPremiumDetailsVo> collect = list.stream().limit(page.getSize()).collect(Collectors.toList());
         long l = (list.size()+page.getSize()-1)/page.getSize();
         return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), list.size(), l,
-                collect);
+                list);
     }
 
     @Override

src/main/resources/mapper/modules/admin/SysPremiumDetailsMapper.xml

@@ -46,33 +46,37 @@
         ORDER BY apd.create_time desc
 
     </select>
+    <sql id="setGroupConcatMaxLen">
+        SET SESSION group_concat_max_len = 10000;
+    </sql>
     <select id="queryInfoPage" resultType="java.util.Map">
+        <include refid="setGroupConcatMaxLen"/>
         SELECT
-            company_id,
+            company_id as companyId,
             GROUP_CONCAT(
                     CONCAT(
                             '{"id":', id,
                             ',"orderno":"', orderno,
-                            ',"company_id":"', company_id,
-                            '","user_id":"', user_id,
-                            '","user_name":"', user_name,
-                            '","issuer_id":"', issuer_id,
-                            '","issuer_name":"', issuer_name,
+                            '","companyId":"', company_id,
+                            '","userId":"', user_id,
+                            '","userName":"', user_name,
+                            '","issuerId":"', issuer_id,
+                            '","issuerName":"', issuer_name,
                             '","jqpremium":', jqpremium,
                             ',"sypremium":', sypremium,
                             ',"jypremium":', jypremium,
                             ',"sumpremium":', sumpremium,
                             ',"proportional":"', proportional,
-                            '","extract_fee":', extract_fee,
+                            '","extractFee":', extract_fee,
                             ',"status":', status,
-                            ',"create_time":"', create_time,
+                            ',"createTime":"', DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s'),
                             '","type":', type,
-                            ',"industry_sector":', industry_sector,
+                            ',"industrySector":', industry_sector,
                             ',"licenseno":"', licenseno,
                             '","source":', source,
                             '}'
                         )
-                ) AS SysPremiumDetails
+                ) AS sysPremiumDetails
         FROM
             sys_premium_details
         <where>