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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/ConstructionEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 施工信息枚举
+ *
+ * @author Provence
+ * @version v1.0
+ * @date 2023/12/18 11:01
+ */
+@AllArgsConstructor
+@Getter
+public enum ConstructionEnum {
+
+    INSTALL("安装",6030),
+    RENOVATION("改造",6031),
+    REPAIR("修理",6032);
+
+    String name;
+    Integer code;
+
+    public static Map<Integer,String> getName=new HashMap<>();
+    public static Map<String,Integer> getCode=new HashMap<>();
+
+    static {
+        for (ConstructionEnum e : ConstructionEnum.values()){
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+
+    }
+}

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgDesignInfoService;
@@ -86,6 +87,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     //设备信息表单id
     private static final String EQUIPMENT_INFO_FORM_ID = "1734504628768239617";
     private static final String EQUSTATE = "EQU_STATE";
+    private static final String CONSTRUCTIONTYPE = "CONSTRUCTION_TYPE";
+
     /**
      * levlel=company,是企业,如果不是都是监管单位,
      * * 在接口中查询当前登录人所属单位是监管单位还是企业。
@@ -400,12 +403,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             String code = object.getString("orgCode");
             String companyCode = object.getString("companyCode").contains("_") ?
                     object.getString("companyCode").split("_")[1] : object.getString("companyCode");
+            String type = object.getString("companyType");
 
             // 根据当前登录用户类型及管辖机构筛选条件添加对应参数
             if (!ValidationUtil.isEmpty(level)) {
                 if (LEVEL.equals(level)) {
                     //企业
-                    map.put("USE_UNIT_CREDIT_CODE", companyCode);
+                    if(!ValidationUtil.isEmpty(level) && ValidationUtil.equals(type,"使用单位")){
+                        map.put("USE_UNIT_CREDIT_CODE", companyCode);
+                    }else if(!ValidationUtil.isEmpty(level) && ValidationUtil.equals(type,"安装改造维修单位")){
+                        map.put("USC_UNIT_CREDIT_CODE", companyCode);
+                    }
+
                     if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
                         BoolQueryBuilder query = QueryBuilders.boolQuery();
                         String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
@@ -478,6 +487,28 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.matchPhraseQuery("USE_PLACE", "*" + param + "*"));
             boolMust.must(pBuilder);
         }
+        //设备状态
+        if (!ObjectUtils.isEmpty(map.getString("EQU_STATE"))) {
+            BoolQueryBuilder esBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getLong("EQU_STATE").toString());
+            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"));
+            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);
+        }
+
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
@@ -493,6 +524,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 System.out.println(hit);
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
                 JSONObject dto2 = jsonObject.getJSONObject("sourceAsMap");
+                if (!ValidationUtil.isEmpty(dto2.get(CONSTRUCTIONTYPE))) {
+                    Integer integer = Integer.valueOf(dto2.get(CONSTRUCTIONTYPE).toString());
+                    String status = ConstructionEnum.getName.get(integer);
+                    dto2.put(CONSTRUCTIONTYPE, status);
+                }
                 list.add(dto2);
             }
             totle = response.getInternalResponse().hits().getTotalHits().value;
@@ -522,6 +558,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 object.put("level", company.getLevel());
                 object.put("orgCode", company.getOrgCode());
                 object.put("companyCode", company.getCompanyCode());
+                object.put("companyType", company.getCompanyType());
                 objectList.add(object);
             }
         }

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

@@ -398,7 +398,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     }
 
     private JSONObject getTask(String instanceId) {
-        AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+        AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
         JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         String taskId = dataObject.getString("id");// 工作流ID
         FeignClientResult<JSONObject> nodeInfo = workflowFeignClient.getNodeInfotoken(RequestContext.getAppKey(), RequestContext.getProduct(), RequestContext.getToken(), taskId);

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

@@ -44,7 +44,7 @@ public class WorkflowHelper {
      * @date 2023/12/15 16:17
      */
     public JSONObject getTask(String instanceId) {
-        AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+        AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
         JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         String taskId = dataObject.getString("id");// 工作流ID
         FeignClientResult<JSONObject> nodeInfo = workflowFeignClient.getNodeInfotoken(RequestContext.getAppKey(), RequestContext.getProduct(), RequestContext.getToken(), taskId);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -90,7 +90,11 @@
                FACTORY_NUM,
                PRODUCE_UNIT_NAME,
                INSPECT_REPORT,
-               NEXT_INSPECT_DATE
+               NEXT_INSPECT_DATE,
+               CONSTRUCTION_TYPE,
+               USC_UNIT_CREDIT_CODE,
+               USC_UNIT_NAME,
+               USC_DATE
         from idx_biz_view_jg_all
         WHERE SEQUENCE_NBR = #{id}
     </select>