修改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;
 
 }

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

@@ -38,4 +38,8 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
      * 签字状态
      */
     private String signStatus;
+
+
+    private String userId;
+
 }

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

@@ -245,4 +245,7 @@ public class HouseholdContract extends BaseEntity {
     @TableField("signing_time")
     private Date signingTime;
 
+
+    @TableField("user_id")
+    private String userId;
 }

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

@@ -219,9 +219,10 @@ public class HouseholdContractController extends BaseController {
         householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
         householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
+        householdContract.setUserId(peasantHousehold.getUserId());
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
-        householdContractServiceImpl.reissueinitiateHouseholdContract(householdContract,householdContract.getSequenceNbr());
+        householdContractServiceImpl.reissueinitiateHouseholdContract(peasantHousehold,householdContract.getSequenceNbr());
 
         return ResponseHelper.buildResponse(householdContract);
     }

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

@@ -72,6 +72,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         qw.eq(StringUtils.isNotEmpty(dto.getInitiateStatus()), "initiate_status",dto.getInitiateStatus() );
         qw.eq(StringUtils.isNotEmpty(dto.getSurveyStatus()), "survey_status",dto.getSurveyStatus() );
         qw.eq(StringUtils.isNotEmpty(dto.getSignStatus()), "sign_status",dto.getSignStatus() );
+        qw.eq(StringUtils.isNotEmpty(dto.getUserId()), "user_id",dto.getUserId() );
+
+
 
         if (StringUtils.isNotEmpty(dto.getOrderBy())) {
             qw.orderBy(Boolean.TRUE, dto.getIsASC(), dto.getOrderBy());

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

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