添加字段

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

@@ -79,4 +79,5 @@ public class AcceptanceCheckDto  extends BaseDto {
 
 // 电站安装规模
  private String scale;
+ private String realScale;
 }

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

@@ -76,4 +76,6 @@ public class BasicGridRecordDto  extends BaseDto {
 
  //    电站安装规模(kW)
  private String scale;
+
+ private String realScale;
 }

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

@@ -97,4 +97,6 @@ public class PowerStationDto  extends BaseDto {
 
     @ApiModelProperty(value = "电站安装规模")
     private String scale;
+    @ApiModelProperty(value = "电站实际规模")
+    private String realScale;
 }

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

@@ -86,4 +86,6 @@ public class WorkOrderPage {
 
     @ApiModelProperty(value = "电站安装规模")
     private String  scale ;
+    @ApiModelProperty(value = "电站实际规模")
+    private String  realScale ;
 }

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

@@ -260,4 +260,7 @@ public class HouseholdContract extends BaseEntity {
 
     @TableField(exist = false)
     private String scale;
+
+    @TableField(exist = false)
+    private String realScale;
 }

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

@@ -217,8 +217,14 @@ public class PeasantHousehold extends BaseEntity {
     private Integer isAllRevoke;
 
     /**
-     * 商务信息安装规模
+     * 电站规模
      */
     @TableField(exist = false)
     private String scale;
+
+    /**
+     * 电站规模
+     */
+    @TableField(exist = false)
+    private String realScale;
 }

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

@@ -45,6 +45,12 @@ public class PowerStationEngineeringInfo extends BaseEntity {
     private Integer componentQuantity;
 
     /**
+     * 组件数量
+     */
+    @TableField("real_scale")
+    private Double realScale;
+
+    /**
      * 逆变器数量
      */
 	@TableField("inverter_quantity")

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

@@ -51,5 +51,5 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
 
     void deleteHhcByNo(String peasantHouseholdNo);
 
-    String getHygfCommercialScale(Long surveyInformationId);
+//    String getHygfCommercialScale(Long surveyInformationId);
 }

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

@@ -11,4 +11,5 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationEngineeringInfo;
  */
 public interface PowerStationEngineeringInfoMapper extends BaseMapper<PowerStationEngineeringInfo> {
 
+    String getRealScaleByPeasantHouseholdNo(String peasantHouseholdNumber);
 }

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

@@ -134,7 +134,7 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         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>
+<!--    <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-api/src/main/resources/mapper/mysql/PowerStationEngineeringInfoMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper">
-
+    <select id="getRealScaleByPeasantHouseholdNo" resultType="String">
+       select
+           hpsei.real_scale realScale
+       from
+           hygf_peasant_household hph,
+           hygf_work_order_power_station hwops,
+           hygf_power_station_engineering_info hpsei
+       where
+           hph.peasant_household_no = #{peasantHouseholdNo} and
+           hph.sequence_nbr = hwops.peasant_household_id and
+           hwops.sequence_nbr = hpsei.work_order_power_station_id
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -11,10 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentStationMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfReplenishmentServiceImpl;
@@ -56,6 +53,8 @@ public class PreparationMoneyController extends BaseController {
     PreparationMoneyMapper preparationMoneyMapper;
 	@Autowired
 	HouseholdContractMapper householdContractMapper;
+	@Autowired
+	PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
     @Autowired
     DesignInformationServiceImpl designInformationService;
     @Autowired
@@ -233,6 +232,7 @@ public class PreparationMoneyController extends BaseController {
 			list.forEach(e -> {
 				if(e.getPeasantHouseholdNo() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java

@@ -46,6 +46,8 @@ public class WorkOrderController extends BaseController {
     WorkOrderMapper workOrderMapper;
     @Autowired
     HouseholdContractMapper householdContractMapper;
+    @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
 
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
@@ -231,6 +233,7 @@ public class WorkOrderController extends BaseController {
                 }
                 if(e.getPeasantHouseholdNo() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
 
             });
@@ -256,6 +259,7 @@ public class WorkOrderController extends BaseController {
             list.forEach(e -> {
                 if(e.getPeasantHouseholdNo() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
 

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

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceCheckService;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.component.robot.BadRequest;
@@ -56,6 +57,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     @Autowired
     AcceptanceCheckMapper acceptanceCheckMapper;
     @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
     @Autowired
     HouseholdContractMapper householdContractMapper;
@@ -88,6 +91,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             list.forEach(e -> {
                 if(e.getPeasantHouseholdNo() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
         }

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

@@ -57,6 +57,8 @@ public class BasicGridAcceptanceServiceImpl
 	@Autowired
 	PersonnelBusinessMapper personnelBusinessMapper;
 	@Autowired
+	PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+	@Autowired
 	WorkflowImpl workflow;
 	@Autowired
 	AcceptanceCheckItemMapper acceptanceCheckItemMapper;
@@ -120,6 +122,7 @@ public class BasicGridAcceptanceServiceImpl
 			page.getList().forEach(e -> {
 				if(e.getPeasantHouseholdNo() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});
 		}

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

@@ -30,6 +30,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingRectificationOrder;
 import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IFinancingInfoService;
 import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
@@ -74,6 +75,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     @Autowired
     private HouseholdContractMapper householdContractMapper;
     @Autowired
+    private PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     private CommonServiceImpl commonService;
 
     @Resource(type = RedisLockUtil.class)
@@ -104,6 +107,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         List<Map<String, Object>> list = financingInfoMapper.getStationFinancingInfoList(params, amosOrgCodes);
         list.forEach(e -> {
             e.put("scale", householdContractMapper.getHygfCommercialScale((String) e.get("peasantHouseholdNo")));
+            e.put("realScale", powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo((String) e.get("peasantHouseholdNo")));
 
             if (null != e.get("instanceId") && e.get("instanceId").toString().contains(",")) {
                 String[] instanceIds = e.get("instanceId").toString().split(",");

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

@@ -49,6 +49,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
     ContractTemplateMapper contractTemplateMapper;
 
     @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+
+    @Autowired
     ToDoTasksServiceImpl toDoTasksServiceImpl;
 
     @Autowired
@@ -97,6 +100,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
             warningQuestionInfoIPage.getRecords().forEach(e -> {
                 if(e.getPeasantHouseholdNumber() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNumber()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNumber()));
                 }
             });
 

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

@@ -22,7 +22,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationEngineeringInfo;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -134,6 +136,9 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 	@Resource(type = HouseholdContractMapper.class)
 	private HouseholdContractMapper householdContractMapper;
 
+	@Resource(type = PowerStationEngineeringInfoMapper.class)
+	private PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+
 	@Resource(type = HygfIcbcRequestMapper.class)
 	private HygfIcbcRequestMapper hygfIcbcRequestMapper;
 
@@ -424,6 +429,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 			peasantHouseholdList.forEach(e -> {
 				if(e.getSurveyInformationId() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});
 		}

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

@@ -22,9 +22,7 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
@@ -77,6 +75,10 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
     @Autowired
+    HouseholdContractMapper householdContractMapper;
+    @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     SurveyInformationServiceImpl surveyInformationServiceImpl;
     @Autowired
     HouseholdContractServiceImpl householdContractServiceImpl;
@@ -274,8 +276,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
         if(newRecords != null && newRecords.size() > 0) {
             newRecords.forEach(e -> {
-                if(e.getSurveyInformationId() != null) {
-                    e.setScale(peasantHouseholdMapper.getHygfCommercialScale(e.getSurveyInformationId()));
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
 
@@ -929,8 +932,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
         if(peasantHouseholdIPage.getRecords() != null && peasantHouseholdIPage.getRecords().size() > 0) {
             peasantHouseholdIPage.getRecords().forEach(e -> {
-                if(e.getSurveyInformationId() != null) {
-                    e.setScale(peasantHouseholdMapper.getHygfCommercialScale(e.getSurveyInformationId()));
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
 

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

@@ -61,6 +61,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     DesignInformationMapper designInformationMapper;
     @Autowired
     DesignInformationServiceImpl designInformationService;
+	@Autowired
+	PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
     @Autowired
     PeasantHouseholdServiceImpl peasantHouseholdService;
 
@@ -126,6 +128,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 			powerStationDtoPage.getRecords().forEach(e -> {
 				if(e.getPowerStationCode() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPowerStationCode()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPowerStationCode()));
 				}
 			});
 

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

@@ -78,6 +78,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
     @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     HouseholdContractMapper householdContractMapper;
     @Autowired
     CommerceInfoMapper commerceInfoMapper;
@@ -1086,6 +1088,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             list.forEach(e -> {
                 if(e.getPeasantHouseholdNo() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
         }

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

@@ -314,6 +314,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			list.forEach(e -> {
 				if(e.getPeasantHouseholdNo() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});
 		}
@@ -532,6 +533,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			list.forEach(e -> {
 				if(e.getPeasantHouseholdNo() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});