添加合同状态

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

@@ -92,4 +92,6 @@ public class PowerStationDto  extends BaseDto {
     @ApiModelProperty(value = "盖章状态")
     private String stampStatus;
     
+    @ApiModelProperty(value = "合同状态")
+    private String status;
 }

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

@@ -11,8 +11,9 @@
     hygf_peasant_household.developer_code,
     hygf_peasant_household.developer_user_id,
     hygf_peasant_household.project_address_detail,
-    b.stamp_status
-    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id from  hygf_household_contract where   hygf_household_contract.status !='已作废'
+    b.stamp_status,
+    b.status
+    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id,stamp_status,status from  hygf_household_contract where   hygf_household_contract.status !='已作废'
     ) b    on b.peasant_household_id=hygf_power_station.peasant_household_id
     LEFT JOIN hygf_peasant_household on hygf_peasant_household.sequence_nbr=hygf_power_station.peasant_household_id
     where hygf_power_station.is_delete=0