待发货电站新建发货单时电站列表添加字段

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DocumentStation.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 
  *
@@ -54,4 +56,10 @@ public class DocumentStation extends BaseEntity {
      */
     @TableField("project_address_name")
     private String projectAddressName;
+
+    @TableField(exist = false)
+    private String scale;
+
+    @TableField(exist = false)
+    private String realScale;
 }

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

@@ -1233,6 +1233,13 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             documentStation.setOwnersName(e.getOwnersName());
             documentStation.setDeveloperName(e.getDeveloperName());
             documentStation.setPeasantHouseholdNo(e.getPeasantHouseholdNo());
+
+            if(e.getPeasantHouseholdNo() != null) {
+                documentStation.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                documentStation.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+            }
+
+
             documentStation.setProjectAddressName(e.getProjectAddressName()+"/"+e.getProjectAddressDetail());
             stations.add(documentStation);
         });