优化：设备列表查询接口

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -553,10 +553,16 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
 
         // 根据当前登录用户类型及管辖机构筛选条件添加对应参数
-        if (!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type, "使用单位")) {
-            map.put("USE_UNIT_CREDIT_CODE", companyCode);
-        } else if (!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type, "安装改造维修单位")) {
+        if (!ValidationUtil.isEmpty(type) && type.contains("使用单位")) {
+            if(ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE"))){
+                map.put("USE_UNIT_CREDIT_CODE", companyCode);
+            }
+        } else if (!ValidationUtil.isEmpty(type) && type.contains("安装改造维修单位")) {
             map.put("USC_UNIT_CREDIT_CODE", companyCode);
+        }else {
+            result.setRecords(new ArrayList<>());
+            result.setTotal(0);
+            return result;
         }
 
         // 默认条件【STATUS==="" || null】
@@ -623,21 +629,34 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             esBuilder.must(QueryBuilders.matchQuery("EQU_STATE", param));
             boolMust.must(esBuilder);
         }
-        //使用单位
-        if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE"))) {
-            BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
-            String param = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
-            param = param.contains("_") ? param.split("_")[0] : param;
-            uuccBuilder.must(QueryBuilders.matchPhraseQuery("USE_UNIT_CREDIT_CODE", param));
-            boolMust.must(uuccBuilder);
-        }
-        //安装改造维修单位
-        if (!ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
-            BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
-            String param = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE"));
-            uuccBuilder.must(QueryBuilders.matchPhraseQuery("USC_UNIT_CREDIT_CODE", param));
-            boolMust.must(uuccBuilder);
+
+        //使用单位 //安装改造维修单位
+        if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) && !ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))){
+            BoolQueryBuilder ubuilder = QueryBuilders.boolQuery();
+            String useCode = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
+            useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
+            ubuilder.should(QueryBuilders.termQuery("USE_UNIT_CREDIT_CODE.keyword", useCode));
+
+            String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE"));
+            ubuilder.should(QueryBuilders.termQuery("USC_UNIT_CREDIT_CODE.keyword", uscCode));
+            ubuilder.minimumShouldMatch(1);
+            boolMust.must(ubuilder);
+        }else {
+            if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE"))) {
+                BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
+                String param = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
+                param = param.contains("_") ? param.split("_")[0] : param;
+                uuccBuilder.must(QueryBuilders.matchPhraseQuery("USE_UNIT_CREDIT_CODE", param));
+                boolMust.must(uuccBuilder);
+            }
+            if (!ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
+                BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
+                String param = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE"));
+                uuccBuilder.must(QueryBuilders.matchPhraseQuery("USC_UNIT_CREDIT_CODE", param));
+                boolMust.must(uuccBuilder);
+            }
         }
+
         //监管码
         if (!ObjectUtils.isEmpty(map.getString("SUPERVISORY_CODE"))) {
             BoolQueryBuilder scBuilder = QueryBuilders.boolQuery();

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/JgChangeRegistrationTransferServiceImpl.java

@@ -299,7 +299,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 // 修改数据信息
                 this.updateExecuteIds(instanceId, oldTransfer.getSequenceNbr(), "0");
                 // 默认执行流程
-                this.flowExecute(oldTransfer.getSequenceNbr(), instanceId, "0", "", false);
+                String status = oldTransfer.getStatus();
+                String operate = "0";
+                if(ValidationUtil.equals(status,WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack()) || ValidationUtil.equals(status,WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject())){
+                    operate="提交";
+                }
+                this.flowExecute(oldTransfer.getSequenceNbr(), instanceId, operate, "", false);
             }
         }
         return true;
@@ -632,21 +637,20 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
             role = String.join(",", roleList);
             jgChangeRegistrationTransfer.setNextExecutorIds(role);
-            jgChangeRegistrationTransfer.setPromoter(reginParams.getUserModel().getUserId());
+
             jgChangeRegistrationTransfer.setInstanceId(instanceId);
             if (!ObjectUtils.isEmpty(jgChangeRegistrationTransfer.getExecuteSequence())) {
                 jgChangeRegistrationTransfer.setExecuteSequence(jgChangeRegistrationTransfer.getExecuteSequence() + "," + role);
             } else {
                 jgChangeRegistrationTransfer.setExecuteSequence(role);
             }
+            jgChangeRegistrationTransfer.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
+            jgChangeRegistrationTransfer.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
             if ("0".equals(operate)) {
                 // 通过操作
-                jgChangeRegistrationTransfer.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
-                jgChangeRegistrationTransfer.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
+                jgChangeRegistrationTransfer.setPromoter(reginParams.getUserModel().getUserId());
             } else {
                 // 驳回操作
-                jgChangeRegistrationTransfer.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
-                jgChangeRegistrationTransfer.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgChangeRegistrationTransfer.setPromoter("");
             }