客户表，fna表单表字段修改4

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

@@ -111,6 +111,8 @@ public class ApiCustomerController {
         if (customer == null) {
         if (customer == null) {
             return Result.fail(ResultCode.NULL_ERROR.getCode(), ResultCode.NULL_ERROR.getMessage());
             return Result.fail(ResultCode.NULL_ERROR.getCode(), ResultCode.NULL_ERROR.getMessage());
         }
         }
+        // 查询受供养人数量
+        customerService.queryDependentsNum(customer);
 
 
         // 获取封装类
         // 获取封装类
         return Result.success(customerService.getCustomerVO(customer));
         return Result.success(customerService.getCustomerVO(customer));

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

@@ -37,4 +37,6 @@ public interface CustomerService extends IService<Customer> {
     void validCustomer(Customer customer);
     void validCustomer(Customer customer);
 
 
     Boolean updateCustomer(CustomerUpdateRequest customerUpdateRequest);
     Boolean updateCustomer(CustomerUpdateRequest customerUpdateRequest);
+
+    void queryDependentsNum(Customer customer);
 }
 }

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

@@ -7,22 +7,25 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dao.CustomerMapper;
 import com.yd.csf.service.dao.CustomerMapper;
-import com.yd.csf.service.dto.CustomerAddRequest;
-import com.yd.csf.service.dto.CustomerQueryRequest;
-import com.yd.csf.service.dto.CustomerUpdateRequest;
+import com.yd.csf.service.dto.*;
 import com.yd.csf.service.model.Customer;
 import com.yd.csf.service.model.Customer;
 import com.yd.csf.service.model.CustomerExpand;
 import com.yd.csf.service.model.CustomerExpand;
-import com.yd.csf.service.service.CustomerExpandService;
+import com.yd.csf.service.model.FnaForm;
 import com.yd.csf.service.service.CustomerService;
 import com.yd.csf.service.service.CustomerService;
+import com.yd.csf.service.service.FnaFormService;
 import com.yd.csf.service.service.FnaService;
 import com.yd.csf.service.service.FnaService;
+import com.yd.csf.service.utils.GSONUtil;
 import com.yd.csf.service.utils.ValidateUtil;
 import com.yd.csf.service.utils.ValidateUtil;
 import com.yd.csf.service.vo.AddressVO;
 import com.yd.csf.service.vo.AddressVO;
 import com.yd.csf.service.vo.CustomerVO;
 import com.yd.csf.service.vo.CustomerVO;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -33,13 +36,13 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
-* @author Zhang Jianan
-* @description 针对表【customer(客户信息表)】的数据库操作Service实现
-* @createDate 2025-08-29 17:38:23
-*/
+ * @author Zhang Jianan
+ * @description 针对表【customer(客户信息表)】的数据库操作Service实现
+ * @createDate 2025-08-29 17:38:23
+ */
 @Service
 @Service
 public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
 public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
-    implements CustomerService{
+        implements CustomerService {
 
 
     private final static Gson GSON = new Gson();
     private final static Gson GSON = new Gson();
 
 
@@ -49,6 +52,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
     @Resource
     @Resource
     private FnaService fnaService;
     private FnaService fnaService;
 
 
+    @Resource
+    private FnaFormService fnaFormService;
+
 
 
     @Override
     @Override
     public CustomerVO getCustomerVO(Customer customer) {
     public CustomerVO getCustomerVO(Customer customer) {
@@ -180,6 +186,22 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
         return true;
         return true;
     }
     }
 
 
+    @Override
+    public void queryDependentsNum(Customer customer) {
+        QueryWrapper<FnaForm> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_biz_id", customer.getCustomerBizId());
+        queryWrapper.orderByDesc("id");
+        List<FnaForm> fnaFormList = fnaFormService.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(fnaFormList)) {
+            FnaForm fnaForm = fnaFormList.get(0);
+            if (ObjectUtils.isNotEmpty(fnaForm.getDependantList())) {
+                List<DependantData> dependantList = GSONUtil.fromJson((String) fnaForm.getDependantList(), new TypeToken<List<DependantData>>() {
+                }.getType());
+                customer.setDependentsNum(dependantList.size());
+            }
+        }
+    }
+
 }
 }