## 数据报表调整代码格式以及写法；

bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuLianchuangDataStatController.java

@@ -2,7 +2,7 @@ package com.hzs.report.member.controller.manage;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.hzs.common.core.annotation.Log;
 import com.hzs.common.core.constant.CountryConstants;
 import com.hzs.common.core.constant.TableNameConstants;
@@ -28,14 +28,11 @@ import com.hzs.report.member.vo.CuLianchuangDataStatVO;
 import com.hzs.report.member.vo.HomeDataStatVO;
 import com.hzs.system.base.ICurrencyServiceApi;
 import com.hzs.system.base.dto.CurrencyDTO;
-import javafx.util.Pair;
-import org.apache.catalina.security.SecurityUtil;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -44,30 +41,23 @@ import java.util.stream.Collectors;
 
 /**
  * 联创报表统计 前端控制器
- *
- * @author zhangjing
- * @since 2023-10-19
  */
 @RestController
 @RequestMapping("/manager/cu-lianchuang-data-stat")
 public class CuLianchuangDataStatController extends BaseController {
 
     @Autowired
-    private ICuLianchuangDataStatService lcStatService;
+    private ICuLianchuangDataStatService iCuLianchuangDataStatService;
 
     @DubboReference
     IMemberServiceApi iMemberServiceApi;
     @DubboReference
-    ICurrencyServiceApi currencyServiceApi;
+    ICurrencyServiceApi iCurrencyServiceApi;
     @DubboReference
-    ICuMemberSettlePeriodServiceApi cuMemberSettlePeriodService;
+    ICuMemberSettlePeriodServiceApi iCuMemberSettlePeriodServiceApi;
 
     /**
-     * @description: 查询联创数据报表
+     * 查询联创数据报表
-     * @author: zhang jing
-     * @date: 2023/10/19 16:02
-     * @param: [lcVO]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_DATA_STAT, method = EOperationMethod.SELECT)
     @GetMapping("/oldList")
@@ -77,13 +67,13 @@ public class CuLianchuangDataStatController extends BaseController {
             Date date = DateUtils.currentDate();
             lcVO.setPayTime(DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)));
         }
-        QueryWrapper<CuLianchuangDataStat> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CuLianchuangDataStat> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("TYPE", ESheetType.COMBINE.getValue());
+        queryWrapper.eq(CuLianchuangDataStat::getType, ESheetType.COMBINE.getValue());
         if (StringUtils.isNotEmpty(lcVO.getVertexCode())) {
-            queryWrapper.eq("VERTEX_CODE", lcVO.getVertexCode());
+            queryWrapper.eq(CuLianchuangDataStat::getVertexCode, lcVO.getVertexCode());
         }
-        queryWrapper.orderByAsc("CREATION_TIME");
+        queryWrapper.orderByAsc(CuLianchuangDataStat::getCreationTime);
-        List<CuLianchuangDataStat> lcList = lcStatService.list(queryWrapper);
+        List<CuLianchuangDataStat> lcList = iCuLianchuangDataStatService.list(queryWrapper);
         String orderBusinessStr = "2,7,3";
         if (CollectionUtil.isNotEmpty(lcList)) {
             lcList.forEach(itm -> {
@@ -114,7 +104,7 @@ public class CuLianchuangDataStatController extends BaseController {
                 //多线程
                 orderBusinessList.parallelStream().forEach(orderType -> {
                     List<Integer> orderTypeList = EOrderBusiness.getOrderTypeList(orderType);
-                    List<CuLianchuangDataStatVO> sonList = lcStatService.lcStatListByOrdeType(orderTypeList, orderType, itm);
+                    List<CuLianchuangDataStatVO> sonList = iCuLianchuangDataStatService.lcStatListByOrdeType(orderTypeList, orderType, itm);
                     if (CollectionUtil.isNotEmpty(sonList)) {
                         for (CuLianchuangDataStatVO co : sonList) {
                             switch (EOrderBusiness.getEnumByValue(co.getOrderType())) {
@@ -144,7 +134,7 @@ public class CuLianchuangDataStatController extends BaseController {
                 });
             });
             if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-                R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+                R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
                 if (CollectionUtil.isNotEmpty(list)) {
                     list.forEach(itm -> {
                         BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
@@ -163,11 +153,7 @@ public class CuLianchuangDataStatController extends BaseController {
     }
 
     /**
-     * @description: 查询联创数据报表(优化后)
+     * 查询联创数据报表(优化后)
-     * @author: zhang jing
-     * @date: 2024/7/17 13:56
-     * @param: [lcVO]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_DATA_STAT, method = EOperationMethod.SELECT)
     @GetMapping("/list")
@@ -178,13 +164,15 @@ public class CuLianchuangDataStatController extends BaseController {
             Date date = DateUtils.currentDate();
             lcVO.setPayTime(DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)));
         }
-        QueryWrapper<CuLianchuangDataStat> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CuLianchuangDataStat> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("TYPE", ESheetType.COMBINE.getValue());
+        queryWrapper.eq(CuLianchuangDataStat::getType, ESheetType.COMBINE.getValue());
         if (StringUtils.isNotEmpty(lcVO.getVertexCode())) {
-            queryWrapper.eq("VERTEX_CODE", lcVO.getVertexCode());
+            queryWrapper.eq(CuLianchuangDataStat::getVertexCode, lcVO.getVertexCode());
         }
-        queryWrapper.orderByAsc("CREATION_TIME");
+        queryWrapper.orderByAsc(CuLianchuangDataStat::getCreationTime);
-        List<CuLianchuangDataStat> lcList = lcStatService.list(queryWrapper);
+        queryWrapper.eq(CuLianchuangDataStat::getVertexCode, "BD31581237");
+
+        List<CuLianchuangDataStat> lcList = iCuLianchuangDataStatService.list(queryWrapper);
         List<Long> lcMemberStr = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(lcList)) {
             lcList.forEach(itm -> {
@@ -207,7 +195,7 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setPkCountry(SecurityUtils.getPkCountry());
         //多线程
         uniqueList.parallelStream().forEach(itm -> {
-            List<CuLianchuangDataStatVO> sonList = lcStatService.newLcStatListByOrdeType(lcVO, itm);
+            List<CuLianchuangDataStatVO> sonList = iCuLianchuangDataStatService.newLcStatListByOrdeType(lcVO, itm);
             allList.addAll(sonList);
         });
         //按照会员ID进行分组
@@ -234,8 +222,7 @@ public class CuLianchuangDataStatController extends BaseController {
                 calculateAmount(clos, allListstMap);
             }
         }
-        if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
+        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
-            R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         if (CollectionUtil.isNotEmpty(list)) {
             list.forEach(itm -> {
                 BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
@@ -247,7 +234,7 @@ public class CuLianchuangDataStatController extends BaseController {
                 itm.setRepurchaseSumPv(itm.getRepurchaseSumPv().multiply(inExchangeRate));
             });
         }
-        }
+
         return getDataTable(list);
     }
 
@@ -329,11 +316,7 @@ public class CuLianchuangDataStatController extends BaseController {
     }
 
     /**
-     * @description: 查询联创数据报表(历史数据)
+     * 查询联创数据报表(历史数据)
-     * @author: zhang jing
-     * @date: 2024/5/31 17:00
-     * @param: [lcVO]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_DATA_STAT, method = EOperationMethod.SELECT)
     @GetMapping("/listHistory")
@@ -351,14 +334,14 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setPkCountry(SecurityUtils.getPkCountry());
         //设置表名和期数
         setTableNames(lcVO);
-        QueryWrapper<CuLianchuangDataStat> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CuLianchuangDataStat> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("TYPE", ESheetType.COMBINE.getValue());
+        queryWrapper.eq(CuLianchuangDataStat::getType, ESheetType.COMBINE.getValue());
         if (StringUtils.isNotEmpty(lcVO.getVertexCode())) {
-            queryWrapper.eq("VERTEX_CODE", lcVO.getVertexCode());
+            queryWrapper.eq(CuLianchuangDataStat::getVertexCode, lcVO.getVertexCode());
         }
-        queryWrapper.orderByAsc("CREATION_TIME");
+        queryWrapper.orderByAsc(CuLianchuangDataStat::getCreationTime);
-        List<CuLianchuangDataStat> lcList = lcStatService.list(queryWrapper);
+        List<CuLianchuangDataStat> lcList = iCuLianchuangDataStatService.list(queryWrapper);
-        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
         if (CollectionUtil.isNotEmpty(lcList)) {
             //多线程操作
@@ -369,13 +352,13 @@ public class CuLianchuangDataStatController extends BaseController {
                         processRegions(itm);
                         CuLianchuangDataStatVO cdsVO = BeanUtil.copyProperties(itm, CuLianchuangDataStatVO.class);
                         // 查询首购新增复购新增
-                        List<CuLianchuangDataStatVO> sonList = lcStatService.lcStatOrdeHistoryList(lcVO, itm);
+                        List<CuLianchuangDataStatVO> sonList = iCuLianchuangDataStatService.lcStatOrdeHistoryList(lcVO, itm);
                         cdsVO.setFirstPurchaseMo(getStatistic(sonList, CuLianchuangDataStatVO::getFirstPurchaseMo));
                         cdsVO.setFirstPurchasePv(getStatistic(sonList, CuLianchuangDataStatVO::getFirstPurchasePv));
                         cdsVO.setRepurchaseMo(getStatistic(sonList, CuLianchuangDataStatVO::getRepurchaseMo));
                         cdsVO.setRepurchasePv(getStatistic(sonList, CuLianchuangDataStatVO::getRepurchasePv));
                         // 查询首购新增复购累计
-                        List<CuLianchuangDataStatVO> sonSumList = lcStatService.lcStatOrderHistorySumList(lcVO, itm);
+                        List<CuLianchuangDataStatVO> sonSumList = iCuLianchuangDataStatService.lcStatOrderHistorySumList(lcVO, itm);
                         cdsVO.setFirstPurchaseSumMo(getStatistic(sonSumList, CuLianchuangDataStatVO::getFirstPurchaseSumMo));
                         cdsVO.setFirstPurchaseSumPv(getStatistic(sonSumList, CuLianchuangDataStatVO::getFirstPurchaseSumPv));
                         cdsVO.setRepurchaseSumMo(getStatistic(sonSumList, CuLianchuangDataStatVO::getRepurchaseSumMo));
@@ -394,11 +377,7 @@ public class CuLianchuangDataStatController extends BaseController {
     }
 
     /**
-     * @description: 导出联创数据报表(历史数据)
+     * 导出联创数据报表(历史数据)
-     * @author: zhang jing
-     * @date: 2023/10/19 16:08
-     * @param: [response, lcVO]
-     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_DATA_STAT, method = EOperationMethod.EXPORT)
     @PostMapping("/exportHistory")
@@ -416,14 +395,14 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setPkCountry(SecurityUtils.getPkCountry());
         //设置表名和期数
         setTableNames(lcVO);
-        QueryWrapper<CuLianchuangDataStat> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CuLianchuangDataStat> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("TYPE", ESheetType.COMBINE.getValue());
+        queryWrapper.eq(CuLianchuangDataStat::getType, ESheetType.COMBINE.getValue());
         if (StringUtils.isNotEmpty(lcVO.getVertexCode())) {
-            queryWrapper.eq("VERTEX_CODE", lcVO.getVertexCode());
+            queryWrapper.eq(CuLianchuangDataStat::getVertexCode, lcVO.getVertexCode());
         }
-        queryWrapper.orderByAsc("CREATION_TIME");
+        queryWrapper.orderByAsc(CuLianchuangDataStat::getCreationTime);
-        List<CuLianchuangDataStat> lcList = lcStatService.list(queryWrapper);
+        List<CuLianchuangDataStat> lcList = iCuLianchuangDataStatService.list(queryWrapper);
-        R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
         BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
         if (CollectionUtil.isNotEmpty(lcList)) {
             //多线程操作
@@ -434,13 +413,13 @@ public class CuLianchuangDataStatController extends BaseController {
                         processRegions(itm);
                         CuLianchuangDataStatHistoryVO cdsVO = BeanUtil.copyProperties(itm, CuLianchuangDataStatHistoryVO.class);
                         // 查询首购新增复购新增
-                        List<CuLianchuangDataStatVO> sonList = lcStatService.lcStatOrdeHistoryList(lcVO, itm);
+                        List<CuLianchuangDataStatVO> sonList = iCuLianchuangDataStatService.lcStatOrdeHistoryList(lcVO, itm);
                         cdsVO.setFirstPurchaseMo(getStatistic(sonList, CuLianchuangDataStatVO::getFirstPurchaseMo));
                         cdsVO.setFirstPurchasePv(getStatistic(sonList, CuLianchuangDataStatVO::getFirstPurchasePv));
                         cdsVO.setRepurchaseMo(getStatistic(sonList, CuLianchuangDataStatVO::getRepurchaseMo));
                         cdsVO.setRepurchasePv(getStatistic(sonList, CuLianchuangDataStatVO::getRepurchasePv));
                         // 查询首购新增复购累计
-                        List<CuLianchuangDataStatVO> sonSumList = lcStatService.lcStatOrderHistorySumList(lcVO, itm);
+                        List<CuLianchuangDataStatVO> sonSumList = iCuLianchuangDataStatService.lcStatOrderHistorySumList(lcVO, itm);
                         cdsVO.setFirstPurchaseSumMo(getStatistic(sonSumList, CuLianchuangDataStatVO::getFirstPurchaseSumMo));
                         cdsVO.setFirstPurchaseSumPv(getStatistic(sonSumList, CuLianchuangDataStatVO::getFirstPurchaseSumPv));
                         cdsVO.setRepurchaseSumMo(getStatistic(sonSumList, CuLianchuangDataStatVO::getRepurchaseSumMo));
@@ -480,11 +459,11 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setSettleTableNameSta(TableNameConstants.CU_MEMBER_TREE + startDateMonth);
         lcVO.setSettleTableNameBefore(TableNameConstants.CU_MEMBER_TREE + beforeDateMonth);
         lcVO.setSettleTableNameEnd(TableNameConstants.CU_MEMBER_TREE + endDateMonth);
-        lcVO.setPeriodSta(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
+        lcVO.setPeriodSta(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(
                 DateUtils.parseDateToStr(lcVO.getStartDate())).getData().getPkId());
-        lcVO.setPeriodBefore(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
+        lcVO.setPeriodBefore(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(
                 DateUtils.parseDateToStr(lcVO.getBeforeDate())).getData().getPkId());
-        lcVO.setPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
+        lcVO.setPeriodEnd(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(
                 DateUtils.parseDateToStr(lcVO.getEndDate())).getData().getPkId());
     }
 
@@ -507,11 +486,7 @@ public class CuLianchuangDataStatController extends BaseController {
 
 
     /**
-     * @description: 查询国内联创数据报表
+     * 查询国内联创数据报表
-     * @author: zhang jing
-     * @date: 2023/10/19 16:02
-     * @param: [lcVO]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_HOME_DATA_STAT, method = EOperationMethod.SELECT)
     @GetMapping("/home-list")
@@ -523,12 +498,11 @@ public class CuLianchuangDataStatController extends BaseController {
         }
 
         //查询联创数据报表条件表
-        QueryWrapper<CuLianchuangDataStat> queryWrapper = new QueryWrapper();
+        LambdaQueryWrapper<CuLianchuangDataStat> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("TYPE", ESheetType.HOME.getValue());
+        queryWrapper.eq(CuLianchuangDataStat::getType, ESheetType.HOME.getValue());
-        queryWrapper.orderByAsc("PK_ID");
+        queryWrapper.orderByAsc(CuLianchuangDataStat::getPkId);
-        List<CuLianchuangDataStat> lcList = lcStatService.list(queryWrapper);
+        List<CuLianchuangDataStat> lcList = iCuLianchuangDataStatService.list(queryWrapper);
         if (CollectionUtil.isNotEmpty(lcList)) {
-            List<CuLianchuangDataStatVO> finalList = list;
             lcList.forEach(itm -> {
                 itm.setEndDate(lcVO.getPayTime());
                 itm.setStartDate(DateUtils.currentMonthFirstDateStr(DateUtils.parseStringToDate(lcVO.getPayTime())));
@@ -538,11 +512,11 @@ public class CuLianchuangDataStatController extends BaseController {
                             .collect(Collectors.toList());
                     itm.setAddRegionList(addRegionList);
                 }
-                List<CuLianchuangDataStatVO> sonList = lcStatService.lcStatList(Arrays.asList(itm));
+                List<CuLianchuangDataStatVO> sonList = iCuLianchuangDataStatService.lcStatList(Arrays.asList(itm));
-                finalList.addAll(sonList);
+                list.addAll(sonList);
             });
             if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-                R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+                R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
                 if (CollectionUtil.isNotEmpty(list)) {
                     list.forEach(itm -> {
                         itm.setFirstPurchasePv(itm.getFirstPurchasePv().multiply(currency.getData().getInExchangeRate()));
@@ -559,11 +533,7 @@ public class CuLianchuangDataStatController extends BaseController {
     }
 
     /**
-     * @description: 查询国外联创数据报表
+     * 查询国外联创数据报表
-     * @author: zhang jing
-     * @date: 2023/12/4 10:07
-     * @param: [lcVO]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_ABROAD_DATA_STAT, method = EOperationMethod.SELECT)
     @GetMapping("/abroad-list")
@@ -575,12 +545,12 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setStartDate(DateUtils.currentMonthFirstDateStr(DateUtils.parseStringToDate(lcVO.getPayTime())));
         lcVO.setEndDate(lcVO.getPayTime());
         //查询国家列表
-        List<CuLianchuangDataStatVO> pkCountryList = lcStatService.countryList();
+        List<CuLianchuangDataStatVO> pkCountryList = iCuLianchuangDataStatService.countryList();
         startPage();
-        List<AbroadDataStatVO> list = lcStatService.abroadStatList(pkCountryList, lcVO.getStartDate(), lcVO.getEndDate());
+        List<AbroadDataStatVO> list = iCuLianchuangDataStatService.abroadStatList(pkCountryList, lcVO.getStartDate(), lcVO.getEndDate());
         //中国汇率
         if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-            R<CurrencyDTO> currency = currencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY);
+            R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY);
             if (CollectionUtil.isNotEmpty(list)) {
                 list.forEach(itm -> {
                     pkCountryList.forEach(itmm -> {
@@ -612,11 +582,7 @@ public class CuLianchuangDataStatController extends BaseController {
 
 
     /**
-     * @description: 导出联创数据报表
+     * 导出联创数据报表
-     * @author: zhang jing
-     * @date: 2023/10/19 16:08
-     * @param: [response, lcVO]
-     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_DATA_STAT, method = EOperationMethod.EXPORT)
     @PostMapping("/export")
@@ -627,13 +593,13 @@ public class CuLianchuangDataStatController extends BaseController {
             Date date = DateUtils.currentDate();
             lcVO.setPayTime(DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)));
         }
-        QueryWrapper<CuLianchuangDataStat> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CuLianchuangDataStat> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("TYPE", ESheetType.COMBINE.getValue());
+        queryWrapper.eq(CuLianchuangDataStat::getType, ESheetType.COMBINE.getValue());
         if (StringUtils.isNotEmpty(lcVO.getVertexCode())) {
-            queryWrapper.eq("VERTEX_CODE", lcVO.getVertexCode());
+            queryWrapper.eq(CuLianchuangDataStat::getVertexCode, lcVO.getVertexCode());
         }
-        queryWrapper.orderByAsc("CREATION_TIME");
+        queryWrapper.orderByAsc(CuLianchuangDataStat::getCreationTime);
-        List<CuLianchuangDataStat> lcList = lcStatService.list(queryWrapper);
+        List<CuLianchuangDataStat> lcList = iCuLianchuangDataStatService.list(queryWrapper);
         List<Long> lcMemberStr = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(lcList)) {
             lcList.forEach(itm -> {
@@ -656,7 +622,7 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setPkCountry(SecurityUtils.getPkCountry());
         //多线程
         uniqueList.parallelStream().forEach(itm -> {
-            List<CuLianchuangDataStatVO> sonList = lcStatService.newLcStatListByOrdeType(lcVO, itm);
+            List<CuLianchuangDataStatVO> sonList = iCuLianchuangDataStatService.newLcStatListByOrdeType(lcVO, itm);
             allList.addAll(sonList);
         });
         //按照会员ID进行分组
@@ -684,7 +650,7 @@ public class CuLianchuangDataStatController extends BaseController {
             }
         }
         if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-            R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+            R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
             if (CollectionUtil.isNotEmpty(list)) {
                 list.forEach(itm -> {
                     BigDecimal inExchangeRate = currency.getData().getInExchangeRate();
@@ -702,11 +668,7 @@ public class CuLianchuangDataStatController extends BaseController {
     }
 
     /**
-     * @description: 导出国内联创数据报表
+     * 导出国内联创数据报表
-     * @author: zhang jing
-     * @date: 2023/10/19 16:08
-     * @param: [response, lcVO]
-     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_HOME_DATA_STAT, method = EOperationMethod.EXPORT)
     @PostMapping("/home-export")
@@ -718,12 +680,11 @@ public class CuLianchuangDataStatController extends BaseController {
         }
 
         //查询联创数据报表条件表
-        QueryWrapper<CuLianchuangDataStat> queryWrapper = new QueryWrapper();
+        LambdaQueryWrapper<CuLianchuangDataStat> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("TYPE", ESheetType.HOME.getValue());
+        queryWrapper.eq(CuLianchuangDataStat::getType, ESheetType.HOME.getValue());
-        queryWrapper.orderByAsc("PK_ID");
+        queryWrapper.orderByAsc(CuLianchuangDataStat::getPkId);
-        List<CuLianchuangDataStat> lcList = lcStatService.list(queryWrapper);
+        List<CuLianchuangDataStat> lcList = iCuLianchuangDataStatService.list(queryWrapper);
         if (CollectionUtil.isNotEmpty(lcList)) {
-            List<CuLianchuangDataStatVO> finalList = list;
             lcList.forEach(itm -> {
                 itm.setEndDate(lcVO.getPayTime());
                 itm.setStartDate(DateUtils.currentMonthFirstDateStr(DateUtils.parseStringToDate(lcVO.getPayTime())));
@@ -733,13 +694,13 @@ public class CuLianchuangDataStatController extends BaseController {
                             .collect(Collectors.toList());
                     itm.setAddRegionList(addRegionList);
                 }
-                List<CuLianchuangDataStatVO> sonList = lcStatService.lcStatList(Arrays.asList(itm));
+                List<CuLianchuangDataStatVO> sonList = iCuLianchuangDataStatService.lcStatList(Arrays.asList(itm));
-                finalList.addAll(sonList);
+                list.addAll(sonList);
             });
 
         }
         if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-            R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+            R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
             if (CollectionUtil.isNotEmpty(list)) {
                 list.forEach(itm -> {
                     itm.setFirstPurchasePv(itm.getFirstPurchasePv().multiply(currency.getData().getInExchangeRate()));
@@ -758,11 +719,7 @@ public class CuLianchuangDataStatController extends BaseController {
     }
 
     /**
-     * @description: 导出国外联创数据报表
+     * 导出国外联创数据报表
-     * @author: zhang jing
-     * @date: 2023/12/4 10:13
-     * @param: [response, lcVO]
-     * @return: void
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_ABROAD_DATA_STAT, method = EOperationMethod.EXPORT)
     @PostMapping("/abroad-export")
@@ -775,11 +732,11 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setStartDate(DateUtils.currentMonthFirstDateStr(DateUtils.parseStringToDate(lcVO.getPayTime())));
         lcVO.setEndDate(lcVO.getPayTime());
         //查询国家列表
-        List<CuLianchuangDataStatVO> pkCountryList = lcStatService.countryList();
+        List<CuLianchuangDataStatVO> pkCountryList = iCuLianchuangDataStatService.countryList();
-        List<AbroadDataStatVO> list = lcStatService.abroadStatList(pkCountryList, lcVO.getStartDate(), lcVO.getEndDate());
+        List<AbroadDataStatVO> list = iCuLianchuangDataStatService.abroadStatList(pkCountryList, lcVO.getStartDate(), lcVO.getEndDate());
         if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
             //中国汇率
-            R<CurrencyDTO> currency = currencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY);
+            R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY);
             if (CollectionUtil.isNotEmpty(list)) {
                 list.forEach(itm -> {
                     pkCountryList.forEach(itmm -> {
@@ -811,11 +768,7 @@ public class CuLianchuangDataStatController extends BaseController {
     }
 
     /**
-     * @description: 新增联创查询条件
+     * 新增联创查询条件
-     * @author: zhang jing
-     * @date: 2023/10/19 16:17
-     * @param: [lcVO]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.LIANCHUANG_DATA_STAT, method = EOperationMethod.INSERT)
     @PostMapping("/save")
@@ -828,8 +781,8 @@ public class CuLianchuangDataStatController extends BaseController {
         if (StringUtils.isNotEmpty(lcVO.getAddRegion())) {
             String[] addCodeArray = lcVO.getAddRegion().split(",");
             if (addCodeArray.length > 0) {
-                for (int i = 0; i < addCodeArray.length; i++) {
+                for (String s : addCodeArray) {
-                    R<CuMember> member = iMemberServiceApi.getMember(addCodeArray[i]);
+                    R<CuMember> member = iMemberServiceApi.getMember(s);
                     addRegion.append(member.getData().getPkId()).append(",");
                 }
             }
@@ -838,8 +791,8 @@ public class CuLianchuangDataStatController extends BaseController {
         if (StringUtils.isNotEmpty(lcVO.getReduceRegion())) {
             String[] reduceCodeArray = lcVO.getReduceRegion().split(",");
             if (reduceCodeArray.length > 0) {
-                for (int i = 0; i < reduceCodeArray.length; i++) {
+                for (String s : reduceCodeArray) {
-                    R<CuMember> member = iMemberServiceApi.getMember(reduceCodeArray[i]);
+                    R<CuMember> member = iMemberServiceApi.getMember(s);
                     reduceRegion.append(member.getData().getPkId()).append(",");
                 }
             }
@@ -849,15 +802,11 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setPkCreator(userId);
         lcVO.setCreationTime(date);
         CuLianchuangDataStat cld = BeanUtil.copyProperties(lcVO, CuLianchuangDataStat.class);
-        return AjaxResult.success(lcStatService.save(cld));
+        return AjaxResult.success(iCuLianchuangDataStatService.save(cld));
     }
 
     /**
-     * @description: 国内数据报表查询
+     * 国内数据报表查询
-     * @author: zhang jing
-     * @date: 2023/12/4 9:57
-     * @param: [lcVO]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.LEVEL_CONFIG, business = EOperationBusiness.LIANCHUANG_HOME_DATA_STAT, method = EOperationMethod.INSERT)
     @PostMapping("/home-save")
@@ -879,8 +828,8 @@ public class CuLianchuangDataStatController extends BaseController {
         if (StringUtils.isNotEmpty(lcVO.getAddRegion())) {
             String[] addCodeArray = lcVO.getAddRegion().split(",");
             if (addCodeArray.length > 0) {
-                for (int i = 0; i < addCodeArray.length; i++) {
+                for (String s : addCodeArray) {
-                    R<CuMember> member = iMemberServiceApi.getMember(addCodeArray[i]);
+                    R<CuMember> member = iMemberServiceApi.getMember(s);
                     addRegion.append(member.getData().getPkId()).append(",");
                 }
             }
@@ -890,16 +839,12 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setPkCreator(userId);
         lcVO.setCreationTime(date);
         CuLianchuangDataStat cld = BeanUtil.copyProperties(lcVO, CuLianchuangDataStat.class);
-        return AjaxResult.success(lcStatService.save(cld));
+        return AjaxResult.success(iCuLianchuangDataStatService.save(cld));
     }
 
 
     /**
-     * @description: 修改联创数据报表查询条件
+     * 修改联创数据报表查询条件
-     * @author: zhang jing
-     * @date: 2023/10/19 17:03
-     * @param: [lcVO]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_DATA_STAT, method = EOperationMethod.UPDATE)
     @PostMapping("/update")
@@ -921,8 +866,8 @@ public class CuLianchuangDataStatController extends BaseController {
         if (StringUtils.isNotEmpty(lcVO.getAddRegion())) {
             String[] addCodeArray = lcVO.getAddRegion().split(",");
             if (addCodeArray.length > 0) {
-                for (int i = 0; i < addCodeArray.length; i++) {
+                for (String s : addCodeArray) {
-                    R<CuMember> member = iMemberServiceApi.getMember(addCodeArray[i]);
+                    R<CuMember> member = iMemberServiceApi.getMember(s);
                     addRegion.append(member.getData().getPkId()).append(",");
                 }
             }
@@ -933,8 +878,8 @@ public class CuLianchuangDataStatController extends BaseController {
         if (StringUtils.isNotEmpty(lcVO.getReduceRegion())) {
             String[] reduceCodeArray = lcVO.getReduceRegion().split(",");
             if (reduceCodeArray.length > 0) {
-                for (int i = 0; i < reduceCodeArray.length; i++) {
+                for (String s : reduceCodeArray) {
-                    R<CuMember> member = iMemberServiceApi.getMember(reduceCodeArray[i]);
+                    R<CuMember> member = iMemberServiceApi.getMember(s);
                     reduceRegion.append(member.getData().getPkId()).append(",");
                 }
             }
@@ -946,15 +891,11 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setPkModified(userId);
         lcVO.setModifiedTime(date);
         CuLianchuangDataStat cld = BeanUtil.copyProperties(lcVO, CuLianchuangDataStat.class);
-        return AjaxResult.success(lcStatService.updateById(cld));
+        return AjaxResult.success(iCuLianchuangDataStatService.updateById(cld));
     }
 
     /**
-     * @description:修改国内联创数据报表查询条件
+     * 修改国内联创数据报表查询条件
-     * @author: zhang jing
-     * @date: 2023/12/4 9:59
-     * @param: [lcVO]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_HOME_DATA_STAT, method = EOperationMethod.UPDATE)
     @PostMapping("/home-update")
@@ -967,8 +908,8 @@ public class CuLianchuangDataStatController extends BaseController {
         if (StringUtils.isNotEmpty(lcVO.getAddRegion())) {
             String[] addCodeArray = lcVO.getAddRegion().split(",");
             if (addCodeArray.length > 0) {
-                for (int i = 0; i < addCodeArray.length; i++) {
+                for (String s : addCodeArray) {
-                    R<CuMember> member = iMemberServiceApi.getMember(addCodeArray[i]);
+                    R<CuMember> member = iMemberServiceApi.getMember(s);
                     addRegion.append(member.getData().getPkId()).append(",");
                 }
             }
@@ -980,29 +921,25 @@ public class CuLianchuangDataStatController extends BaseController {
         lcVO.setPkModified(userId);
         lcVO.setModifiedTime(date);
         CuLianchuangDataStat cld = BeanUtil.copyProperties(lcVO, CuLianchuangDataStat.class);
-        return AjaxResult.success(lcStatService.updateById(cld));
+        return AjaxResult.success(iCuLianchuangDataStatService.updateById(cld));
     }
 
 
     /**
-     * @description: 查询单条联创数据报表查询条件
+     * 查询单条联创数据报表查询条件
-     * @author: zhang jing
-     * @date: 2023/10/19 17:18
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_DATA_STAT, method = EOperationMethod.SELECT)
     @GetMapping("/getOne/{pkId}")
     public AjaxResult getOne(@PathVariable Long pkId) {
-        CuLianchuangDataStat cld = lcStatService.getById(pkId);
+        CuLianchuangDataStat cld = iCuLianchuangDataStatService.getById(pkId);
         CuLianchuangDataStatVO lcVO = BeanUtil.copyProperties(cld, CuLianchuangDataStatVO.class);
         StringBuilder addRegion = new StringBuilder();
         StringBuilder reduceRegion = new StringBuilder();
         if (StringUtils.isNotEmpty(lcVO.getAddRegion())) {
             String[] addCodeArray = lcVO.getAddRegion().split(",");
             if (addCodeArray.length > 0) {
-                for (int i = 0; i < addCodeArray.length; i++) {
+                for (String s : addCodeArray) {
-                    int pkMember = Integer.parseInt(addCodeArray[i]);
+                    int pkMember = Integer.parseInt(s);
                     R<CuMember> member = iMemberServiceApi.getMember((long) pkMember);
                     addRegion.append(member.getData().getMemberCode()).append(",");
                 }
@@ -1012,8 +949,8 @@ public class CuLianchuangDataStatController extends BaseController {
         if (StringUtils.isNotEmpty(lcVO.getReduceRegion())) {
             String[] reduceCodeArray = lcVO.getReduceRegion().split(",");
             if (reduceCodeArray.length > 0) {
-                for (int i = 0; i < reduceCodeArray.length; i++) {
+                for (String s : reduceCodeArray) {
-                    int pkMember = Integer.parseInt(reduceCodeArray[i]);
+                    int pkMember = Integer.parseInt(s);
                     R<CuMember> member = iMemberServiceApi.getMember((long) pkMember);
                     reduceRegion.append(member.getData().getMemberCode()).append(",");
                 }
@@ -1025,17 +962,13 @@ public class CuLianchuangDataStatController extends BaseController {
 
 
     /**
-     * @description: 删除联创数据报表查询条件
+     * 删除联创数据报表查询条件
-     * @author: zhang jing
-     * @date: 2023/10/19 17:02
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.LIANCHUANG_DATA_STAT, method = EOperationMethod.DELETE)
     @PostMapping("/delete-lcStat")
     public AjaxResult delete(@RequestBody CuLianchuangDataStatVO lcVO) {
         if (CollectionUtil.isNotEmpty(lcVO.getPkIdList())) {
-            lcStatService.deleteLcStat(lcVO.getPkIdList());
+            iCuLianchuangDataStatService.deleteLcStat(lcVO.getPkIdList());
         }
         return AjaxResult.success();
     }

bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuLianchuangDataStatMapper.java

@@ -1,6 +1,5 @@
 package com.hzs.report.member.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.report.stat.CuLianchuangDataStat;
 import com.hzs.report.member.vo.AbroadDataStatVO;
@@ -10,21 +9,12 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * <p>
  * 联创报表统计 Mapper 接口
- * </p>
- *
- * @author zhangjing
- * @since 2023-10-19
  */
 public interface CuLianchuangDataStatMapper extends BaseMapper<CuLianchuangDataStat> {
 
     /**
-     * @description: 查询联创数据报表
+     * 查询联创数据报表
-     * @author: zhang jing
-     * @date: 2023/10/19 16:01
-     * @param: [lcVO]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> lcStatList(@Param("lcList") List<CuLianchuangDataStat> lcList);
 
@@ -33,54 +23,34 @@ public interface CuLianchuangDataStatMapper extends BaseMapper<CuLianchuangDataS
                                                       @Param("lcDate") CuLianchuangDataStat lcDate);
 
     /**
-     * @description: 联创数据查询(优化后)
+     * 联创数据查询(优化后)
-     * @author: zhang jing
-     * @date: 2024/7/18 15:47
-     * @param: [lcDate, pkMember]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> newLcStatListByOrdeType(@Param("lcDate") CuLianchuangDataStatVO lcDate,
                                                          @Param("pkMember") Long pkMember);
 
 
     /**
-     * @description: 数据报表-联创统计历史业绩数据
+     * 数据报表-联创统计历史业绩数据
-     * @author: zhang jing
-     * @date: 2024/5/30 10:15
-     * @param: [orderTypeList, orderType, lcDate]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> lcStatOrdeHistoryList(@Param("cds") CuLianchuangDataStatVO cds,
                                                        @Param("lcDate") CuLianchuangDataStat lcDate);
 
     /**
-     * @description: 数据报表-联创统计历史业绩累计数据
+     * 数据报表-联创统计历史业绩累计数据
-     * @author: zhang jing
-     * @date: 2024/5/31 11:33
-     * @param: [cds, lcDate]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> lcStatOrderHistorySumList(@Param("cds") CuLianchuangDataStatVO cds,
                                                            @Param("lcDate") CuLianchuangDataStat lcDate);
 
 
     /**
-     * @description: 查询国外数据报表
+     * 查询国外数据报表
-     * @author: zhang jing
-     * @date: 2023/12/5 10:38
-     * @param: [pkCountryList, startDate, endDate]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<AbroadDataStatVO> abroadStatList(@Param("pkCountryList") List<CuLianchuangDataStatVO> pkCountryList,
                                           @Param("startDate") String startDate,
                                           @Param("endDate") String endDate);
 
     /**
-     * @description: 国家列表
+     * 国家列表
-     * @author: zhang jing
-     * @date: 2023/12/5 11:23
-     * @param: []
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> countryList();
 

bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuLianchuangDataStatService.java

@@ -1,93 +1,52 @@
 package com.hzs.report.member.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.common.domain.report.stat.CuLianchuangDataStat;
 import com.hzs.report.member.vo.AbroadDataStatVO;
 import com.hzs.report.member.vo.CuLianchuangDataStatVO;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
- * <p>
  * 联创报表统计 服务类
- * </p>
- *
- * @author zhangjing
- * @since 2023-10-19
  */
 public interface ICuLianchuangDataStatService extends IService<CuLianchuangDataStat> {
 
     /**
-    * @description: 查询联创数据报表
+     * 查询联创数据报表
-    * @author: zhang jing
-    * @date: 2023/10/19 16:02
-    * @param: [lcVO]
-    * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> lcStatList(List<CuLianchuangDataStat> lcList);
 
     List<CuLianchuangDataStatVO> lcStatListByOrdeType(List<Integer> orderTypeList, Integer orderType, CuLianchuangDataStat lcDate);
 
     /**
-    * @description: 联创数据查询
+     * 联创数据查询
-    * @author: zhang jing
-    * @date: 2024/7/17 16:40
-    * @param: [orderTypeList, orderType, lcDate]
-    * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> newLcStatListByOrdeType(CuLianchuangDataStatVO lcDate, Long pkMember);
 
     /**
-    * @description: 数据报表-联创统计历史业绩数据
+     * 数据报表-联创统计历史业绩数据
-    * @author: zhang jing
-    * @date: 2024/5/30 10:16
-    * @param: [orderTypeList, orderType, lcDate]
-    * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> lcStatOrdeHistoryList(CuLianchuangDataStatVO cds, CuLianchuangDataStat lcDate);
+
     /**
-    * @description:数据报表-联创统计历史业绩累计数据
+     * 数据报表-联创统计历史业绩累计数据
-    * @author: zhang jing
-    * @date: 2024/5/31 11:34
-    * @param: [cds, lcDate]
-    * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> lcStatOrderHistorySumList(CuLianchuangDataStatVO cds, CuLianchuangDataStat lcDate);
 
-
-
-
-
-
-
     /**
-    * @description: 查询国外数据报表
+     * 查询国外数据报表
-    * @author: zhang jing
-    * @date: 2023/12/5 10:37
-    * @param: [pkCountryList, startDate, endDate]
-    * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<AbroadDataStatVO> abroadStatList(List<CuLianchuangDataStatVO> pkCountryList, String startDate, String endDate);
 
     /**
-    * @description: 国家列表
+     * 国家列表
-    * @author: zhang jing
-    * @date: 2023/12/5 11:22
-    * @param: []
-    * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
      **/
     List<CuLianchuangDataStatVO> countryList();
 
-
-
     /**
-    * @description: 删除查询联创数据报表条件
+     * 删除查询联创数据报表条件
-    * @author: zhang jing
-    * @date: 2023/10/20 9:45
-    * @param: [pkIdList]
-    * @return: boolean
      **/
     boolean deleteLcStat(List<Long> pkIdList);
+
 }

bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuLianchuangDataStatServiceImpl.java

@@ -1,6 +1,6 @@
 package com.hzs.report.member.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.core.enums.EDelFlag;
 import com.hzs.common.domain.report.stat.CuLianchuangDataStat;
@@ -9,7 +9,6 @@ import com.hzs.report.member.mapper.CuLianchuangDataStatMapper;
 import com.hzs.report.member.service.ICuLianchuangDataStatService;
 import com.hzs.report.member.vo.AbroadDataStatVO;
 import com.hzs.report.member.vo.CuLianchuangDataStatVO;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,81 +16,36 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 联创报表统计 服务实现类
- * </p>
- *
- * @author zhangjing
- * @since 2023-10-19
  */
 @Service
 public class CuLianchuangDataStatServiceImpl extends ServiceImpl<CuLianchuangDataStatMapper, CuLianchuangDataStat> implements ICuLianchuangDataStatService {
 
-    /**
-     * @description: 查询联创数据报表
-     * @author: zhang jing
-     * @date: 2023/10/19 16:01
-     * @param: [lcVO]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
-     **/
     @Override
     public List<CuLianchuangDataStatVO> lcStatList(List<CuLianchuangDataStat> lcList) {
         return baseMapper.lcStatList(lcList);
     }
+
     @Override
     public List<CuLianchuangDataStatVO> lcStatListByOrdeType(List<Integer> orderTypeList, Integer orderType, CuLianchuangDataStat lcDate) {
         return baseMapper.lcStatListByOrdeType(orderTypeList, orderType, lcDate);
     }
 
-    /**
-     * @description: 联创数据查询
-     * @author: zhang jing
-     * @date: 2024/7/17 16:40
-     * @param: [orderTypeList, orderType, lcDate]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
-     **/
     @Override
     public List<CuLianchuangDataStatVO> newLcStatListByOrdeType(CuLianchuangDataStatVO lcDate, Long pkMember) {
         return baseMapper.newLcStatListByOrdeType(lcDate, pkMember);
     }
 
-    /**
-     * @description: 数据报表-联创统计历史业绩数据
-     * @author: zhang jing
-     * @date: 2024/5/30 10:16
-     * @param: [orderTypeList, orderType, lcDate]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
-     **/
     @Override
     public List<CuLianchuangDataStatVO> lcStatOrdeHistoryList(CuLianchuangDataStatVO cds, CuLianchuangDataStat lcDate) {
         return baseMapper.lcStatOrdeHistoryList(cds, lcDate);
     }
 
-    /**
-     * @description:数据报表-联创统计历史业绩累计数据
-     * @author: zhang jing
-     * @date: 2024/5/31 11:34
-     * @param: [cds, lcDate]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
-     **/
     @Override
     public List<CuLianchuangDataStatVO> lcStatOrderHistorySumList(CuLianchuangDataStatVO cds, CuLianchuangDataStat lcDate) {
         return baseMapper.lcStatOrderHistorySumList(cds, lcDate);
     }
 
-
-
-
-
-
-
-    /**
-     * @description: 查询国外数据报表
-     * @author: zhang jing
-     * @date: 2023/12/5 10:38
-     * @param: [pkCountryList, startDate, endDate]
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
-     **/
     @Override
     public List<AbroadDataStatVO> abroadStatList(List<CuLianchuangDataStatVO> pkCountryList,
                                                  String startDate,
@@ -99,36 +53,20 @@ public class CuLianchuangDataStatServiceImpl extends ServiceImpl<CuLianchuangDat
         return baseMapper.abroadStatList(pkCountryList, startDate, endDate);
     }
 
-    /**
-     * @description: 国家列表
-     * @author: zhang jing
-     * @date: 2023/12/5 11:22
-     * @param: []
-     * @return: java.util.List<com.hzs.report.member.vo.CuLianchuangDataStatVO>
-     **/
     @Override
     public List<CuLianchuangDataStatVO> countryList() {
         return baseMapper.countryList();
     }
 
-
-
-    /**
-     * @description: 删除查询联创数据报表条件
-     * @author: zhang jing
-     * @date: 2023/10/20 9:46
-     * @param: [pkIdList]
-     * @return: boolean
-     **/
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean deleteLcStat(List<Long> pkIdList) {
         for (Long l : pkIdList) {
-            UpdateWrapper<CuLianchuangDataStat> updateWrapper = new UpdateWrapper();
+            LambdaUpdateWrapper<CuLianchuangDataStat> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
+            updateWrapper.set(CuLianchuangDataStat::getDelFlag, EDelFlag.DELETE.getValue());
-            updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId());
+            updateWrapper.set(CuLianchuangDataStat::getPkModified, SecurityUtils.getUserId());
-            updateWrapper.set("MODIFIED_TIME", new Date());
+            updateWrapper.set(CuLianchuangDataStat::getModifiedTime, new Date());
-            updateWrapper.eq("PK_ID", l);
+            updateWrapper.eq(CuLianchuangDataStat::getPkId, l);
             baseMapper.update(null, updateWrapper);
         }
         return true;

bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuLianchuangDataStatVO.java

@@ -11,12 +11,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 联创报表统计VO
- * </p>
- *
- * @author zhangjing
- * @since 2023-10-19
  */
 @Data
 public class CuLianchuangDataStatVO {
@@ -287,9 +282,4 @@ public class CuLianchuangDataStatVO {
     private List<Long> reduceRegionList;
 
 
-
-
-
-
-
 }

bd-business/bd-business-report/src/main/resources/mapper/report/report/CuLianchuangDataStatMapper.xml

@@ -17,17 +17,6 @@
         <result column="REDUCE_REGION" property="reduceRegion"/>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG,
-        CREATION_TIME,
-        MODIFIED_TIME,
-        PK_COUNTRY,
-        PK_CREATOR,
-        PK_MODIFIED,
-        PK_ID, VERTEX_CODE, VERTEX_NAME, ADD_REGION, REDUCE_REGION
-    </sql>
-
 
     <!-- 查询联创数据报表-->
     <select id="lcStatList" resultType="com.hzs.report.member.vo.CuLianchuangDataStatVO">
@@ -381,7 +370,6 @@
                     and so.PAY_TIME &lt;= to_date(#{item.endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
                 </if>
 
-
             </foreach>
             ) addArea
             <if test="item.reduceRegionList!=null">
@@ -908,7 +896,8 @@
         0 repurchaseOrderPv,
         0 repurchaseOrderSumMo,
         0 repurchaseOrderSumPv,
-        CASE when to_char(so.PAY_TIME, 'yyyy-mm-dd') = #{lcDate.endDate} then sum(nvl(so.ORDER_AMOUNT, 0)-nvl(so.CONSUME_AMOUNT, 0)) else 0 end repurchaseMo,
+        CASE when to_char(so.PAY_TIME, 'yyyy-mm-dd') = #{lcDate.endDate} then sum(nvl(so.ORDER_AMOUNT, 0)-nvl(so.CONSUME_AMOUNT, 0)) else 0 end
+        repurchaseMo,
         CASE when to_char(so.PAY_TIME, 'yyyy-mm-dd') = #{lcDate.endDate} then sum(nvl(so.ORDER_ACHIEVE, 0)) else 0 end repurchasePv,
         CASE WHEN sum(nvl(so.ORDER_AMOUNT, 0)) is null THEN 0 ELSE sum(so.ORDER_AMOUNT-nvl(so.CONSUME_AMOUNT, 0)) end repurchaseSumMo,
         CASE WHEN sum(nvl(so.ORDER_ACHIEVE, 0)) is null THEN 0 ELSE sum(so.ORDER_ACHIEVE) end repurchaseSumPv
@@ -1154,7 +1143,6 @@
     </select>
 
 
-
     <!--     查询国外数据报表-->
     <select id="abroadStatList" resultType="com.hzs.report.member.vo.AbroadDataStatVO">
         select
@@ -1421,8 +1409,7 @@
     </select>
     <!--     国家列表-->
     <select id="countryList" resultType="com.hzs.report.member.vo.CuLianchuangDataStatVO">
-       select
+        select bc.SHORT_NAME as     shortName,
-            bc.SHORT_NAME as shortName,
                bc.PK_ID      as     pkCountry,
                bcy.IN_EXCHANGE_RATE rate
         from BD_COUNTRY bc

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESheetType.java

@@ -5,11 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * @Description: 数据报表类型
+ * 数据报表类型
- * @Author: zhangjing
- * @Time: 2023/11/4 14:11
- * @Classname: ESheetType
- * @PackageName: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/report/stat/CuLianchuangDataStat.java

@@ -10,12 +10,7 @@ import org.apache.ibatis.type.JdbcType;
 import java.util.List;
 
 /**
- * <p>
  * 联创报表统计
- * </p>
- *
- * @author zhangjing
- * @since 2023-10-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)