修改查询bug

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

@@ -84,7 +84,7 @@ public class HouseholdPvDto extends BaseDto {
 	private String serviceAddress;
 
 	@ApiModelProperty(value = "组织机构code")
-	private String orgCode;
+	private String bizOrgCode;
 
 	@ApiModelProperty(value = "告警等级")
 	private String level;

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

@@ -125,8 +125,8 @@ public class HouseholdPv extends BaseEntity {
 	/**
 	 * 组织机构code
 	 */
-	@TableField("org_code")
-	private String orgCode;
+	@TableField("biz_org_code")
+	private String bizOrgCode;
 
 	/**
 	 * 告警等级

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

@@ -4,13 +4,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDeviceDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvExport;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvImport;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPv;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 户用光伏表 Mapper 接口
@@ -25,5 +23,5 @@ public interface HouseholdPvMapper extends BaseMapper<HouseholdPv> {
     List<HouseholdPvDeviceDto> selectEquipList(@Param("id")Long id );
 
 
-    Page<HouseholdPvDto> selectPageMessage(@Param("page")Page<HouseholdPvDto> page, @Param("dto") HouseholdPvDto dto, @Param("ids")  List<Long> ids);
+    Page<HouseholdPvDto> selectPageMessage(@Param("page")Page<HouseholdPvDto> page, @Param("dto") HouseholdPvDto dto);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/HouseholdPvMapper.xml

@@ -72,11 +72,8 @@
             <if test="dto.number != null and dto.number != ''">
                 and hp.number like concat('%',#{dto.number},'%')
             </if>
-            <if test="ids != null and ids.size > 0">
-                and hp.platform_company_id in
-                <foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+            <if test="dto.bizOrgCode != null and dto.bizOrgCode != ''">
+                and hp.biz_org_code like concat('%',#{dto.bizOrgCode},'%')
             </if>
         </where>
     </select>

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

@@ -72,26 +72,13 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 	 */
 	public IPage<HouseholdPvDto> queryForHouseholdPvPage(Page<HouseholdPvDto> page, HouseholdPvDto dto) {
 		String bizOrgCode = null;
-		List<Long> ids = new ArrayList<>();
 		if (!ObjectUtils.isEmpty(dto.getPlatformCompanyId())) {
-			HouseholdPvDistrict parentDetail = householdPvDistrictMapper.selectById(dto.getPlatformCompanyId());
-			if (ObjectUtils.isEmpty(parentDetail)) {
-				FeignClientResult<CompanyModel> companyModelFeignClientResult = Privilege.companyClient.seleteOne(dto.getPlatformCompanyId());
-				CompanyModel result = companyModelFeignClientResult.getResult();
-				if (!ObjectUtils.isEmpty(result)) {
-					bizOrgCode = result.getOrgCode();
-				}
-			} else {
-				bizOrgCode = parentDetail.getBizOrgCode();
-			}
+			bizOrgCode = getOrgCode(dto.getPlatformCompanyId());
 			if (!ObjectUtils.isEmpty(bizOrgCode)) {
-				ids = householdPvDistrictMapper.selectIds(bizOrgCode);
-				if (ObjectUtils.isEmpty(ids)) {
-					return new Page<>();
-				}
+				dto.setBizOrgCode(bizOrgCode);
 			}
 		}
-		Page<HouseholdPvDto> householdPvDtoPage = householdPvMapper.selectPageMessage(page, dto, ids);
+		Page<HouseholdPvDto> householdPvDtoPage = householdPvMapper.selectPageMessage(page, dto);
 		Map<String, Object> map = companyList();
 		householdPvDtoPage.getRecords().forEach(data -> {
 			data.setPlatformCompanyName(String.valueOf(map.get(data.getPlatformCompanyId().toString())));
@@ -150,6 +137,7 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 			if (!ObjectUtils.isEmpty(item.getPlatformCompanyId())) {
 				if (map.containsKey(item.getPlatformCompanyId())) {
 					householdPv.setPlatformCompanyId(Long.parseLong(String.valueOf(map.get(item.getPlatformCompanyId()))));
+					householdPv.setBizOrgCode(getOrgCode(householdPv.getPlatformCompanyId()));
 				}
 			}
 			householdPvs.add(householdPv);
@@ -210,6 +198,21 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 
 	}
 
+	private String getOrgCode(Long platformCompanyId) {
+		String bizOrgCode = null;
+		HouseholdPvDistrict parentDetail = householdPvDistrictMapper.selectById(platformCompanyId);
+		if (ObjectUtils.isEmpty(parentDetail)) {
+			FeignClientResult<CompanyModel> companyModelFeignClientResult = Privilege.companyClient.seleteOne(platformCompanyId);
+			CompanyModel result = companyModelFeignClientResult.getResult();
+			if (!ObjectUtils.isEmpty(result)) {
+				bizOrgCode = result.getOrgCode();
+			}
+		} else {
+			bizOrgCode = parentDetail.getBizOrgCode();
+		}
+		return bizOrgCode;
+	}
+
 	private StringBuilder equipMessage(List<HouseholdPvDeviceDto> list) {
 		StringBuilder stringBuilder = new StringBuilder();
 		list.forEach(item -> {
@@ -242,6 +245,7 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 	public HouseholdPvDto save(HouseholdPvDto householdPvDto) {
 		HouseholdPv householdPv = new HouseholdPv();
 		BeanUtils.copyProperties(householdPvDto, householdPv);
+		householdPv.setBizOrgCode(getOrgCode(householdPv.getPlatformCompanyId()));
 		this.save(householdPv);
 
 		HouseholdPvContact householdPvContact = new HouseholdPvContact();
@@ -266,6 +270,7 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 	public HouseholdPvDto update(HouseholdPvDto householdPvDto) {
 		HouseholdPv householdPv = new HouseholdPv();
 		BeanUtils.copyProperties(householdPvDto, householdPv);
+		householdPv.setBizOrgCode(getOrgCode(householdPv.getPlatformCompanyId()));
 		this.updateById(householdPv);
 
 		HouseholdPvContact householdPvContact = new HouseholdPvContact();