我的电站添加电站规模

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

@@ -215,4 +215,10 @@ public class PeasantHousehold extends BaseEntity {
      */
     @TableField(exist = false)
     private Integer isAllRevoke;
+
+    /**
+     * 商务信息安装规模
+     */
+    @TableField(exist = false)
+    private String scale;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java

@@ -50,4 +50,6 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
     void deleteHphByNo(String peasantHouseholdNo);
 
     void deleteHhcByNo(String peasantHouseholdNo);
+
+    String getHygfCommercialScale(Long surveyInformationId);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml

@@ -133,4 +133,8 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
     <select id="deleteHhcByNo">
         DELETE FROM hygf_household_contract WHERE peasant_household_number=#{peasantHouseholdNo}
     </select>
+
+    <select id="getHygfCommercialScale" resultType="String">
+        select scale from hygf_commercial where survey_information_id=${surveyInformationId}
+    </select>
 </mapper>

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

@@ -916,6 +916,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         queryWrapper.orderByDesc("rec_date");
         IPage<PeasantHousehold> peasantHouseholdIPage = this.baseMapper.selectPage(new Page<>(peasantHouseholdPageDto.getCurrent(), peasantHouseholdPageDto.getSize()), queryWrapper);
 
+
+        if(peasantHouseholdIPage.getRecords() != null && peasantHouseholdIPage.getRecords().size() > 0) {
+            peasantHouseholdIPage.getRecords().forEach(e -> {
+                if(e.getSurveyInformationId() != null) {
+                    e.setScale(peasantHouseholdMapper.getHygfCommercialScale(e.getSurveyInformationId()));
+                }
+            });
+
+        }
+
         return peasantHouseholdIPage;
     }
 }
\ No newline at end of file