前端对接问题修复53

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java

@@ -149,7 +149,7 @@ public class ApiCommissionController {
                 .eq(Commission::getReconciliationYearMonth, reconciliationYearMonth));
                 .eq(Commission::getReconciliationYearMonth, reconciliationYearMonth));
 
 
         // 数据处理
         // 数据处理
-        List<Commission> entities = processData(dataList, loginUserId);
+        List<Commission> entities = processData(dataList, loginUserId, reconciliationYearMonth);
 
 
 //        // 转换为 VO
 //        // 转换为 VO
 //        List<CommissionVO> commissionVOList = commissionService.getCommissionList(entities);
 //        List<CommissionVO> commissionVOList = commissionService.getCommissionList(entities);
@@ -209,12 +209,13 @@ public class ApiCommissionController {
     /**
     /**
      * 1.处理导入的数据
      * 1.处理导入的数据
      */
      */
-    private List<Commission> processData(List<CommissionExcelDTO> dataList, String loginUserId) {
+    private List<Commission> processData(List<CommissionExcelDTO> dataList, String loginUserId, String reconciliationYearMonth) {
         List<Commission> entities = new ArrayList<>();
         List<Commission> entities = new ArrayList<>();
         for (CommissionExcelDTO data : dataList) {
         for (CommissionExcelDTO data : dataList) {
             // 数据验证
             // 数据验证
             Commission entity = CommissionExcelDTO.convertToEntityNew(data, loginUserId);
             Commission entity = CommissionExcelDTO.convertToEntityNew(data, loginUserId);
             entity.setCommissionBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_COMMISSION.getCode()));
             entity.setCommissionBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_COMMISSION.getCode()));
+            entity.setReconciliationYearMonth(reconciliationYearMonth);
             entities.add(entity);
             entities.add(entity);
         }
         }
 
 

yd-csf-service/src/main/java/com/yd/csf/service/service/PolicyService.java

@@ -6,6 +6,8 @@ import com.yd.csf.service.dto.*;
 import com.yd.csf.service.model.Policy;
 import com.yd.csf.service.model.Policy;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yd.csf.service.vo.PolicyVO;
 import com.yd.csf.service.vo.PolicyVO;
+
+import java.util.Collection;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -28,5 +30,7 @@ public interface PolicyService extends IService<Policy> {
 
 
     List<QueryPolicyAndBrokerDto> queryPolicyBrokerList(String policyNo);
     List<QueryPolicyAndBrokerDto> queryPolicyBrokerList(String policyNo);
 
 
-    List<Map<String, Object>> getPolicyProductInfo(List<String> productLaunchBizIdList);
+    List<PolicyProductInfo> getPolicyProductInfo(List<String> productLaunchBizIdList);
+
+    Map<String, PolicyProductInfo> getPolicyProductInfoMap(Collection<String> productLaunchBizIdList);
 }
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyServiceImpl.java

@@ -38,6 +38,7 @@ import org.springframework.util.CollectionUtils;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -183,7 +184,7 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
     }
     }
 
 
     @Override
     @Override
-    public List<Map<String, Object>> getPolicyProductInfo(List<String> productLaunchBizIdList) {
+    public List<PolicyProductInfo> getPolicyProductInfo(List<String> productLaunchBizIdList) {
         ApiRelProjectProductLaunchPageRequest pageRequest = new ApiRelProjectProductLaunchPageRequest();
         ApiRelProjectProductLaunchPageRequest pageRequest = new ApiRelProjectProductLaunchPageRequest();
         pageRequest.setProductLaunchBizIdList(productLaunchBizIdList);
         pageRequest.setProductLaunchBizIdList(productLaunchBizIdList);
         pageRequest.setPageNo(1);
         pageRequest.setPageNo(1);
@@ -201,7 +202,7 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
 
 
             // 直接使用Map来处理数据，避免复杂的类型转换
             // 直接使用Map来处理数据，避免复杂的类型转换
             Object data = result.getData();
             Object data = result.getData();
-            List<Map<String, Object>> policyProductInfoList = new ArrayList<>();
+            List<PolicyProductInfo> policyProductInfoList = new ArrayList<>();
 
 
             // 将数据转换为JSONObject进行解析
             // 将数据转换为JSONObject进行解析
             JSONObject jsonObject = JSONUtil.parseObj(data);
             JSONObject jsonObject = JSONUtil.parseObj(data);
@@ -212,20 +213,20 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
                 for (int i = 0; i < recordsArray.size(); i++) {
                 for (int i = 0; i < recordsArray.size(); i++) {
                     JSONObject record = recordsArray.getJSONObject(i);
                     JSONObject record = recordsArray.getJSONObject(i);
 
 
-                    Map<String, Object> infoMap = new HashMap<>();
-                    infoMap.put("productLaunchBizId", record.getStr("productLaunchBizId"));
-                    infoMap.put("productName", record.getStr("productName"));
-                    infoMap.put("title", record.getStr("title"));
-                    infoMap.put("shortTitle", record.getStr("shortTitle"));
-                    infoMap.put("status", record.getStr("status"));
+                    PolicyProductInfo productInfo = new PolicyProductInfo();
+                    productInfo.setProductLaunchBizId(record.getStr("productLaunchBizId"));
+                    productInfo.setProductName(record.getStr("productName"));
+                    productInfo.setTitle(record.getStr("title"));
+                    productInfo.setShortTitle(record.getStr("shortTitle"));
+                    productInfo.setStatus(record.getStr("status"));
 
 
                     // 解析自定义属性
                     // 解析自定义属性
                     JSONArray attributeSettingArray = record.getJSONArray("apiAttributeSettingDtoList");
                     JSONArray attributeSettingArray = record.getJSONArray("apiAttributeSettingDtoList");
                     if (attributeSettingArray != null) {
                     if (attributeSettingArray != null) {
-                        getInfoFromJsonArray(attributeSettingArray, infoMap);
+                        getInfoFromJsonArray(attributeSettingArray, productInfo);
                     }
                     }
 
 
-                    policyProductInfoList.add(infoMap);
+                    policyProductInfoList.add(productInfo);
                 }
                 }
             }
             }
 
 
@@ -237,10 +238,22 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
         }
         }
     }
     }
 
 
+    @Override
+    public Map<String, PolicyProductInfo> getPolicyProductInfoMap(Collection<String> productLaunchBizIdList) {
+        // 校验参数
+        if (CollectionUtils.isEmpty(productLaunchBizIdList)) {
+            return Collections.emptyMap();
+        }
+
+        List<PolicyProductInfo> policyProductInfoList = getPolicyProductInfo(new ArrayList<>(productLaunchBizIdList));
+        return policyProductInfoList.stream()
+                .collect(Collectors.toMap(PolicyProductInfo::getProductLaunchBizId, Function.identity()));
+    }
+
     /**
     /**
      * 从JSON数组中解析自定义属性
      * 从JSON数组中解析自定义属性
      */
      */
-    private void getInfoFromJsonArray(JSONArray attributeSettingArray, Map<String, Object> infoMap) {
+    private void getInfoFromJsonArray(JSONArray attributeSettingArray, PolicyProductInfo productInfo) {
         if (attributeSettingArray == null || attributeSettingArray.isEmpty()) {
         if (attributeSettingArray == null || attributeSettingArray.isEmpty()) {
             return;
             return;
         }
         }
@@ -253,22 +266,21 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
             // 根据属性名称设置对应的字段
             // 根据属性名称设置对应的字段
             switch (name) {
             switch (name) {
                 case "保险公司":
                 case "保险公司":
-                    infoMap.put("insuranceCompany", value);
-                    infoMap.put("insuranceCompanyBizId", attribute.getStr("fieldValueBizId"));
+                    productInfo.setInsuranceCompany(value);
+                    productInfo.setInsuranceCompanyBizId(attribute.getStr("fieldValueBizId"));
                     break;
                     break;
                 case "对账公司":
                 case "对账公司":
-                    infoMap.put("reconciliationCompany", value);
-                    infoMap.put("reconciliationCompanyBizId", attribute.getStr("fieldValueBizId"));
+                    productInfo.setReconciliationCompany(value);
+                    productInfo.setReconciliationCompanyBizId(attribute.getStr("fieldValueBizId"));
                     break;
                     break;
                 case "产品计划类型":
                 case "产品计划类型":
-                    infoMap.put("productPlanType", value);
+                    productInfo.setProductPlanType(value);
                     break;
                     break;
                 case "是否区分吸烟":
                 case "是否区分吸烟":
-                    infoMap.put("isSmokingDistinguish", value);
+                    productInfo.setIsSmokingDistinguish(value);
                     break;
                     break;
                 default:
                 default:
                     // 其他自定义属性
                     // 其他自定义属性
-                    infoMap.put(name, value);
                     break;
                     break;
             }
             }
         }
         }