Merge remote-tracking branch 'origin/develop_tzs_register_test' into develop_tzs_register_test

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgProjectContraptionServiceImpl.java

@@ -191,6 +191,44 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         String useRegDetail = params.get("useRegDetail");
         // 登录人公司类型：企业，监管
         String companyLevel = this.getCompanyLevel(company);
+        // 未在业务流程中
+        boolean isNotInBusiness = !ValidationUtil.isEmpty(params.get("isNotInBusiness")) && params.get("isNotInBusiness").equals("true");
+        // 查询在业务流程中sql
+        String inBusinessSQL = "SELECT 1 FROM tzs_jg_change_registration_reform A WHERE\n" +
+                "  idx_biz_jg_project_contraption.sequence_nbr = A.\"project_contraption_id\" \n" +
+                "  AND A.\"is_delete\" = 0 \n" +
+                "  AND A.audit_status <> '使用单位待提交' \n" +
+                "  AND A.audit_status <> '一级受理已驳回' \n" +
+                "  AND A.audit_status <> '使用单位已撤回' \n" +
+                "  AND A.audit_status <> '已完成' \n" +
+                "  AND A.audit_status <> '已作废' UNION ALL\n" +
+                "SELECT 1 FROM tzs_jg_installation_notice A \n" +
+                "WHERE\n" +
+                "  idx_biz_jg_project_contraption.sequence_nbr = A.\"project_contraption_id\" \n" +
+                "  AND A.\"is_delete\" = 0 \n" +
+                "  AND A.notice_status <> '6614' \n" +
+                "  AND A.notice_status <> '6615' \n" +
+                "  AND A.notice_status <> '6610' \n" +
+                "  AND A.notice_status <> '6616' \n" +
+                "  AND A.notice_status <> '6617' UNION ALL\n" +
+                "SELECT 1 FROM tzs_jg_reform_notice A \n" +
+                "WHERE\n" +
+                "  idx_biz_jg_project_contraption.sequence_nbr = A.\"project_contraption_id\" \n" +
+                "  AND A.\"is_delete\" = 0 \n" +
+                "  AND A.notice_status <> '6614' \n" +
+                "  AND A.notice_status <> '6615' \n" +
+                "  AND A.notice_status <> '6610' \n" +
+                "  AND A.notice_status <> '6616' \n" +
+                "  AND A.notice_status <> '6617' UNION ALL\n" +
+                "SELECT 1 FROM  tzs_jg_use_registration A \n" +
+                "WHERE\n" +
+                "  idx_biz_jg_project_contraption.sequence_nbr = A.\"project_contraption_id\" \n" +
+                "  AND A.\"is_delete\" = 0 \n" +
+                "  AND A.status <> '使用单位待提交' \n" +
+                "  AND A.status <> '一级受理已驳回' \n" +
+                "  AND A.status <> '使用单位已撤回' \n" +
+                "  AND A.status <> '已完成' \n" +
+                "  AND A.status <> '已作废'";
         IPage<IdxBizJgProjectContraption> pageList = lambdaQuery()
                 // 企业按照公司类型进行过滤
                 .eq(BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel) && CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType), IdxBizJgProjectContraption::getUscUnitCreditCode, companyCode)
@@ -209,6 +247,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                 .isNull(!ValidationUtil.isEmpty(regCodeIsNull) && Boolean.TRUE.equals(Boolean.valueOf(regCodeIsNull)), IdxBizJgProjectContraption::getUseRegistrationCode)
                 .isNotNull(!ValidationUtil.isEmpty(regCodeIsNull) && Boolean.FALSE.equals(Boolean.valueOf(regCodeIsNull)), IdxBizJgProjectContraption::getUseRegistrationCode)
                 .isNull(IdxBizJgProjectContraption::getProjectContraptionParentId)
+                .notExists(isNotInBusiness, inBusinessSQL)
                 .orderByDesc(IdxBizJgProjectContraption::getRecDate)
                 .page(page);
         if (!ValidationUtil.isEmpty(pageList.getRecords())) {