Merge branch 'develop_tzs_register' of…

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-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -67,9 +67,9 @@ import java.text.ParseException;
 @Service
 public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationNoticeDto,JgInstallationNotice,JgInstallationNoticeMapper> implements IJgInstallationNoticeService {
 
-    public static final String SUBMIT_TYPE_FLOW = "1";
-    public static final String PROCESS_DEFINITION_KEY = "installationNotification";
-    public static final String TABLE_PAGE_ID = "1734141426742095873";
+    private static final String SUBMIT_TYPE_FLOW = "1";
+    private static final String PROCESS_DEFINITION_KEY = "installationNotification";
+    private static final String TABLE_PAGE_ID = "1734141426742095873";
 
 
     //西安行政区划code

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -10,7 +10,7 @@
         res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.rectification, res.remark,
         res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
         res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name,
-        address, equ_code, use_inner_code, equ_list, tec1.name equ_list_name, ibjri.equ_category, tec.name
+        address, equ_code, use_inner_code, ibjri.equ_list, tec1.name equ_list_name, ibjri.equ_category, tec.name
         equ_category_name, use_org_code
         from tz_jyjc_inspection_result res
         left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.supervisory_code

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -223,7 +223,7 @@ public class JyjcInspectionApplicationController extends BaseController {
 	 * 撤回接口（监督检验、定（首）检、检测）-通用
 	 *
 	 *
-	 * @param instanceId instanceId
+	 * @param sequenceNbr sequenceNbr
 	 * @return {@link }
 	 * @author yangyang
 	 * @throws
@@ -232,8 +232,8 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "撤回",   notes = "撤回")
 	@GetMapping(value = "/flow/rollback")
-	public void doRollbackFlow(@RequestParam("instanceId") String instanceId) {
-		jyjcInspectionApplicationServiceImpl.doRollback(instanceId);
+	public void doRollbackFlow(@RequestParam("sequenceNbr") String sequenceNbr) {
+		jyjcInspectionApplicationServiceImpl.doRollback(sequenceNbr);
 	}
 	/**
 	 * 查询指定设备种类的设备列表

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

@@ -237,7 +237,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         Long sequenceNbr = (Long) params.get("sequenceNbr");
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
-        if (ValidationUtil.isEmpty(applicationEquipModels)) {
+        if (inspectionApplicationModel == null || ValidationUtil.isEmpty(applicationEquipModels)) {
+            log.warn("JyjcInspectionApplicationModel Not Found！");
             return;
         }
         List<JyjcInspectionResult> resultModels = new ArrayList(applicationEquipModels.size());
@@ -249,6 +250,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             resultModel.setApplicationUnitCode(inspectionApplicationModel.getApplicationUnitCode());
             resultModel.setResultStatus("未出");
             resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
+            resultModel.setResultType(inspectionApplicationModel.getResultType());
             // 解析设备
             resultModel.setBizType(inspectionApplicationModel.getBizType());
             resultModel.setResultNo(codes.get(i));
@@ -309,17 +311,23 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     /**
      * 撤回流程办理单
      */
-    public void doRollback(String instanceId) {
+    public void doRollback(String sequenceNbr) {
+        JSONObject jsonObject;
+        JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(Long.valueOf(sequenceNbr));
+        if (inspectionApplicationModel == null) {
+            log.warn("JyjcInspectionApplicationModel Not Found！sequenceNbr => " + sequenceNbr);
+            return;
+        }
         try {
             // 撤回流程
-            FeignClientResult feignClientResult = new FeignClientResult();
-            if (ObjectUtils.isEmpty(feignClientResult)) {
+            jsonObject = workflowHelper.rollBack(inspectionApplicationModel.getProcessInstanceId());
+            if (ObjectUtils.isEmpty(jsonObject)) {
 
             }
-            updateModelByInstanceId(instanceId, MapBuilder.<String, Object>create().put("status", FlowStatusEnum.REJECTED.getCode() + "").build());
+            updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), MapBuilder.<String, Object>create().put("status", FlowStatusEnum.REJECTED.getCode() + "").build());
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("撤回工作流错误, => {}", instanceId, e);
+            log.error("撤回工作流错误, => {}", inspectionApplicationModel.getProcessInstanceId(), e);
         }
     }
 

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

@@ -99,10 +99,21 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
 
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel saveOrUpdateModel(JyjcOpeningApplicationModel model, Boolean enableStartFlow) {
+        boolean isUpdate = false;
+        String instanceId = null;
         try {
+            if (model.getSequenceNbr() != null) {
+                JyjcOpeningApplication entity = jyjcOpeningApplicationMapper.selectById(model.getSequenceNbr());
+                if (entity != null) {
+                    instanceId = entity.getWorkflowProstanceId();
+                    isUpdate = true;
+                }
+            }
             if (enableStartFlow) {
-                // 开启工作流 startProcess
-                String instanceId = startFlow("1");
+                if (StringUtils.isBlank(instanceId)) {
+                    // 未开启过工作流则进行开启 startProcess
+                    instanceId = startFlow("1");
+                }
                 JSONObject dataObject = getTask(instanceId);
                 JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
                 if (!ValidationUtil.isEmpty(executorArray)) {
@@ -113,7 +124,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 model.setStatusName(FlowStatusEnum.SUBMITTED.getName());
                 model.setApplyTime(new Date());
                 model.setWorkflowActiveKey(dataObject.getString("taskDefinitionKey"));
-                // model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "");
                 model.setWorkflowProstanceId(instanceId);
                 // 默认自动执行第一步
                 execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", instanceId).put("comments", "").build());
@@ -121,7 +131,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 model.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "");
                 model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
             }
-            if (model.getSequenceNbr() == null) {
+            if (!isUpdate) {
                 CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
                 model.setUnitCode(companyBo.getCompanyCode());
                 model.setUnitCodeName(companyBo.getCompanyName());
@@ -388,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);
@@ -63,4 +63,8 @@ public class WorkflowHelper {
         }
         return null;
     }
+
+    public JSONObject rollBack(String workflowProstanceId) {
+        return workflowFeignClient.rollBack(workflowProstanceId);
+    }
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/InspectionDetectionInfoModel.java

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 /**
  * 安全追溯-检验检测信息表
@@ -44,4 +45,13 @@ public class InspectionDetectionInfoModel extends BaseDto {
     private String sequenceCode;
 
     private String superviseCode;
+
+    @ApiModelProperty(value = "监管码")
+    private String record;
+
+    @ApiModelProperty(value = "检验机构统一信用代码")
+    private String inspectOrgCode;
+
+    @ApiModelProperty(value = "检验报告编号")
+    private String inspectReportNo;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/InspectionDetectionInfo.java

@@ -2,12 +2,12 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 安全追溯-检验检测信息表
  *
@@ -94,5 +94,14 @@ public class InspectionDetectionInfo extends AbstractEquipBaseEntity {
 
 	@TableField(value ="\"SEQUENCE_CODE\"")
 	private String sequenceCode;
-
+	/**
+	 * 检验机构统一信用代码
+	 */
+	@TableField(value ="\"INSPECT_ORG_CODE\"")
+	private String inspectOrgCode;
+	/**
+	 * 检验报告编号
+	 */
+	@TableField(value ="\"INSPECT_REPORT_NO\"")
+	private String inspectReportNo;
 }

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>