Commit 8b7197dc authored by tianbo's avatar tianbo

feat(equip-claim): 添加待认领设备使用单位信用代码过滤功能

- 在待认领设备查询中过滤掉已在平台注册的使用单位统一社会信用代码对应数据
parent 039a3022
......@@ -36,8 +36,8 @@ import com.yeejoin.amos.boot.module.jg.biz.service.*;
import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
......@@ -55,7 +55,6 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.sort.SortOrder;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
......@@ -187,6 +186,11 @@ public class EquipClaimServiceImpl {
dBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, false));
boolMust.must(dBuilder);
// TODO 待认领设备使用单位单位统一社会信用代码如果已在系统中存在则不显示
List<String> unitCreditCodes = tzBaseEnterpriseInfoMapper.getUseUnitCreditCodes();
if (!ValidationUtil.isEmpty(unitCreditCodes)) {
boolMust.mustNot(QueryBuilders.termsQuery("USE_UNIT_CREDIT_CODE.keyword", unitCreditCodes));
}
// -------------------------------- 参数过滤
this.buildSetSearchParams(params, boolMust);
......
......@@ -124,4 +124,5 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
*/
List<TzBaseEnterpriseInfoDto> queryInspectionUnitListByUseUnitCode(@Param("unitCode") String unitCode, @Param("openBizType") String openBizType);
List<String> getUseUnitCreditCodes();
}
......@@ -418,4 +418,8 @@
and info.is_delete = '0'
and exists (SELECT 1 from tz_jyjc_opening_application where unit_code = #{unitCode} and status = '已完成' and open_biz_type = #{openBizType})
</select>
<select id="getUseUnitCreditCodes" resultType="java.lang.String">
select use_unit_code from tz_base_enterprise_info where unit_type like '%使用单位%' or unit_type like '%个人主体%'
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment