修改bug

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

@@ -134,6 +134,6 @@ public class HouseholdContractDto  extends BaseDto {
      * */
 
     private Date signingTime;
-    private String userId;
+    private String projectUserId;
 
 }

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

@@ -246,6 +246,6 @@ public class HouseholdContract extends BaseEntity {
     private Date signingTime;
 
 
-    @TableField("user_id")
-    private String userId;
+    @TableField("project_user_id")
+    private String projectUserId;
 }

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

@@ -210,7 +210,7 @@ public class HouseholdContractController extends BaseController {
         householdContract.setDealerId(peasantHousehold.getDealerId());
         householdContract.setDealerCode(peasantHousehold.getDealerCode());
         householdContract.setDealerName(peasantHousehold.getDealerName());
-        householdContract.setPeasantHouseholdId(peasantHousehold.getSequenceNbr());
+        householdContract.setPeasantHouseholdId(peasantHousehold.getPeasantHouseholdId());
         householdContract.setRegionalCompaniesCode(peasantHousehold.getRegionalCompaniesCode());
         householdContract.setRegionalCompaniesName(peasantHousehold.getRegionalCompaniesName());
         householdContract.setRegionalCompaniesSeq(peasantHousehold.getRegionalCompaniesSeq());
@@ -219,7 +219,8 @@ public class HouseholdContractController extends BaseController {
         householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
         householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
-        householdContract.setUserId(peasantHousehold.getUserId());
+        householdContract.setProjectUserId(peasantHousehold.getProjectUserId());
+        householdContract.setSurveyStatus(peasantHousehold.getSurveyStatus());
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
         householdContractServiceImpl.reissueinitiateHouseholdContract(peasantHousehold,householdContract.getSequenceNbr());

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

@@ -182,7 +182,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
         householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
-        householdContract.setUserId(peasantHousehold.getUserId());
+        householdContract.setProjectUserId(peasantHousehold.getUserId());
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
         return peasantHousehold;

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

@@ -148,6 +148,11 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                     break;
                 case 法务审核:
                     powerStation.setBusinessStatus(resultObj.getName());
+
+                    if (VERIFY_RESULT_YES.equals(result)) {
+
+                    }
+
                     break;
                 case 文件审核:
                     if (VERIFY_RESULT_YES.equals(result)) {