聚富通电子钱包列表添加字段

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfIcbcRecordDTO.java

@@ -158,6 +158,12 @@ public class HygfIcbcRecordDTO  {
          * */
         @ApiModelProperty(value = "区域公司名称")
         private String regionalCompaniesName;
+
+        /*
+         * 商务信息-电站安装规模
+         * */
+        @ApiModelProperty(value = "电站安装规模(kW)")
+        private String scale;
     }
 
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfIcbcServiceImpl.java

@@ -22,6 +22,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -62,6 +64,9 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 @Slf4j
 public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbcRecord, HygfIcbcRecordMapper>
+
+
+
 		implements IHygfIcbcService {
 
 	private static final String trxChannel = "05"; // 05表示小程序
@@ -126,6 +131,9 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 	@Resource(type = HygfIcbcRecordMapper.class)
 	private HygfIcbcRecordMapper hygfIcbcRecordMapper;
 
+	@Resource(type = HouseholdContractMapper.class)
+	private HouseholdContractMapper householdContractMapper;
+
 	@Resource(type = HygfIcbcRequestMapper.class)
 	private HygfIcbcRequestMapper hygfIcbcRequestMapper;
 
@@ -412,6 +420,15 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 		Map<String, List<PeasantHousehold>> peasantHouseholdMap = peasantHouseholds.stream()
 				.collect(Collectors.groupingBy(PeasantHousehold::getAmosUserId));// 根据农户 ID 分组
 		List<PeasantHousehold> peasantHouseholdList = peasantHouseholdMap.get(amosUserId);
+
+		if(peasantHouseholdList != null && peasantHouseholdList.size() > 0) {
+			peasantHouseholdList.forEach(e -> {
+				if(e.getSurveyInformationId() != null) {
+					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+				}
+			});
+		}
+
 		hygfIcbcRecordDTO.setPeasantHouseholds(
 				Bean.toModels(peasantHouseholdList, HygfIcbcRecordDTO.IcbcPeasantHousehold.class));
 		return hygfIcbcRecordDTO;