选择电站回显

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

@@ -16,11 +16,14 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
     List<PeasantHousehold> selectPeasantHouseholdList(@Param("developerId") Long developerId,
                                                       @Param("regionalCompaniesSeq")Long regionalCompaniesSeq,
                                                       @Param("peasantHouseholdNo")String peasantHouseholdNo,
-                                                      @Param("ownersName")String ownersName
+                                                      @Param("ownersName")String ownersName,
+                                                      @Param("ids")String ids
     );
     List<PeasantHousehold> selectPeasantHouseholdListsg(@Param("developerId") Long developerId,
                                                       @Param("regionalCompaniesSeq")Long regionalCompaniesSeq,
                                                       @Param("peasantHouseholdNo")String peasantHouseholdNo,
-                                                      @Param("ownersName")String ownersName
+                                                      @Param("ownersName")String ownersName,
+                                                        @Param("ids")String ids
+
     );
 }

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

@@ -12,6 +12,10 @@ and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
 and hygf_peasant_household.survey_or_not=3 and  hygf_peasant_household.sequence_nbr not in
 (select hygf_document_station.station_id  from hygf_preparation_money LEFT JOIN hygf_document_station
 on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where hygf_preparation_money.delivery_state !='已作废'
+    <if test="ids!=null and ids !=''">
+        and hygf_document_station.preparation_money_id !=#{ids}
+    </if>
+
 and hygf_document_station.station_id is not null
 )
     <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
@@ -34,6 +38,10 @@ and hygf_document_station.station_id is not null
         and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
         and hygf_peasant_household.sequence_nbr not in (
         select hygf_work_order_power_station.peasant_household_id   from hygf_work_order_power_station
+        where 1=1
+        <if test="ids!=null and ids !=''">
+           and hygf_work_order_power_station.work_order_id !=#{ids}
+        </if>
         )
         <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
             and hygf_peasant_household.peasant_household_no like concat(concat("%",#{peasantHouseholdNo}),"%")

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

@@ -739,7 +739,7 @@ public class UnitInfoController extends BaseController {
 
     ) {
         UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
-        List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,null,null);
+        List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,null,null,null);
         List<Map<String,Object>> date=new ArrayList<>();
 
         if(list!=null){
@@ -763,10 +763,11 @@ public class UnitInfoController extends BaseController {
             @RequestParam(value = "current") int current,
             @RequestParam (value = "size") int size,
             @RequestParam (required=false) String peasantHouseholdNo,
-             @RequestParam (required=false) String ownersName
+             @RequestParam (required=false) String ownersName,
+            @RequestParam (required=false) String ids
 
     ) {
-        return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdData( unitInfoId,regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName));
+        return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdData( unitInfoId,regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName,ids));
     }
 
 
@@ -829,11 +830,12 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
             @RequestParam(value = "current") int current,
             @RequestParam (value = "size") int size,
             @RequestParam (required=false) String peasantHouseholdNo,
-            @RequestParam (required=false) String ownersName
+            @RequestParam (required=false) String ownersName,
+            @RequestParam (required=false) String ids
 
     ) {
         UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-        return ResponseHelper.buildResponse(unitInfoServiceImpl.selectPeasantHouseholdListsg( userUnitInformationDto.getAmosDealerId(),regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName));
+        return ResponseHelper.buildResponse(unitInfoServiceImpl.selectPeasantHouseholdListsg( userUnitInformationDto.getAmosDealerId(),regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName, ids));
     }
 
 }

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

@@ -815,10 +815,11 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                               int pageNum,
                               int pageSize,
                               String peasantHouseholdNo,
-                              String ownersName){
+                              String ownersName,
+                              String ids){
         PageHelper.startPage(pageNum, pageSize);
         UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
-        List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,peasantHouseholdNo,ownersName);
+        List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,peasantHouseholdNo,ownersName,ids);
         PageInfo<PeasantHousehold> page = new PageInfo(list);
         Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
         pagenew.setCurrent(pageNum);
@@ -832,9 +833,10 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                                                              int pageNum,
                                                              int pageSize,
                                                              String peasantHouseholdNo,
-                                                             String ownersName){
+                                                             String ownersName,
+                                                                  String ids){
         PageHelper.startPage(pageNum, pageSize);
-        List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdListsg(unitInfoId,regionalCompaniesSeq,peasantHouseholdNo,ownersName);
+        List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdListsg(unitInfoId,regionalCompaniesSeq,peasantHouseholdNo,ownersName,ids);
         PageInfo<PeasantHousehold> page = new PageInfo(list);
         Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
         pagenew.setCurrent(pageNum);