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/pom.xml

@@ -20,11 +20,7 @@
             <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-module-ymt-api</artifactId>
             <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-tcm-api</artifactId>
-            <version>1.0.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.amosframework.boot</groupId>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -164,10 +164,10 @@ public class JgInstallationNoticeDto extends BaseDto {
     private String inputUnitNo;
 
     @ApiModelProperty(value = "安装委托书图片")
-    private List<Map<String, String>> proxyStatementAttachmentList;
+    private List<Map<String, Object>> proxyStatementAttachmentList;
 
     @ApiModelProperty(value = "安装合同照片")
-    private List<Map<String, String>> installContractAttachmentList;
+    private List<Map<String, Object>> installContractAttachmentList;
 
     @ApiModelProperty(value = "安装委托书图片")
     private String proxyStatementAttachment;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author system_generator

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备注册
+ *
+ * @author Provence
+ * @version v1.0
+ * @date 2023/12/13 14:37
+ */
+@RestController
+@Api (tags = "设备注册Api")
+@RequestMapping (value = "/equipment-register")
+public class IdxBizJqEquipmentRegisterController extends BaseController {
+    @Autowired
+    IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
+
+    /**
+     * 设备注册和更新信息
+     * @param paramMap
+     * @return
+     */
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "/submit")
+    @ApiOperation (httpMethod = "POST", value = "设备注册和更新信息", notes = "设备注册和更新信息")
+    public ResponseModel<Object> submit(@RequestBody Map<String, Object> paramMap) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equipmentRegisterSubmit(paramMap));
+    }
+
+
+    /**
+     * 根据recordList批量删除设备注册信息
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/deleteBatch")
+    @ApiOperation(httpMethod = "POST", value = "批量删除设备注册信息", notes = "批量删除设备注册信息")
+    public ResponseModel<Boolean> deleteByRecordList(@RequestBody Map<String,Object> map){
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.batchDeleteByRecord(map));
+    }
+
+    /**
+     * 查询设备注册信息详情
+     * @param sequenceNbr
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping (value = "/{record}")
+    @ApiOperation(httpMethod = "GET", value = "根据record查询设备注册信息详情", notes = "根据record查询设备注册信息详情")
+    public ResponseModel<Object> selectOne(@PathVariable String record) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getEquipmentRegisterByRecord(record));
+    }
+
+    /**
+     * 查询设备注册列表
+     * @param map
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "设备注册信息分页查询", notes = "设备注册信息分页查询")
+    public ResponseModel<Page<JSONObject>> queryForPage( @RequestParam Map<String,Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPage(jsonObject));
+    }
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/dao/ESElavtorRepository.java

+package com.yeejoin.amos.boot.module.jg.biz.dao;
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.EsElevator;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author fengwang
+ * @date 2021-09-26.
+ */
+@Repository
+public interface ESElavtorRepository extends PagingAndSortingRepository<EsElevator, Long> {
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/dao/ESEquipmentCategory.java

+package com.yeejoin.amos.boot.module.jg.biz.dao;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ESEquipmentCategory extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
+
+/**
+ * 施工信息表接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgConstructionInfoService {
+
+    boolean saveOrUpdateData(IdxBizJgConstructionInfo constructionInfo);
+
+    IdxBizJgConstructionInfo getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
+
+/**
+ * 安全追溯-设计信息表接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgDesignInfoService {
+
+    boolean saveOrUpdateData(IdxBizJgDesignInfo designInfo);
+
+    IdxBizJgDesignInfo getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
+
+/**
+ * 安全追溯-制造信息接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgFactoryInfoService {
+
+    boolean saveOrUpdateData(IdxBizJgFactoryInfo factoryInfo);
+
+    IdxBizJgFactoryInfo getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
+
+/**
+ * 安全追溯-检验检测信息表接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgInspectionDetectionInfoService {
+
+    boolean saveOrUpdateData(IdxBizJgInspectionDetectionInfo inspectionDetectionInfo);
+
+    IdxBizJgInspectionDetectionInfo getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMainParts;
+
+import java.util.List;
+
+/**
+ * 安全追溯-主要零部件接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgMainPartsService {
+
+    boolean saveOrUpdateBatchData(List<IdxBizJgMainParts> mainPartsList);
+
+    IdxBizJgMainParts getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
+
+/**
+ * 安全追溯-维保备案信息表接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgMaintenanceRecordInfoService {
+
+    boolean saveOrUpdateData(IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo);
+
+    IdxBizJgMaintenanceRecordInfo getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
+
+/**
+ * 安全追溯-其他信息表接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgOtherInfoService {
+
+    boolean saveOrUpdateData(IdxBizJgOtherInfo otherInfo);
+
+    IdxBizJgOtherInfo getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProtectionDevices;
+
+import java.util.List;
+
+/**
+ * 安全追溯-安全保护装置接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgProtectionDevicesService {
+
+    boolean saveOrUpdateBatchData(List<IdxBizJgProtectionDevices> protectionDevicesList);
+
+    IdxBizJgProtectionDevices getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 注册登记信息表接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgRegisterInfoService {
+
+    ResponseModel equipmentRegisterSubmit(Map<String, Object> paramMap);
+
+    boolean batchDeleteByRecord(Map<String,Object> map);
+
+    Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record);
+
+    Page<JSONObject> queryForEquipmentRegisterPage(JSONObject jsonObject);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
+
+/**
+ * 监督管理信息表接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgSupervisionInfoService {
+
+    boolean saveOrUpdateData(IdxBizJgSupervisionInfo supervisionInfo);
+
+    IdxBizJgSupervisionInfo getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+/**
+ * 安全追溯-锅炉接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgTechParamsBoilerService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
+
+/**
+ * 安全追溯-电梯接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgTechParamsElevatorService {
+
+    boolean saveOrUpdateData(IdxBizJgTechParamsElevator techParamsElevator);
+
+    IdxBizJgTechParamsElevator getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+/**
+ * 安全追溯-起重机械接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgTechParamsLiftingService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+/**
+ * 安全追溯-压力管道接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgTechParamsPipelineService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+/**
+ * 安全追溯-游乐设施接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgTechParamsRidesService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+/**
+ * 安全追溯-索道接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgTechParamsRopewayService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+/**
+ * 安全追溯-场内车辆接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgTechParamsVehicleService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+/**
+ * 安全追溯-压力容器接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IIdxBizJgTechParamsVesselService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+
+/**
+ * 使用信息表接口类
+ *
+ * @author system_generator
+ * @date 2023-08-16
+ */
+public interface IIdxBizJgUseInfoService {
+
+    boolean saveOrUpdateData(IdxBizJgUseInfo useInfo);
+
+    IdxBizJgUseInfo getOneData(String record);
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgConstructionInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgConstructionInfoMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * 施工信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgConstructionInfoServiceImpl extends BaseService<IdxBizJgConstructionInfoDto,IdxBizJgConstructionInfo,IdxBizJgConstructionInfoMapper> implements IIdxBizJgConstructionInfoService {
+
+    public boolean saveOrUpdateData(IdxBizJgConstructionInfo constructionInfo){
+        return this.saveOrUpdate(constructionInfo);
+    }
+
+    @Override
+    public IdxBizJgConstructionInfo getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgConstructionInfo>().eq("RECORD", record));
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgDesignInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgDesignInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgDesignInfoMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-设计信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgDesignInfoServiceImpl extends BaseService<IdxBizJgDesignInfoDto,IdxBizJgDesignInfo,IdxBizJgDesignInfoMapper> implements IIdxBizJgDesignInfoService {
+
+    public boolean saveOrUpdateData(IdxBizJgDesignInfo designInfo){
+        return this.saveOrUpdate(designInfo);
+    }
+
+    @Override
+    public IdxBizJgDesignInfo getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgDesignInfo>().eq("RECORD", record));
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgFactoryInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgFactoryInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgFactoryInfoMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-制造信息服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgFactoryInfoServiceImpl extends BaseService<IdxBizJgFactoryInfoDto,IdxBizJgFactoryInfo,IdxBizJgFactoryInfoMapper> implements IIdxBizJgFactoryInfoService {
+
+    public boolean saveOrUpdateData(IdxBizJgFactoryInfo factoryInfo){
+       return this.saveOrUpdate(factoryInfo);
+    }
+
+    @Override
+    public IdxBizJgFactoryInfo getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgFactoryInfo>().eq("RECORD", record));
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgInspectionDetectionInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgInspectionDetectionInfoMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-检验检测信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgInspectionDetectionInfoServiceImpl extends BaseService<IdxBizJgInspectionDetectionInfoDto,IdxBizJgInspectionDetectionInfo,IdxBizJgInspectionDetectionInfoMapper> implements IIdxBizJgInspectionDetectionInfoService {
+
+    public boolean saveOrUpdateData(IdxBizJgInspectionDetectionInfo inspectionDetectionInfo){
+        return this.saveOrUpdate(inspectionDetectionInfo);
+    }
+
+    @Override
+    public IdxBizJgInspectionDetectionInfo getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgInspectionDetectionInfo>().eq("RECORD", record));
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgMainPartsService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgMainPartsDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMainParts;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgMainPartsMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-主要零部件服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgMainPartsServiceImpl extends BaseService<IdxBizJgMainPartsDto,IdxBizJgMainParts,IdxBizJgMainPartsMapper> implements IIdxBizJgMainPartsService {
+
+    public boolean saveOrUpdateBatchData(List<IdxBizJgMainParts> mainPartsList){
+        return this.saveOrUpdateBatch(mainPartsList);
+    }
+
+    @Override
+    public IdxBizJgMainParts getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgMainParts>().eq("RECORD", record));
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgMaintenanceRecordInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgMaintenanceRecordInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgMaintenanceRecordInfoMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-维保备案信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgMaintenanceRecordInfoServiceImpl extends BaseService<IdxBizJgMaintenanceRecordInfoDto,IdxBizJgMaintenanceRecordInfo,IdxBizJgMaintenanceRecordInfoMapper> implements IIdxBizJgMaintenanceRecordInfoService {
+
+    public boolean saveOrUpdateData(IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo){
+        return this.saveOrUpdate(maintenanceRecordInfo);
+    }
+
+    @Override
+    public IdxBizJgMaintenanceRecordInfo getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgMaintenanceRecordInfo>().eq("RECORD", record));
+    }
+
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgOtherInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgOtherInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-其他信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgOtherInfoServiceImpl extends BaseService<IdxBizJgOtherInfoDto,IdxBizJgOtherInfo,IdxBizJgOtherInfoMapper> implements IIdxBizJgOtherInfoService {
+
+    public boolean saveOrUpdateData(IdxBizJgOtherInfo otherInfo){
+        return this.saveOrUpdate(otherInfo);
+    }
+
+    @Override
+    public IdxBizJgOtherInfo getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgOtherInfo>().eq("RECORD", record));
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgProtectionDevicesService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProtectionDevicesDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProtectionDevices;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProtectionDevicesMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-安全保护装置服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgProtectionDevicesServiceImpl extends BaseService<IdxBizJgProtectionDevicesDto,IdxBizJgProtectionDevices,IdxBizJgProtectionDevicesMapper> implements IIdxBizJgProtectionDevicesService {
+
+    public boolean saveOrUpdateBatchData(List<IdxBizJgProtectionDevices> protectionDevicesList){
+        return this.saveOrUpdateBatch(protectionDevicesList);
+    }
+
+    @Override
+    public IdxBizJgProtectionDevices getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgProtectionDevices>().eq("RECORD", record));
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.biz.dao.ESElavtorRepository;
+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;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgFactoryInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgMainPartsService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgMaintenanceRecordInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgOtherInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgProtectionDevicesService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgSupervisionInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsElevatorService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMainParts;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProtectionDevices;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsElevatorMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.elasticsearch.search.sort.SortOrder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import static com.alibaba.fastjson.JSON.toJSONString;
+
+
+/**
+ * 注册登记信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegisterInfoDto, IdxBizJgRegisterInfo, IdxBizJgRegisterInfoMapper> implements IIdxBizJgRegisterInfoService {
+    //设备信息表单id
+    private static final String EQUIPMENT_INFO_FORM_ID = "1734504628768239617";
+    private static final String EQUSTATE = "EQU_STATE";
+    /**
+     * levlel=company,是企业,如果不是都是监管单位,
+     * * 在接口中查询当前登录人所属单位是监管单位还是企业。
+     * * 如果为监管单位添加监管机构查询参数（ORG_BRANCH_CODE）；
+     * * 如果为企业添加使用单位查询参数(USE_UNIT_CREDIT_CODE)
+     */
+    private static final String LEVEL = "company";
+    // 新增修改标识
+    private static final String OPERATESAVE = "save";
+    private static final String OPERATEEDIT = "edit";
+
+    // 主要零部件
+    private static final String main_parts = "mainParts";
+    // 安全附件
+    private static final String protection_devices = "ProtectionDevices";
+
+    @Autowired
+    RestHighLevelClient restHighLevelClient;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    IIdxBizJgUseInfoService idxBizJgUseInfoService;
+    @Autowired
+    IIdxBizJgDesignInfoService iIdxBizJgDesignInfoService;
+    @Autowired
+    IIdxBizJgFactoryInfoService iIdxBizJgFactoryInfoService;
+    @Autowired
+    IIdxBizJgConstructionInfoService iIdxBizJgConstructionInfoService;
+    @Autowired
+    IIdxBizJgMaintenanceRecordInfoService iIdxBizJgMaintenanceRecordInfoService;
+    @Autowired
+    IIdxBizJgSupervisionInfoService iIdxBizJgSupervisionInfoService;
+    @Autowired
+    IIdxBizJgOtherInfoService iIdxBizJgOtherInfoService;
+    @Autowired
+    IIdxBizJgInspectionDetectionInfoService iIdxBizJgInspectionDetectionInfoService;
+    @Autowired
+    IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
+    @Autowired
+    IIdxBizJgMainPartsService iIdxBizJgMainPartsService;
+    @Autowired
+    IIdxBizJgProtectionDevicesService iIdxBizJgProtectionDevicesService;
+    @Autowired
+    ESEquipmentCategory esEquipmentCategory;
+
+    @Autowired
+    CategoryOtherInfoMapper categoryOtherInfoMapper;
+    @Autowired
+    private SuperviseInfoMapper superviseInfoMapper;
+
+    /**
+     * 设备注册信息
+     *
+     * @param paramMap
+     * @return
+     */
+    public ResponseModel equipmentRegisterSubmit(Map<String, Object> paramMap) {
+        String record = null;
+        //操作类型
+        try {
+            //保存数据
+            record = batchSubmitOrUpdate(paramMap);
+            //保存Es数据
+            if (!ObjectUtils.isEmpty(record)) {
+                checkEsData(record);
+            }
+        } catch (Exception e) {
+            //删除Es数据
+        }
+        return ResponseHelper.buildResponse(record);
+    }
+
+    /**
+     * 删除设备注册信息（批量删除）
+     *
+     * @param sequenceNbrList
+     * @return
+     */
+    public boolean batchDeleteByRecord(Map<String, Object> map) {
+        Object recordList = map.get("recordList");
+        List<String> records = new ArrayList<>();
+        List<ESEquipmentCategoryDto> list = new ArrayList<>();
+        //删除ES数据
+        if (recordList.toString().contains("[")) {
+            for (String record : (List<String>) recordList) {
+                records.add(record);
+                ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto();
+                esEquipmentCategoryDto.setSEQUENCE_NBR(record);
+                list.add(esEquipmentCategoryDto);
+            }
+        } else {
+            records.add(recordList.toString());
+            ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto();
+            esEquipmentCategoryDto.setSEQUENCE_NBR(recordList.toString());
+            list.add(esEquipmentCategoryDto);
+        }
+
+        //删除涉及的19张表的数据
+        superviseInfoMapper.deleteDataAll(records);
+        //删除es中的数据
+        esEquipmentCategory.deleteAll(list);
+        return true;
+    }
+
+    /**
+     * 查询设备注册信息详情
+     *
+     * @param record
+     * @return
+     */
+    public Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record) {
+        Map<String, Map<String, Object>> resultMap = new HashMap<>();
+        Map<String, Object> objMap = new HashMap<>();
+        //使用信息
+        IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(record);
+        if (!ValidationUtil.isEmpty(useInfo)) {
+            Map<String, Object> useInfoMap = Bean.BeantoMap(useInfo);
+            useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
+            objMap.putAll(useInfoMap);
+        }
+        //设计制造
+        IdxBizJgDesignInfo designInfo = iIdxBizJgDesignInfoService.getOneData(record);
+        if (!ValidationUtil.isEmpty(designInfo)) {
+            Map<String, Object> designInfoMap = Bean.BeantoMap(designInfo);
+            designInfoMap.put("DESIGNINFO_SEQ", designInfo.getSequenceNbr());
+            objMap.putAll(designInfoMap);
+        }
+        //制造信息
+        IdxBizJgFactoryInfo factoryInfo = iIdxBizJgFactoryInfoService.getOneData(record);
+        if (!ValidationUtil.isEmpty(factoryInfo)) {
+            Map<String, Object> factoryInfoMap = Bean.BeantoMap(factoryInfo);
+            factoryInfoMap.put("FACTORYINFO_SEQ", factoryInfo.getSequenceNbr());
+            objMap.putAll(factoryInfoMap);
+        }
+        //施工信息
+        IdxBizJgConstructionInfo constructionInfo = iIdxBizJgConstructionInfoService.getOneData(record);
+        if (!ValidationUtil.isEmpty(constructionInfo)) {
+            Map<String, Object> constructionInfoMap = Bean.BeantoMap(constructionInfo);
+            constructionInfoMap.put("CONSTRUCTIONINFO_SEQ", constructionInfo.getSequenceNbr());
+            objMap.putAll(constructionInfoMap);
+        }
+        //注册登记
+        IdxBizJgRegisterInfo registerInfo = this.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", record));
+        if (!ValidationUtil.isEmpty(registerInfo)) {
+            Map<String, Object> registerInfoMap = Bean.BeantoMap(registerInfo);
+            registerInfoMap.put("REGISTERINFO_SEQ", registerInfo.getSequenceNbr());
+            objMap.putAll(registerInfoMap);
+        }
+        //维保备案
+        IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = iIdxBizJgMaintenanceRecordInfoService.getOneData(record);
+        if (!ValidationUtil.isEmpty(maintenanceRecordInfo)) {
+            Map<String, Object> maintenanceRecordInfoMap = Bean.BeantoMap(maintenanceRecordInfo);
+            maintenanceRecordInfoMap.put("MAINTENANCERECORDINFO_SEQ", maintenanceRecordInfo.getSequenceNbr());
+            objMap.putAll(maintenanceRecordInfoMap);
+        }
+        //监督管理
+        IdxBizJgSupervisionInfo supervisionInfo = iIdxBizJgSupervisionInfoService.getOneData(record);
+        if (!ValidationUtil.isEmpty(supervisionInfo)) {
+            Map<String, Object> supervisionInfoMap = Bean.BeantoMap(supervisionInfo);
+            supervisionInfoMap.put("SUPERVISIONINFO_SEQ", supervisionInfo.getSequenceNbr());
+            objMap.putAll(supervisionInfoMap);
+        }
+        //其他信息
+        IdxBizJgOtherInfo otherInfo = iIdxBizJgOtherInfoService.getOneData(record);
+        if (!ValidationUtil.isEmpty(otherInfo)) {
+            Map<String, Object> otherInfoMap = Bean.BeantoMap(otherInfo);
+            otherInfoMap.put("OTHERINFO_SEQ", otherInfo.getSequenceNbr());
+            objMap.putAll(otherInfoMap);
+        }
+        //检验检测
+        IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.getOneData(record);
+        if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
+            Map<String, Object> inspectionDetectionInfoMap = Bean.BeantoMap(inspectionDetectionInfo);
+            inspectionDetectionInfoMap.put("INSPECTIONDETECTIONINFO_SEQ", inspectionDetectionInfo.getSequenceNbr());
+            objMap.putAll(inspectionDetectionInfoMap);
+        }
+
+        //电梯
+        IdxBizJgTechParamsElevator elevator = iIdxBizJgTechParamsElevatorService.getOneData(record);
+        if (!ValidationUtil.isEmpty(elevator)) {
+            Map<String, Object> elevatorMap = Bean.BeantoMap(elevator);
+            elevatorMap.put("ELEVATOR_SEQ", elevator.getSequenceNbr());
+            objMap.putAll(elevatorMap);
+        }
+        //厂车
+        //索道
+        //游乐设施
+        //锅炉
+        //压力容器
+        //压力管道
+        //起重机械
+
+        //主要零部件
+        IdxBizJgMainParts mainParts = iIdxBizJgMainPartsService.getOneData(record);
+        if (!ValidationUtil.isEmpty(mainParts)) {
+            Map<String, Object> mainPartsMap = Bean.BeantoMap(mainParts);
+            mainPartsMap.put("MAINPARTS_SEQ", mainParts.getSequenceNbr());
+            objMap.putAll(mainPartsMap);
+        }
+        //安全附件
+        IdxBizJgProtectionDevices protectionDevices = iIdxBizJgProtectionDevicesService.getOneData(record);
+        if (!ValidationUtil.isEmpty(protectionDevices)) {
+            Map<String, Object> protectionDevicesMap = Bean.BeantoMap(protectionDevices);
+            protectionDevicesMap.put("PROTECTIONDEVICES_SEQ", protectionDevices.getSequenceNbr());
+            objMap.putAll(protectionDevicesMap);
+        }
+
+        if (!ValidationUtil.isEmpty(objMap)) {
+            resultMap.put(EQUIPMENT_INFO_FORM_ID, objMap);
+        }
+        return resultMap;
+    }
+
+    /**
+     * 设备注册信息分页查询
+     *
+     * @param map
+     * @return
+     */
+    public Page<JSONObject> queryForEquipmentRegisterPage(JSONObject map) {
+        Page<JSONObject> result = new Page<>(map.getInteger("number"), map.getInteger("size"));
+        SearchRequest request = new SearchRequest();
+        request.indices("idx_biz_view_jg_all");
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.trackTotalHits(true);
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+
+        //根据当前登录人查询
+        if (!ValidationUtil.isEmpty(map.get(EQUSTATE))) {
+            map.put(EQUSTATE, EquimentEnum.getCode.get(map.get(EQUSTATE).toString()).toString());
+        }
+        //获取当前登录人单位类型
+        List<JSONObject> companyType = getCompanyType();
+        if (!ValidationUtil.isEmpty(companyType)) {
+            JSONObject object = getCompanyType().get(0);
+            String level = object.getString("level");
+            String code = object.getString("orgCode");
+            String companyCode = object.getString("companyCode").contains("_") ?
+                    object.getString("companyCode").split("_")[1] : object.getString("companyCode");
+
+            // 根据当前登录用户类型及管辖机构筛选条件添加对应参数
+            if (!ValidationUtil.isEmpty(level)) {
+                if (LEVEL.equals(level)) {
+                    //企业
+                    map.put("USE_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"));
+                        query.must(QueryBuilders.matchPhrasePrefixQuery("ORG_BRANCH_CODE", test));
+                        boolMust.must(query);
+                    }
+                } else {
+                    if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
+                        String paramCode = map.getString("ORG_BRANCH_CODE");
+                        if (paramCode.contains(code)) {
+                            BoolQueryBuilder query = QueryBuilders.boolQuery();
+                            String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
+                            query.must(QueryBuilders.matchPhrasePrefixQuery("ORG_BRANCH_CODE", test));
+                            boolMust.must(query);
+                        } else {
+                            return result;
+                        }
+                    } else {
+                        //监管单位
+                        map.put("ORG_BRANCH_CODE", code);
+                    }
+                }
+            }
+        }
+
+        // 默认条件【STATUS===""】
+        BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+        meBuilder.must(QueryBuilders.matchQuery("STATUS", "null"));
+        boolMust.must(meBuilder);
+
+        String queryType = map.getString("QUERY_TYPE");
+        // //查询 安装告知【可告知设备列表】【EQU_STATE===""】
+        if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "AZ")) {
+            BoolQueryBuilder azBuilder = QueryBuilders.boolQuery();
+            azBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+            boolMust.must(azBuilder);
+        }
+        //查询 维保备案【可绑定设备列表】【EQU_STATE==="" && INSPECT_REPORT！==9999(默认占位值)】
+        if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "WB")) {
+            BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
+            wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+            wbBuilder.mustNot(QueryBuilders.matchQuery("INSPECT_REPORT", 9999));
+            boolMust.must(wbBuilder);
+        }
+        //查询 使用登记【可选设备列表】【EQU_STATUS==="" && INSPECT_REPORT！==9999(默认占位值) && USE_ORG_CODE!=="" 】
+        if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "SY")) {
+            BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
+            syBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+            syBuilder.mustNot(QueryBuilders.matchQuery("INSPECT_REPORT", 9999));
+            syBuilder.mustNot(QueryBuilders.matchQuery("USE_ORG_CODE", ""));
+            boolMust.must(syBuilder);
+        }
+
+        //通用匹配规则，其他条件构建
+        if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getString("EQU_CATEGORY"));
+            pBuilder.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY", "*" + param + "*"));
+            boolMust.must(pBuilder);
+
+        }
+        if (!ObjectUtils.isEmpty(map.getString("USE_PLACE"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getString("USE_PLACE"));
+            pBuilder.must(QueryBuilders.matchPhraseQuery("USE_PLACE", "*" + param + "*"));
+            boolMust.must(pBuilder);
+        }
+
+        builder.query(boolMust);
+        builder.sort("REC_DATE", SortOrder.DESC);
+        builder.from((map.getInteger("number") - 1) * map.getInteger("size"));
+        builder.size(map.getInteger("size"));
+        request.source(builder);
+        List<JSONObject> list = new LinkedList<>();
+        long totle = 0;
+
+        try {
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+            for (org.elasticsearch.search.SearchHit hit : response.getHits().getHits()) {
+                System.out.println(hit);
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
+                JSONObject dto2 = jsonObject.getJSONObject("sourceAsMap");
+                list.add(dto2);
+            }
+            totle = response.getInternalResponse().hits().getTotalHits().value;
+            result.setRecords(list);
+            result.setTotal(totle);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+
+    /**
+     * 获取当前登录人单位类型
+     *
+     * @return
+     */
+    public List<JSONObject> getCompanyType() {
+
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        List<CompanyModel> companys = reginParams.getUserModel().getCompanys();
+
+        List<JSONObject> objectList = new ArrayList<>();
+        if (!ValidationUtil.isEmpty(companys)) {
+            for (CompanyModel company : companys) {
+                JSONObject object = new JSONObject();
+                object.put("level", company.getLevel());
+                object.put("orgCode", company.getOrgCode());
+                object.put("companyCode", company.getCompanyCode());
+                objectList.add(object);
+            }
+        }
+        return objectList;
+    }
+
+    private String batchSubmitOrUpdate(Map<String, Object> map) {
+        Date date = new Date();
+        String record = null;
+        LinkedHashMap equipmentInfoForm = (LinkedHashMap) map.get(EQUIPMENT_INFO_FORM_ID);
+        //操作类型
+        String operateType = ValidationUtil.isEmpty(String.valueOf(equipmentInfoForm.get("SEQUENCE_NBR"))) ? OPERATESAVE : OPERATEEDIT;
+        record = OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : equipmentInfoForm.get("RECORD").toString();
+
+        //使用信息
+        IdxBizJgUseInfo useInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgUseInfo.class);
+        useInfo.setRecord(record);
+        useInfo.setRecDate(date);
+        useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
+        idxBizJgUseInfoService.saveOrUpdateData(useInfo);
+
+        //设计制造
+        IdxBizJgDesignInfo designInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgDesignInfo.class);
+        designInfo.setRecord(record);
+        designInfo.setRecDate(date);
+        designInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("DESIGNINFO_SEQ")));
+        iIdxBizJgDesignInfoService.saveOrUpdateData(designInfo);
+
+        //制造信息
+        IdxBizJgFactoryInfo factoryInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgFactoryInfo.class);
+        factoryInfo.setRecord(record);
+        factoryInfo.setRecDate(date);
+        factoryInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("FACTORYINFO_SEQ")));
+        iIdxBizJgFactoryInfoService.saveOrUpdateData(factoryInfo);
+
+        //施工信息
+        IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgConstructionInfo.class);
+        constructionInfo.setRecord(record);
+        constructionInfo.setRecDate(date);
+        constructionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("CONSTRUCTIONINFO_SEQ")));
+        iIdxBizJgConstructionInfoService.saveOrUpdateData(constructionInfo);
+
+        //注册登记
+        IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgRegisterInfo.class);
+        registerInfo.setRecord(record);
+        registerInfo.setRecDate(date);
+        registerInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("REGISTERINFO_SEQ")));
+        this.saveOrUpdate(registerInfo);
+
+        //维保备案
+        IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgMaintenanceRecordInfo.class);
+        maintenanceRecordInfo.setRecord(record);
+        maintenanceRecordInfo.setRecDate(date);
+        maintenanceRecordInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("MAINTENANCERECORDINFO_SEQ")));
+        iIdxBizJgMaintenanceRecordInfoService.saveOrUpdateData(maintenanceRecordInfo);
+
+        //监督管理
+        IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgSupervisionInfo.class);
+        supervisionInfo.setRecord(record);
+        supervisionInfo.setRecDate(date);
+        supervisionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("SUPERVISIONINFO_SEQ")));
+        iIdxBizJgSupervisionInfoService.saveOrUpdateData(supervisionInfo);
+
+        //其他信息
+        IdxBizJgOtherInfo otherInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgOtherInfo.class);
+        otherInfo.setRecord(record);
+        otherInfo.setRecDate(date);
+        otherInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("OTHERINFO_SEQ")));
+        iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
+
+        //检验检测
+        IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
+        inspectionDetectionInfo.setRecord(record);
+        inspectionDetectionInfo.setRecDate(date);
+        inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
+        iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+
+
+        //八大类技术参数表
+        //电梯
+        IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgTechParamsElevator.class);
+        if (!ValidationUtil.isEmpty(elevator)) {
+            elevator.setRecord(record);
+            elevator.setRecDate(date);
+            elevator.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("ELEVATOR_SEQ")));
+            iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
+        }
+        //厂车
+        //索道
+        //游乐设施
+        //锅炉
+        //压力容器
+        //压力管道
+        //起重机械
+
+        //八大类技术参数中主要零部件和安全附件表
+        List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
+        List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
+        //要零部件
+        List<String> subFormMainPartsList = new ArrayList<>();
+        subFormMainPartsList.add("subForm_fie04854f2");
+        mainPartsList = getAccessoryEntity(equipmentInfoForm, subFormMainPartsList, main_parts, record, date, operateType);
+        //安全附件
+        List<String> subFormProtectionDevicesList = new ArrayList<>();
+        subFormProtectionDevicesList.add("subForm_d4xdzhsgdj");
+        protectionDevicesList = getAccessoryEntity(equipmentInfoForm, subFormProtectionDevicesList, protection_devices, record, date, operateType);
+
+        if (!ValidationUtil.isEmpty(mainPartsList)) {
+            iIdxBizJgMainPartsService.saveOrUpdateBatchData(mainPartsList);
+        }
+        if (!ValidationUtil.isEmpty(protectionDevicesList)) {
+            iIdxBizJgProtectionDevicesService.saveOrUpdateBatchData(protectionDevicesList);
+        }
+        return record;
+    }
+
+
+    public void checkEsData(String id) {
+        Map<String, Object> map = categoryOtherInfoMapper.selectDataById(id);
+        categoryOtherInfoMapper.updateEsStatus(id);
+        ESEquipmentCategoryDto dto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
+        // 默认赋值占位，方便es条件搜索时使用
+        dto.setSTATUS("null");
+        dto.setEQU_STATE(9999);
+        Optional<ESEquipmentCategoryDto> data = esEquipmentCategory.findById(id);
+        if (!ObjectUtils.isEmpty(data)) {
+            esEquipmentCategory.deleteById(id);
+        }
+        if (!ObjectUtils.isEmpty(dto)) {
+            long time = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
+            dto.setREC_DATE(time);
+            esEquipmentCategory.save(dto);
+        }
+    }
+
+    private List getAccessoryEntity(Map<String, Object> map, List<String> list, String subFormType, String record, Date date, String type) {
+        List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
+        List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
+
+        if ("mainParts".equals(subFormType)) {
+            for (Object s : list) {
+                List subFormMainPartsList = (ArrayList) map.get(s);
+                if (!ObjectUtils.isEmpty(subFormMainPartsList)) {
+                    for (Object obj : subFormMainPartsList) {
+                        HashMap<String, Object> objMap = (HashMap<String, Object>) obj;
+                        IdxBizJgMainParts mainParts = JSON.parseObject(JSON.toJSONString(objMap), IdxBizJgMainParts.class);
+                        mainParts.setRecord(record);
+                        mainParts.setRecDate(date);
+                        mainParts.setSequenceNbr("save".equals(type) ? null : String.valueOf(objMap.get("MAINPARTS_SEQ")));
+                        mainPartsList.add(mainParts);
+                    }
+                }
+            }
+            return mainPartsList;
+        } else {
+            for (Object s : list) {
+                List subFormProtectionDevicesList = (ArrayList) map.get(s);
+                if (!ObjectUtils.isEmpty(subFormProtectionDevicesList)) {
+                    for (Object obj : subFormProtectionDevicesList) {
+                        HashMap<String, Object> objMap = (HashMap<String, Object>) obj;
+                        IdxBizJgProtectionDevices protectionDevices = JSON.parseObject(JSON.toJSONString(objMap), IdxBizJgProtectionDevices.class);
+                        protectionDevices.setRecord(record);
+                        protectionDevices.setRecDate(date);
+                        protectionDevices.setSequenceNbr("save".equals(type) ? null : String.valueOf(objMap.get("PROTECTIONDEVICES_SEQ")));
+                        protectionDevicesList.add(protectionDevices);
+                    }
+                }
+            }
+            return protectionDevicesList;
+        }
+    }
+
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgSupervisionInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgSupervisionInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgSupervisionInfoMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * 监督管理信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgSupervisionInfoServiceImpl extends BaseService<IdxBizJgSupervisionInfoDto,IdxBizJgSupervisionInfo,IdxBizJgSupervisionInfoMapper> implements IIdxBizJgSupervisionInfoService {
+
+    public boolean saveOrUpdateData(IdxBizJgSupervisionInfo supervisionInfo){
+        return this.saveOrUpdate(supervisionInfo);
+    }
+
+    @Override
+    public IdxBizJgSupervisionInfo getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgSupervisionInfo>().eq("RECORD", record));
+    }
+
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsBoilerService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsBoilerDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsBoiler;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsBoilerMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-锅炉服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgTechParamsBoilerServiceImpl extends BaseService<IdxBizJgTechParamsBoilerDto,IdxBizJgTechParamsBoiler,IdxBizJgTechParamsBoilerMapper> implements IIdxBizJgTechParamsBoilerService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizJgTechParamsBoilerDto> queryForIdxBizJgTechParamsBoilerPage(Page<IdxBizJgTechParamsBoilerDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizJgTechParamsBoilerDto> queryForIdxBizJgTechParamsBoilerList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsElevatorService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsElevatorDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsElevatorMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * 安全追溯-电梯服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgTechParamsElevatorServiceImpl extends BaseService<IdxBizJgTechParamsElevatorDto,IdxBizJgTechParamsElevator,IdxBizJgTechParamsElevatorMapper> implements IIdxBizJgTechParamsElevatorService {
+
+    public boolean saveOrUpdateData(IdxBizJgTechParamsElevator techParamsElevator){
+        return this.saveOrUpdate(techParamsElevator);
+    }
+
+    @Override
+    public IdxBizJgTechParamsElevator getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", record));
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsLiftingService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsLiftingDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsLiftingMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-起重机械服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgTechParamsLiftingServiceImpl extends BaseService<IdxBizJgTechParamsLiftingDto,IdxBizJgTechParamsLifting,IdxBizJgTechParamsLiftingMapper> implements IIdxBizJgTechParamsLiftingService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizJgTechParamsLiftingDto> queryForIdxBizJgTechParamsLiftingPage(Page<IdxBizJgTechParamsLiftingDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizJgTechParamsLiftingDto> queryForIdxBizJgTechParamsLiftingList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsPipelineService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsPipelineDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsPipelineMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-压力管道服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgTechParamsPipelineServiceImpl extends BaseService<IdxBizJgTechParamsPipelineDto,IdxBizJgTechParamsPipeline,IdxBizJgTechParamsPipelineMapper> implements IIdxBizJgTechParamsPipelineService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizJgTechParamsPipelineDto> queryForIdxBizJgTechParamsPipelinePage(Page<IdxBizJgTechParamsPipelineDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizJgTechParamsPipelineDto> queryForIdxBizJgTechParamsPipelineList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsRidesService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsRidesDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsRidesMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-游乐设施服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgTechParamsRidesServiceImpl extends BaseService<IdxBizJgTechParamsRidesDto,IdxBizJgTechParamsRides,IdxBizJgTechParamsRidesMapper> implements IIdxBizJgTechParamsRidesService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizJgTechParamsRidesDto> queryForIdxBizJgTechParamsRidesPage(Page<IdxBizJgTechParamsRidesDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizJgTechParamsRidesDto> queryForIdxBizJgTechParamsRidesList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsRopewayService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsRopewayDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsRopewayMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-索道服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgTechParamsRopewayServiceImpl extends BaseService<IdxBizJgTechParamsRopewayDto,IdxBizJgTechParamsRopeway,IdxBizJgTechParamsRopewayMapper> implements IIdxBizJgTechParamsRopewayService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizJgTechParamsRopewayDto> queryForIdxBizJgTechParamsRopewayPage(Page<IdxBizJgTechParamsRopewayDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizJgTechParamsRopewayDto> queryForIdxBizJgTechParamsRopewayList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsVehicleService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsVehicleDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVehicle;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsVehicleMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-场内车辆服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgTechParamsVehicleServiceImpl extends BaseService<IdxBizJgTechParamsVehicleDto,IdxBizJgTechParamsVehicle,IdxBizJgTechParamsVehicleMapper> implements IIdxBizJgTechParamsVehicleService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizJgTechParamsVehicleDto> queryForIdxBizJgTechParamsVehiclePage(Page<IdxBizJgTechParamsVehicleDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizJgTechParamsVehicleDto> queryForIdxBizJgTechParamsVehicleList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsVesselService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsVesselDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsVesselMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 安全追溯-压力容器服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class IdxBizJgTechParamsVesselServiceImpl extends BaseService<IdxBizJgTechParamsVesselDto,IdxBizJgTechParamsVessel,IdxBizJgTechParamsVesselMapper> implements IIdxBizJgTechParamsVesselService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizJgTechParamsVesselDto> queryForIdxBizJgTechParamsVesselPage(Page<IdxBizJgTechParamsVesselDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizJgTechParamsVesselDto> queryForIdxBizJgTechParamsVesselList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgUseInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * 使用信息表服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-16
+ */
+@Service
+public class IdxBizJgUseInfoServiceImpl extends BaseService<IdxBizJgUseInfoDto,IdxBizJgUseInfo,IdxBizJgUseInfoMapper> implements IIdxBizJgUseInfoService {
+
+    public boolean saveOrUpdateData(IdxBizJgUseInfo useInfo){
+        return this.saveOrUpdate(useInfo);
+    }
+
+    @Override
+    public IdxBizJgUseInfo getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgUseInfo>().eq("RECORD", record));
+    }
+}
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
@@ -11,13 +12,9 @@ import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgRelationEquipMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
-import com.yeejoin.amos.boot.module.tcm.api.enums.ApplicationFormTypeEnum;
-import com.yeejoin.amos.boot.module.tcm.api.service.ICreateCodeService;
-import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
-import com.yeejoin.amos.feign.workflow.model.AjaxResult;
-import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
+import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
@@ -26,12 +23,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -47,11 +42,14 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     public static final String SUBMIT_TYPE_FLOW = "1";
     public static final String PROCESS_DEFINITION_KEY = "installationNotification";
     public static final String TABLE_PAGE_ID = "1734141426742095873";
-
-
+    @Autowired
+    private JgRelationEquipMapper jgRelationEquipMapper;
     @Autowired
     private JgInstallationNoticeMapper jgInstallationNoticeMapper;
 
+    @Autowired
+    private ICreateCodeService iCreateCodeService;
+
     /**
      * 根据sequenceNbr查询
      *
@@ -82,25 +80,33 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
      *
      * @param noticeDto 安装告知
      */
-    @SuppressWarnings("rawtypes")
+    @SuppressWarnings({"rawtypes", "Duplicates"})
     public JgInstallationNoticeDto updateInstallationNotice(JgInstallationNoticeDto noticeDto, String op) {
+        if (Objects.isNull(noticeDto) || StringUtils.isEmpty(op)) {
+            throw new IllegalArgumentException("参数不能为空");
+        }
+
+        // 字段转换
         this.convertField(noticeDto);
 
-        ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-        dto.setProcessDefinitionKey("installationNotification");
-        dto.setBusinessKey("1");
         AjaxResult ajaxResult;
-        try {
-            ajaxResult = Workflow.taskClient.startByVariable(dto);
-            String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
-            noticeDto.setInstanceId(instanceId);
-            noticeDto.setStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-            noticeDto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-            JgInstallationNotice bean = new JgInstallationNotice();
-            BeanUtils.copyProperties(noticeDto, bean);
-            jgInstallationNoticeMapper.updateById(bean);
-        } catch (Exception e) {
-            log.error("提交失败：{}", e);
+        // 发起流程
+        if (!StringUtils.hasText(noticeDto.getInstanceId())) {
+            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+            dto.setProcessDefinitionKey("installationNotification");
+            dto.setBusinessKey("1");
+            try {
+                ajaxResult = Workflow.taskClient.startByVariable(dto);
+                String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
+                noticeDto.setInstanceId(instanceId);
+                noticeDto.setStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                noticeDto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                JgInstallationNotice bean = new JgInstallationNotice();
+                BeanUtils.copyProperties(noticeDto, bean);
+                jgInstallationNoticeMapper.updateById(bean);
+            } catch (Exception e) {
+                log.error("提交失败：{}", e);
+            }
         }
 
         ajaxResult = Workflow.taskClient.getTask(noticeDto.getInstanceId());
@@ -121,7 +127,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             if (ObjectUtils.isEmpty(ajaxResult1)) {
                 noticeDto.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
                 JgInstallationNotice bean = new JgInstallationNotice();
-                BeanUtils.copyProperties(dto,bean);
+                BeanUtils.copyProperties(noticeDto, bean);
                 jgInstallationNoticeMapper.updateById(bean);
             }
         } catch (Exception e) {
@@ -130,11 +136,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         return noticeDto;
     }
 
-    @Autowired
-    private ICreateCodeService iCreateCodeService;
-    @Autowired
-    JgRelationEquipMapper jgRelationEquipMapper;
-
     /**
      * 分页查询
      *
@@ -194,6 +195,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     }
 
     @Override
+    @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> jgInstallationNoticeDtoMap) {
         JgInstallationNoticeDto model = jgInstallationNoticeDtoMap.get(TABLE_PAGE_ID);
@@ -217,7 +219,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 发起流程
             ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-            for (int i = 0 ; i< deviceList.size(); i++) {
+            for (int i = 0; i < deviceList.size(); i++) {
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey("1");
                 AjaxResult ajaxResult = null;
@@ -282,10 +284,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     private void convertField(JgInstallationNoticeDto model) {
         // 处理图片
-        String proxyStatementAttachment = convertImageUrl(model.getInstallContractAttachmentList());
-        String installContractAttachment = convertImageUrl(model.getProxyStatementAttachmentList());
-        model.setProxyStatementAttachment(proxyStatementAttachment);
-        model.setInstallContractAttachment(installContractAttachment);
+        model.setProxyStatementAttachment(JSON.toJSONString(model.getProxyStatementAttachmentList()));
+        model.setInstallContractAttachment(JSON.toJSONString(model.getInstallContractAttachmentList()));
 
         // 分割省市区字段
         String province = model.getProvince();

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/pom.xml

@@ -18,8 +18,9 @@
         </dependency>
         <dependency>
             <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-tcm-api</artifactId>
+            <artifactId>amos-boot-module-ymt-api</artifactId>
             <version>1.0.0</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcOpeningApplication.java

@@ -79,7 +79,11 @@ public class JyjcOpeningApplication extends BaseEntity {
      */
 	@TableField("status")
     private String status;
-
+    /**
+     * 状态
+     */
+    @TableField("status_name")
+    private String statusName;
     /**
      * 备注
      */
@@ -101,4 +105,9 @@ public class JyjcOpeningApplication extends BaseEntity {
      */
     @TableField(value = "workflow_prostance_id")
     private String workflowProstanceId;
+    /**
+     * 工作流节点
+     */
+    @TableField (value = "workflow_active_key")
+    private String workflowActiveKey;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/FlowStatusEnum.java

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+/**
+ * 办理状态枚举
+ */
+public enum  FlowStatusEnum {
+
+    /**
+     * 待提交
+     */
+    TO_BE_SUBMITTED(6610, "待提交"),
+    /**
+     * 已提交
+     */
+    SUBMITTED(6611, "已提交"),
+    /**
+     * 待受理
+     */
+    TO_BE_PROCESSED(6612, "待受理"),
+    /**
+     * 已办理
+     */
+    HAVE_PROCESSED(6613, "已办理"),
+
+    /**
+     * 已驳回
+     */
+    REJECTED(6614, "已驳回");
+
+    private final int code;
+
+    private final String name;
+
+    FlowStatusEnum(int code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getNameByType(Long code) {
+        String name = null;
+        for (FlowStatusEnum enumOne : FlowStatusEnum.values()) {
+            if (enumOne.getCode() == code) {
+                name = enumOne.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcBaseMapper.java

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
 import org.apache.ibatis.annotations.MapKey;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
 import java.util.List;
 import java.util.Map;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcOpeningApplicationMapper.java

@@ -15,6 +15,6 @@ import org.apache.ibatis.annotations.Param;
 public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningApplication> {
 
     Page<JyjcOpeningApplicationModel> selectJyjcOpeningApplicationList(@Param("page")Page<JyjcOpeningApplication> page,
-                                                                     @Param("jyjcOpeningApplicationModel") JyjcOpeningApplicationModel jyjcOpeningApplicationModel);
+                                                                     @Param("jyjcOpeningApplicationModel") JyjcOpeningApplicationModel jyjcOpeningApplicationModel,@Param("applyStartTime") String applyStartTime,@Param("applyendTime") String applyendTime);
 
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.jyjc.api.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -52,17 +52,23 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     @ApiModelProperty (value = "状态")
     private String status;
 
+    @ApiModelProperty (value = "状态Name")
+    private String statusName;
+
     @ApiModelProperty (value = "备注")
     private String remark;
 
     @ApiModelProperty (value = "申请时间")
-    private String applyTime;
+    private Date applyTime;
 
     @ApiModelProperty (value = "工作流执行角色")
     private String workflowRole;
 
     @ApiModelProperty (value = "工作流实例ID")
     private String workflowProstanceId;
+
+    @ApiModelProperty (value = "工作流节点")
+    private String workflowActiveKey;
     /* ----------------  -------------- */
     @ApiModelProperty (value = "企业资质信息")
     List<TzBaseUnitLicenceDto> baseUnitLicences;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionResultAttachmentService.java

 package com.yeejoin.amos.boot.module.jyjc.api.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
 /**
  * 接口类
  *
  * @author system_generator
  * @date 2023-12-14
  */
-public interface IJyjcInspectionResultAttachmentService {}
+public interface IJyjcInspectionResultAttachmentService {
+
+    /**
+     * 根据结果表主键获取附件列表
+     *
+     * @param resultSeq
+     * @return
+     */
+    List<JyjcInspectionResultAttachment> getObjByResultSeq(Long resultSeq);
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionResultService.java

 package com.yeejoin.amos.boot.module.jyjc.api.service;
 
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
+
+import java.util.Map;
+
 /**
  * 业务开通申请表接口类
  *
  * @author system_generator
  * @date 2023-12-14
  */
-public interface IJyjcInspectionResultService {}
+public interface IJyjcInspectionResultService {
+
+    /**
+     * 获取检验结果详情
+     * @param sequenceNbr 结果主键
+     * @return 检验结果实体
+     */
+    Map<String, Object> queryDetailBySeq(Long sequenceNbr);
+}

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper">
 
-    <select id="selectBaseUnitLicenceList" parameterType="map" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto">
+    <select id="selectBaseUnitLicenceList" parameterType="map" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto">
         select * from tz_base_unit_licence
         where unit_code = #{unitCode}
         <if test="licenceType !=null and licenceType != ''">

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

@@ -22,7 +22,9 @@
         apply_time,
         workflow_prostance_id,
         workflow_role,
-        unit_code_name
+        unit_code_name,
+        status,
+        status_name
         from tz_jyjc_opening_application
         <where>
             <if test="jyjcOpeningApplicationModel.applicationSeq != '' and jyjcOpeningApplicationModel.applicationSeq != null">
@@ -32,13 +34,16 @@
                 and unit_code like concat('%',#{jyjcOpeningApplicationModel.unitCode},'%')
             </if>
             <if test="jyjcOpeningApplicationModel.acceptDate != '' and jyjcOpeningApplicationModel.acceptDate != null">
-                and accept_date like concat('%',#{jyjcOpeningApplicationModel.acceptDate},'%')
+                and accept_date = #{jyjcOpeningApplicationModel.acceptDate},
             </if>
             <if test="jyjcOpeningApplicationModel.status != '' and jyjcOpeningApplicationModel.status != null">
-                and status like concat('%',#{jyjcOpeningApplicationModel.status},'%')
+                and status = #{jyjcOpeningApplicationModel.status}
+            </if>
+            <if test="applyendTime != '' and applyendTime != null">
+                and apply_time &lt;= #{applyendTime}
             </if>
-            <if test="jyjcOpeningApplicationModel.applyTime != '' and jyjcOpeningApplicationModel.applyTime != null">
-                and apply_time like concat('%',#{jyjcOpeningApplicationModel.applyTime},'%')
+            <if test="applyStartTime != '' and applyStartTime != null">
+                and apply_time &gt;=#{applyStartTime}
             </if>
         </where>
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/pom.xml

@@ -15,6 +15,7 @@
             <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-module-jyjc-api</artifactId>
             <version>1.0.0</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.amosframework.boot</groupId>
@@ -24,7 +25,7 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-workflow</artifactId>
-            <version>1.8.5</version>
+            <version>1.10.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/BaseException.java

 package com.yeejoin.amos.boot.module.jyjc.biz.config;
 
-import com.yeejoin.amos.boot.module.tcm.api.enums.BaseExceptionEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.BaseExceptionEnum;
 
 /**
  * @Author cpp

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/CommonException.java

 package com.yeejoin.amos.boot.module.jyjc.biz.config;
 
 
-import com.yeejoin.amos.boot.module.tcm.api.common.BaseException;
-import com.yeejoin.amos.boot.module.tcm.api.enums.CommonErrorEnum;
+import com.yeejoin.amos.boot.module.ymt.api.common.BaseException;
+import com.yeejoin.amos.boot.module.ymt.api.enums.CommonErrorEnum;
 
 /**
  * @description: 共同异常类

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

+package com.yeejoin.amos.boot.module.jyjc.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
+import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonserviceImpl;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcOpeningApplicationServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * @author system_generator
+ * @date 2023-12-13
+ */
+@RestController
+@Api(tags = "公共接口controller")
+@RequestMapping(value = "/common")
+public class CommonController extends BaseController {
+
+	@Autowired
+	CommonserviceImpl commonserviceImpl;
+
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/getJyjcPersonByUnitCode")
+	@ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员列表", notes = "根据公司的unitCode获取检测检验人员列表")
+	public ResponseModel<List<TzsUserInfo>> getUserInfosByUnitCode(@RequestParam String unitCode) {
+	    return ResponseHelper.buildResponse(commonserviceImpl.getUserInfosByUnitCode(unitCode));
+	}
+
+}

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

@@ -6,6 +6,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionResultServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -80,8 +82,8 @@ public class JyjcInspectionResultController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<JyjcInspectionResultModel> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryBySeq(sequenceNbr));
+	public ResponseModel<Map<String, Object>> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryDetailBySeq(sequenceNbr));
 	}
 
 	/**

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
+import cn.hutool.core.map.MapBuilder;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
+import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.GroupModel;
@@ -23,6 +25,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -68,9 +71,9 @@ public class JyjcOpeningApplicationController extends BaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}/submit")
+	@PutMapping(value = "/submit")
 	@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
-	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
 		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
 	}
@@ -80,7 +83,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "重新提交开通申请", notes = "重新提交开通申请")
 	public ResponseModel<JyjcOpeningApplicationModel> resubmitJyjcOpeningApplication(@RequestBody JyjcOpeningApplicationModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
-		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model, true));
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.resubmit(model));
 	}
 
 	/**
@@ -127,6 +130,25 @@ public class JyjcOpeningApplicationController extends BaseController {
 	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page,jyjcOpeningApplicationDto));
 	}
 
+
+	/**
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/pageForCompany")
+	@ApiOperation(httpMethod = "GET",value = "分页查询-公司",  notes = "分页查询-公司")
+	public ResponseModel<Page<JyjcOpeningApplicationModel>> querypageForCompany(@RequestParam(value = "current") int current,@RequestParam
+			(value = "size") int size,JyjcOpeningApplicationModel jyjcOpeningApplicationDto) {
+		Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.querypageForCompany(page,jyjcOpeningApplicationDto));
+	}
+
 	/**
 	 * 列表全部数据查询
      *
@@ -149,9 +171,12 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "接收或者驳回业务开通申请",   notes = "接收或者驳回业务开通申请")
 	@PostMapping(value = "/execueFlow")
-	public void execueFlow(@RequestBody Map<String,Object> params) {
+	public ResponseModel<HashMap<String,String>> execueFlow(@RequestBody Map<String,Object> params) {
 
 		jyjcOpeningApplicationServiceImpl.execueFlow(params);
+		HashMap<String,String> result =new HashMap<>();
+		result.put("result","success");
+		return ResponseHelper.buildResponse(result);
 	}
 
 	/**
@@ -161,22 +186,30 @@ public class JyjcOpeningApplicationController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "撤回业务开通申请",   notes = "撤回业务开通申请")
-	@GetMapping(value = "/stopFlow")
+	@GetMapping(value = "/rollBackFlow")
 	public void overflow( @RequestParam("instanceId") String instanceId) {
 		jyjcOpeningApplicationServiceImpl.stopFlow(instanceId);
 	}
 
-
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getUserRole")
 	@ApiOperation(httpMethod = "GET", value = "获取用户所属组", notes = "获取用户所属组")
 	public ResponseModel<List<Long>> getUserRole() {
 		AgencyUserModel userModel = Privilege.agencyUserClient.queryByUserId(RequestContext.getExeUserId()).getResult();
+		if (userModel == null) {
+			throw new BaseException("请先登陆！");
+		}
 		List<RoleModel> roleModels = userModel.getOrgRoles()
 											  .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
 		List<Long> roleIds = roleModels.stream().map(RoleModel::getSequenceNbr).distinct().collect(Collectors.toList());
 		return ResponseHelper.buildResponse(roleIds);
 	}
 
+	@TycloudOperation (ApiLevel = UserType.AGENCY)
+	@ApiOperation (httpMethod = "GET", value = "办理状态枚举列表", notes = "办理状态枚举列表")
+	@GetMapping (value = "/flow-status/list")
+	public ResponseModel<List<Map<String, Object>>> selectForFlowStatusList() {
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.selectForFlowStatusList());
+	}
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/WorkflowFeignClient.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.feign;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -56,6 +57,7 @@ public interface WorkflowFeignClient {
             @RequestHeader(name="token",required = true) String token,
             @PathVariable(value = "processInstanceId") String processInstanceId);
 
-
+    @RequestMapping(value = "/v2/task/rollBack/{processInstanceId}", method = RequestMethod.POST)
+    JSONObject rollBack(@PathVariable(value = "processInstanceId") String processInstanceId);
 }
 

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.ymt.api.entity.TzsUserInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import java.util.List;
+
 
 @Service
 public class CommonserviceImpl {
+
+    @Value("${jyjc.user-post:6615}")
+    private String jyjcUserPost;
     @Autowired
     RedisUtils redisUtils;
+    @Autowired
+    TzsUserInfoMapper userInfoMapper;
+
 
     /**
-     * @description 获取当前用户注册信息
      * @return ReginParams
+     * @description 获取当前用户注册信息
      */
-    ReginParams getReginParamsOfCurrentUser() {
+    public ReginParams getReginParamsOfCurrentUser() {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         return reginParams;
     }
 
+    public List<TzsUserInfo> getUserInfosByUnitCode(String unitCode) {
+        QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
+        userInfoQueryWrapper.eq("unit_code", unitCode);
+        userInfoQueryWrapper.like("post", jyjcUserPost);
+        List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
+        return userInfos;
+    }
 }

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultAttachmentMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttachmentService;
@@ -30,4 +31,11 @@ public class JyjcInspectionResultAttachmentServiceImpl extends BaseService<JyjcI
     public List<JyjcInspectionResultAttachmentModel> queryForJyjcInspectionResultAttachmentList()   {
         return this.queryForList("" , false);
     }
+
+    @Override
+    public List<JyjcInspectionResultAttachment> getObjByResultSeq(Long resultSeq) {
+        LambdaQueryWrapper<JyjcInspectionResultAttachment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyjcInspectionResultAttachment::getResultSeq, resultSeq);
+        return this.baseMapper.selectList(wrapper);
+    }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.map.MapUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultMapper;
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttachmentService;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 业务开通申请表服务实现类
@@ -17,6 +29,11 @@ import java.util.List;
  */
 @Service
 public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionResultModel,JyjcInspectionResult,JyjcInspectionResultMapper> implements IJyjcInspectionResultService {
+
+    @Autowired
+    private IJyjcInspectionResultAttachmentService jyjcInspectionResultAttachmentService;
+
+
     /**
      * 分页查询
      */
@@ -30,4 +47,23 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     public List<JyjcInspectionResultModel> queryForJyjcInspectionResultList()   {
         return this.queryForList("" , false);
     }
+
+    @Override
+    public Map<String, Object> queryDetailBySeq(Long sequenceNbr) {
+        Map<String, Object> map = new HashMap<>();
+
+        JyjcInspectionResultModel jyjcInspectionResultModel = this.queryBySeq(sequenceNbr);
+        if (!ObjectUtils.isEmpty(jyjcInspectionResultModel)) {
+            // 对象转map
+            map = BeanUtil.beanToMap(jyjcInspectionResultModel);
+
+            // 获取附件
+            List<JyjcInspectionResultAttachment> attachmentList = jyjcInspectionResultAttachmentService.getObjByResultSeq(sequenceNbr);
+            if (!CollectionUtils.isEmpty(attachmentList)) {
+                Map<String, Object> attachmentMap = attachmentList.stream().collect(Collectors.toMap(JyjcInspectionResultAttachment::getAttachmentType, JyjcInspectionResultAttachment::getAttachmentUrl));
+                map.putAll(attachmentMap);
+            }
+        }
+        return map;
+    }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.jyjc.api.common.CommonConstants;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
-import com.yeejoin.amos.boot.module.jyjc.biz.config.CommonException;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.WorkflowFeignClient;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
-import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
-import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
-import com.yeejoin.amos.boot.module.tcm.api.enums.LicenceTypeEnum;
-import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
-import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseUnitLicenceMapper;
-import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseUnitLicenceMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -36,8 +34,7 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.apache.commons.lang3.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
-import org.bouncycastle.cert.ocsp.Req;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,7 +44,6 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -71,12 +67,15 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     JyjcOpeningApplicationMapper jyjcOpeningApplicationMapper;
 
-    @Resource (type = JyjcBaseMapper.class)
+    @Resource(type = JyjcBaseMapper.class)
     private JyjcBaseMapper baseMapper;
 
-    @Value ("${process-definition-key.jyjc.openapplication:}")
+    @Value("${process-definition-key.jyjc.openapplication:}")
     private String processDefinitionKey;
 
+    @Value("${jyjc.user-post:6615}")
+    private String jyjcUserPost;
+
     @Autowired
     private RedisUtils redisUtils;
 
@@ -90,7 +89,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     private WorkflowFeignClient workflowFeignClient;
 
-    @Transactional (rollbackFor = {Exception.class, BaseException.class})
+    @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel saveOrUpdateModel(JyjcOpeningApplicationModel model, Boolean enableStartFlow) {
         try {
             if (enableStartFlow) {
@@ -98,12 +97,21 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 String instanceId = startFlow();
                 JSONObject dataObject = getTask(instanceId);
                 JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
-                if(!ValidationUtil.isEmpty(executorArray)) {
+                if (!ValidationUtil.isEmpty(executorArray)) {
                     String roleGroups = executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
                     model.setWorkflowRole(roleGroups);
                 }
-                model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "");
+                model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + "");
+                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());
+            } else {
+                model.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "");
+                model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
             }
             if (model.getSequenceNbr() == null) {
                 CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
@@ -121,39 +129,33 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         }
     }
 
-    public void updateModelByInstanceId(String instanceId) {
-        log.info("updateModelByInstanceId, instanceId={}", instanceId);
+    @Transactional(rollbackFor = {Exception.class, BaseException.class})
+    public JyjcOpeningApplicationModel resubmit(JyjcOpeningApplicationModel model) {
+        model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + "");
+        model.setStatusName(FlowStatusEnum.SUBMITTED.getName());
+        model = this.updateWithModel(model);
+        execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", model.getWorkflowProstanceId()).put("comments", "").build());
+        return model;
+    }
+
+    public void updateModelByInstanceId(String instanceId, String status) {
         JyjcOpeningApplication entity = this.lambdaQuery().eq(JyjcOpeningApplication::getWorkflowProstanceId, instanceId).one();
         if (entity == null) {
             return;
         }
         JSONObject taskJson = getTask(instanceId);
-        log.info("taskJson => {}", taskJson);
+        if (taskJson == null) {
+            log.warn("流程=>{}查询不到或已结束", instanceId);
+            return;
+        }
         entity.setWorkflowRole(getWorkflowRoleGroups(taskJson));
-        entity.setStatus(getWorkflowStatus(taskJson));
+        // entity.setStatus(getWorkflowStatus(taskJson));
+        entity.setWorkflowActiveKey(taskJson.getString("taskDefinitionKey"));
+        entity.setStatus(status);
+        entity.setStatusName(FlowStatusEnum.getNameByType(Long.parseLong(status)));
         this.updateById(entity);
     }
 
-    private String getWorkflowStatus(JSONObject dataObject) {
-        return !ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "";
-    }
-
-    private String getWorkflowRoleGroups(JSONObject dataObject) {
-        JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
-        if(!ValidationUtil.isEmpty(executorArray)) {
-            return executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
-        }
-        return null;
-    }
-
-    private JSONObject getTask(String instanceId) {
-        AjaxResult ajaxResult = Workflow.taskClient.getTask(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);
-        dataObject.put("nodeInfo", nodeInfo.getResult());
-        return dataObject;
-    }
 
     /**
      * 分页查询
@@ -171,12 +173,31 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     }
 
     public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationModel jyjcOpeningApplicationModel) {
+        String applyStartTime = "";
+        String applyEndTime = "";
+        if (ObjectUtils.isNotEmpty(jyjcOpeningApplicationModel.getApplyTime())) {
+            String date = DateUtil.format(jyjcOpeningApplicationModel.getApplyTime(), DatePattern.NORM_DATE_PATTERN);
+            applyStartTime = date + " 00:00:00";
+            applyEndTime = date + " 23:59:59";
+        }
+        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationModel, applyStartTime, applyEndTime);
+    }
+
+    public Page<JyjcOpeningApplicationModel> querypageForCompany(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationModel jyjcOpeningApplicationModel) {
         //根据申请单中的单位信息对于列表数据进行过滤
         CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
         if (companyBo.getLevel().equals("company")) {
             jyjcOpeningApplicationModel.setUnitCode(companyBo.getCompanyCode());
         }
-        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationModel);
+
+        String applyStartTime = "";
+        String applyEndTime = "";
+        if (ObjectUtils.isNotEmpty(jyjcOpeningApplicationModel.getApplyTime())) {
+            String date = DateUtil.format(jyjcOpeningApplicationModel.getApplyTime(), DatePattern.NORM_DATE_PATTERN);
+            applyStartTime = date + " 00:00:00";
+            applyEndTime = date + " 23:59:59";
+        }
+        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationModel, applyStartTime, applyEndTime);
     }
 
 
@@ -200,7 +221,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
         }
         String unitCode = reginParams.getCompany().getCompanyCode();
-        unitCode="91611103MAC4Q1EG7B"; // 测试用，之后务必删除！！！
+        unitCode = "91611103MAC4Q1EG7B"; // 测试用，之后务必删除！！！
         QueryWrapper enterpriseInfoQueryWrapper = new QueryWrapper<>();
         enterpriseInfoQueryWrapper.eq("use_code", unitCode);
         TzBaseEnterpriseInfo baseUnitLicenceEntity = enterpriseInfoMapper.selectOne(enterpriseInfoQueryWrapper);
@@ -208,10 +229,17 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         if (baseUnitLicenceEntity != null) {
             jyjcOpeningApplicationModel.setUseContact(baseUnitLicenceEntity.getUseContact());
             jyjcOpeningApplicationModel.setContactPhone(baseUnitLicenceEntity.getContactPhone());
-            jyjcOpeningApplicationModel.setIndustrySupervisor(baseUnitLicenceEntity.getIndustrySupervisor());
+            if (StringUtils.isNotBlank(baseUnitLicenceEntity.getIndustrySupervisor())) {
+                List<Map<String, String>> dicts = baseMapper.selectDataDictionaryList(Arrays.asList(baseUnitLicenceEntity.getIndustrySupervisor()));
+                if (!ValidationUtil.isEmpty(dicts)) {
+                    jyjcOpeningApplicationModel.setIndustrySupervisor(dicts.get(0).get("name"));
+                } else {
+                    jyjcOpeningApplicationModel.setIndustrySupervisor(baseUnitLicenceEntity.getIndustrySupervisor());
+                }
+            }
             jyjcOpeningApplicationModel.setLongitude(baseUnitLicenceEntity.getLongitude());
             jyjcOpeningApplicationModel.setLatitude(baseUnitLicenceEntity.getLatitude());
-            if(ObjectUtils.isNotEmpty(baseUnitLicenceEntity.getUnitBusinessLicense())) {
+            if (ObjectUtils.isNotEmpty(baseUnitLicenceEntity.getUnitBusinessLicense())) {
                 jyjcOpeningApplicationModel.setUnitBusinessLicense(JSONArray.parseArray(baseUnitLicenceEntity.getUnitBusinessLicense(), AttachmentDto.class));
             }
         }
@@ -223,29 +251,30 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         List<TzBaseUnitLicenceDto> baseUnitLicences = baseMapper.selectBaseUnitLicenceList(MapBuilder.<String, Object>create()
                 .put("unitCode", unitCode)
                 // .put("licenceType", LicenceTypeEnum.JYJC.getCode())
-                                                                                                     .build());
+                .build());
         jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicences);
         // 获取检验人员信息
         QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
         userInfoQueryWrapper.eq("unit_code", unitCode);
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         if (!ValidationUtil.isEmpty(userInfos)) {
-            List<String> codes = userInfos.stream()
-                                       .map(o -> o.getPost() != null ? JSON.parseArray(o.getPost(), String.class) : null)
-                                       .filter(Objects::nonNull)
-                                       .collect(Collectors.toList())
-                                       .stream().flatMap(o -> o.stream()).distinct().collect(Collectors.toList());
-            List<Map<String, String>> dicts = baseMapper.selectDataDictionaryList(codes);
+            // List<String> codes = userInfos.stream()
+            //                            .map(o -> o.getPost() != null ? JSON.parseArray(o.getPost(), String.class) : null)
+            //                            .filter(Objects::nonNull)
+            //                            .collect(Collectors.toList())
+            //                            .stream().flatMap(o -> o.stream()).distinct().collect(Collectors.toList());
+            // List<Map<String, String>> dicts = baseMapper.selectDataDictionaryList(codes);
             List<TzsUserInfoDto> userInfoDtos = userInfos.stream().map(o -> {
                 TzsUserInfoDto dto = new TzsUserInfoDto();
                 Bean.toModel(o, dto);
-                if (o.getPost() != null) {
-                   List<String> temps = JSON.parseArray(o.getPost(), String.class);
-                   String postName = temps.stream().map(m -> dicts.stream().filter(dict -> dict.get("code").equals(m)).findFirst().map(n -> n.get("name")).orElse("")).collect(Collectors.joining(","));
-                   dto.setPostName(postName);
-                }
+                // 字段不要了
+                // if (o.getPost() != null) {
+                //    List<String> temps = JSON.parseArray(o.getPost(), String.class);
+                //    String postName = temps.stream().map(m -> dicts.stream().filter(dict -> dict.get("code").equals(m)).findFirst().map(n -> n.get("name")).orElse("")).collect(Collectors.joining(","));
+                //    dto.setPostName(postName);
+                // }
                 return dto;
-            }).collect(Collectors.toList());
+            }).filter(o -> o.getPost() != null && o.getPost().contains(jyjcUserPost)).collect(Collectors.toList());
             jyjcOpeningApplicationModel.setUserInfos(userInfoDtos);
         }
         return jyjcOpeningApplicationModel;
@@ -263,17 +292,16 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         if (ajaxResult == null || (ajaxResult.get(AjaxResult.CODE_TAG) != null && !"200".equals(ajaxResult.get(AjaxResult.CODE_TAG).toString()))) {
             throw new BaseException("开启工作流错误");
         }
-        String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
-        return instanceId;
+        return ((Map) ajaxResult.get("data")).get("id").toString();
     }
 
     /**
      * 接收/驳回通知检验单
      */
-   public void execueFlow(Map<String,Object> params) {
-       String op = params.get("op").toString();
-       String instanceId = params.get("instanceId").toString();
-       String comments= params.get("comments").toString();
+    public void execueFlow(Map<String, Object> params) {
+        String op = params.get("op").toString();
+        String instanceId = params.get("instanceId").toString();
+        String comments = params.get("comments").toString();
         try {
             AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
@@ -283,8 +311,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
 //            dto.setResult(op);
             dto.setResultCode("approvalStatus");
             dto.setTaskId(taskId);
-            HashMap<String,Object> varibalble = new HashMap<>();
-            varibalble.put("approvalStatus",op);
+            HashMap<String, Object> varibalble = new HashMap<>();
+            varibalble.put("approvalStatus", op);
             dto.setVariable(varibalble);
             dto.setComment(comments);
             //执行流程
@@ -292,14 +320,14 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             if (ObjectUtils.isEmpty(ajaxResult1)) {
 
             }
-            updateModelByInstanceId(instanceId);
-            if(op.equals("0")){
+            updateModelByInstanceId(instanceId, "0".equals(op) ? FlowStatusEnum.HAVE_PROCESSED.getCode() + "" : FlowStatusEnum.REJECTED.getCode() + "");
+            if (op.equals("0")) {
                 String originalDataId = params.get("originalDataId").toString();
-                JyjcOpeningApplication jyjcOpeningApplication=jyjcOpeningApplicationMapper.selectById(originalDataId);
-                List<String> detectionRegion = Arrays.asList(params.get("detectionRegion").toString().split(",")) ;
-                String detectionRegionName =  params.get("detectionRegionName").toString();
+                JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(originalDataId);
+                List<String> detectionRegion = Arrays.asList(params.get("detectionRegion").toString().replace("[", "").replace("]", "").split(","));
+//                String detectionRegionName =  params.get("detectionRegionName").toString();
                 jyjcOpeningApplication.setDetectionRegion(detectionRegion);
-                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
+//                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
                 jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
             }
         } catch (Exception e) {
@@ -307,24 +335,42 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         }
     }
 
-
-
     /**
      * 撤回流程办理单
      */
-   public void stopFlow(String instanceId) {
+    public void stopFlow(String instanceId) {
         try {
             //撤回流程
-            AjaxResult ajaxResult1 = Workflow.taskClient.stopProcess(instanceId);
-            if (ObjectUtils.isEmpty(ajaxResult1)) {
+            JSONObject jsonObject = workflowFeignClient.rollBack(instanceId);
+            if (ObjectUtils.isEmpty(jsonObject)) {
 
             }
-            updateModelByInstanceId(instanceId);
+            updateModelByInstanceId(instanceId, FlowStatusEnum.REJECTED.getCode() + "");
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
+    private String getWorkflowStatus(JSONObject dataObject) {
+        return !ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "";
+    }
+
+    private String getWorkflowRoleGroups(JSONObject dataObject) {
+        JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
+        if (!ValidationUtil.isEmpty(executorArray)) {
+            return executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
+        }
+        return null;
+    }
+
+    private JSONObject getTask(String instanceId) {
+        AjaxResult ajaxResult = Workflow.taskClient.getTask(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);
+        dataObject.put("nodeInfo", nodeInfo.getResult());
+        return dataObject;
+    }
 
     /**
      * JY+年（4位）+月（2位）+日（2位）+序列号（3位
@@ -354,4 +400,15 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return (calendar.getTimeInMillis() - System.currentTimeMillis()) / 1000;
     }
 
+    public List<Map<String, Object>> selectForFlowStatusList() {
+        return Arrays.stream(FlowStatusEnum.values()).map(this::mapPointTypeToMap).collect(Collectors.toList());
+    }
+
+    private Map<String, Object> mapPointTypeToMap(FlowStatusEnum e) {
+        Map<String, Object> record = new HashMap<>();
+        record.put("key", e.getCode());
+        record.put("label", e.getName());
+        return record;
+    }
+
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseUnitLicenceDto.java

@@ -102,7 +102,7 @@ public class BaseUnitLicenceDto extends BaseDto {
     private String agencyType;
 
     @ApiModelProperty(value = "机构类别枚举名称，冗余")
-    private String agencyTypeCode;
+    private String agencyTypeName;
 
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseUnitLicenceDto.java

@@ -97,7 +97,7 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     private String agencyType;
 
     @ApiModelProperty(value = "机构类别枚举名称，冗余")
-    private String agencyTypeCode;
+    private String agencyTypeName;
 
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/BaseUnitLicence.java

@@ -25,6 +25,7 @@ public class BaseUnitLicence extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+
     /**
      * 单位编码
      */
@@ -176,7 +177,7 @@ public class BaseUnitLicence extends BaseEntity {
     private String agencyType;
 
     @ApiModelProperty(value = "机构类别枚举名称，冗余")
-    private String agencyTypeCode;
+    private String agencyTypeName;
 
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java

@@ -102,7 +102,7 @@ public class TzBaseUnitLicence extends BaseEntity {
     private String agencyType;
 
     @ApiModelProperty(value = "机构类别枚举名称，冗余")
-    private String agencyTypeCode;
+    private String agencyTypeName;
 
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application.properties

-spring.application.name=TZS-COMMON-tb
+spring.application.name=TZS-COMMON
 server.servlet.context-path=/tcm
 server.port=11002
 spring.profiles.active=dev

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

@@ -32,6 +32,9 @@ public class TzsUserInfoDto extends BaseDto {
     @ApiModelProperty(value = "岗位")
     private String post;
 
+    @ApiModelProperty(value = "岗位名称")
+    private String postName;
+
     @ApiModelProperty(value = "联系电话")
     private String phone;
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/ApplicationFormTypeEnum.java → amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

-package com.yeejoin.amos.boot.module.tcm.api.enums;
+package com.yeejoin.amos.boot.module.ymt.api.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ICreateCodeService.java → amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/ICreateCodeService.java

-package com.yeejoin.amos.boot.module.tcm.api.service;
+package com.yeejoin.amos.boot.module.ymt.api.service;
 
 import java.util.List;
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/CreateCodeServiceImpl.java → amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/impl/CreateCodeServiceImpl.java

-package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
+package com.yeejoin.amos.boot.module.ymt.api.service.impl;
 
-import com.yeejoin.amos.boot.module.tcm.api.enums.ApplicationFormTypeEnum;
-import com.yeejoin.amos.boot.module.tcm.api.service.ICreateCodeService;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;