Merge branch 'develop_tzs_register' of…

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/aop/OpenApiControllerAop.java

@@ -44,7 +44,7 @@ public class OpenApiControllerAop {
         String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany","/bizToken/applyToken",
                 "/openapi/bizToken/getAppId","/lift/upload","/lift/status","/lift/run","/lift/fault",
                 "/lift/video/preview","/cylinderPage/serviceProvider","/cylinderPage/getTableInfo",
-                "/cylinderPage/initCylinderNum","/openapi/appId/setAppId","/openapi/xi-an/importData"};
+                "/cylinderPage/initCylinderNum","/openapi/appId/setAppId"};
         // 获取请求路径
         for(String uri : url) {
             if(request.getRequestURI().indexOf(uri) != -1) {

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/XiAnDataDockController.java

@@ -26,15 +26,12 @@ public class XiAnDataDockController {
     }
 
     /**
-     * 批量导入设备数据的接口
-     *
-     * @param file 上传的文件
-     * @return ResponseModel 封装的响应数据
+     * 西安除电梯外七大类设备批量导入
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/importData")
-    @ApiOperation(httpMethod = "POST", value = "设备批量导入", notes = "导入多个设备的数据文件")
-    public Object importPressureData(@RequestParam("file") MultipartFile file) {
+    @ApiOperation(httpMethod = "POST", value = "西安除电梯外七大类设备批量导入", notes = "西安除电梯外七大类设备批量导入")
+    public Object importPressureData(@RequestParam MultipartFile file) {
         // 校验文件是否为空
         if (file.isEmpty()) {
             return ResponseHelper.buildResponse("文件不能为空");

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/DictParamsConverter.java

+package com.yeejoin.amos.api.openapi.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictParamsConverter implements Converter<String> {
+
+    private static final Map<String, String> dictMap = new HashMap<>();
+
+    static {
+        // 填充映射关系
+        dictMap.put("油", "5961");
+        dictMap.put("电", "5962");
+        dictMap.put("煤", "5963");
+        dictMap.put("水煤浆", "5964");
+        dictMap.put("生物质", "5965");
+        dictMap.put("余热", "5966");
+        dictMap.put("其他", "5967");
+        dictMap.put("射线", "5969");
+        dictMap.put("超声", "5970");
+        dictMap.put("磁粉", "5971");
+        dictMap.put("渗透", "5972");
+        dictMap.put("固定式", "5990");
+        dictMap.put("半挂式", "5991");
+        dictMap.put("公用管道", "5992");
+        dictMap.put("工业管道", "5993");
+        dictMap.put("锅筒(锅壳)", "6005");
+        dictMap.put("过热器出口集箱", "6006");
+        dictMap.put("启动分离器", "6007");
+        dictMap.put("长输管道", "5994");
+        dictMap.put("磁粉", "5988");
+        dictMap.put("射线", "5986");
+        dictMap.put("超声", "5987");
+        dictMap.put("渗透", "5989");
+        dictMap.put("A1", "6094");
+        dictMap.put("A2", "6095");
+        dictMap.put("A7", "6100");
+        dictMap.put("A8", "6101");
+        dictMap.put("A3", "6096");
+        dictMap.put("A4", "6097");
+        dictMap.put("A5", "6098");
+        dictMap.put("A6", "6099");
+        dictMap.put("牵引索", "6167");
+        dictMap.put("平衡索", "6168");
+        dictMap.put("Ⅰ类", "1");
+        dictMap.put("Ⅱ类", "2");
+        dictMap.put("Ⅲ类", "3");
+        dictMap.put("ⅢA类", "4");
+        dictMap.put("ⅢB类", "5");
+        dictMap.put("ⅢC类", "6");
+        dictMap.put("M1", "6531");
+        dictMap.put("M2", "6532");
+        dictMap.put("M3", "6533");
+        dictMap.put("M4", "6534");
+        dictMap.put("M5", "6535");
+        dictMap.put("M6", "6536");
+        dictMap.put("M7", "6537");
+        dictMap.put("M8", "6538");
+        dictMap.put("M9", "6539");
+        dictMap.put("M10", "6540");
+        dictMap.put("A级", "5957");
+        dictMap.put("B级", "5958");
+        dictMap.put("C级", "5959");
+        dictMap.put("D级", "5960");
+        dictMap.put("GC1", "6002");
+        dictMap.put("GC2", "6003");
+        dictMap.put("GC3", "6004");
+        dictMap.put("压缩天然气", "COMPRESSED_NATURAL_GAS");
+        dictMap.put("液化天然气", "LIQUEFIED_NATURAL_GAS");
+        dictMap.put("液化石油气", "LIQUEFIED_PETROLEUM_GAS");
+        dictMap.put("氢气", "HYDROGEN");
+    }
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        // 实体类中对象属性类型
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty,
+                                    GlobalConfiguration globalConfiguration) {
+        // 从Cell中读取数据
+        String cellValue = cellData.getStringValue();
+        // 判断Excel中的值，将其转换为预期的数值
+        return dictMap.getOrDefault(cellValue, null);
+    }
+
+    @Override
+    public CellData convertToExcelData(String o, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return new CellData("");
+    }
+
+    public static void main(String[] args) {
+
+    }
+}
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/InformationSituationConverter.java

+package com.yeejoin.amos.api.openapi.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class InformationSituationConverter implements Converter<String> {
+
+    private static final String TYPE_QR_CODE = "二维码";
+    private static final String TYPE_STAMP = "电子标签";
+    private static final String TYPE_NO = "无";
+
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        // 实体类中对象属性类型
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty,
+                                     GlobalConfiguration globalConfiguration) {
+        // 从Cell中读取数据
+        String cellValue = cellData.getStringValue();
+        // 判断Excel中的值，将其转换为预期的数值
+        if (TYPE_QR_CODE.equals(cellValue)) {
+            return "1";
+        } else if (TYPE_STAMP.equals(cellValue)) {
+            return "2";
+        }
+        return "99";
+    }
+
+    @Override
+    public CellData convertToExcelData(String o, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        // 判断实体类中获取的值，转换为Excel预期的值，并封装为CellData对象
+        if (o == null) {
+            return new CellData("");
+        } else if (o.equals("1")) {
+            return new CellData(TYPE_QR_CODE);
+        } else if (o.equals("2")) {
+            return new CellData(TYPE_STAMP);
+        }
+        return new CellData(TYPE_NO);
+    }
+}
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/VehicleCylinderConverter.java

+package com.yeejoin.amos.api.openapi.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class VehicleCylinderConverter implements Converter<String> {
+
+    private static final String WHETHER = "是";
+    private static final String NOT = "否";
+
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        // 实体类中对象属性类型
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        // Excel中对应的CellData属性类型
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty,
+                                     GlobalConfiguration globalConfiguration) {
+        // 从Cell中读取数据
+        String cellValue = cellData.getStringValue();
+        // 判断Excel中的值，将其转换为预期的数值
+        if (WHETHER.equals(cellValue)) {
+            return "1";
+        } else if (NOT.equals(cellValue)) {
+            return "0";
+        }
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(String o, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        // 判断实体类中获取的值，转换为Excel预期的值，并封装为CellData对象
+        if (o == null) {
+            return new CellData("");
+        } else if (o.equals("1")) {
+            return new CellData(WHETHER);
+        } else if (o.equals("0")) {
+            return new CellData(NOT);
+        }
+        return new CellData("");
+    }
+}
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/dto/XiAnEquipInfoExcelDto.java

@@ -24,17 +24,17 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     //----------------------------------------------------------------------基本信息
 
     @ApiModelProperty(value = "设备种类")
-    @ExcelProperty(value = "设备种类",converter = EquListConverter.class)
+    @ExcelProperty(value = "设备种类", converter = EquListConverter.class)
     @NotBlank(message = "设备种类不能为空")
     private String equList;
 
     @ApiModelProperty(value = "设备类别")
-    @ExcelProperty(value = "设备类别",converter = EquCategoryConverter.class)
+    @ExcelProperty(value = "设备类别", converter = EquCategoryConverter.class)
     @NotBlank(message = "设备类别不能为空")
     private String equCategory;
 
     @ApiModelProperty(value = "设备品种")
-    @ExcelProperty(value = "设备品种",converter = EquDefineConverter.class)
+    @ExcelProperty(value = "设备品种", converter = EquDefineConverter.class)
     private String equDefine;
 
     @ApiModelProperty(value = "单位内编号")
@@ -64,7 +64,32 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
 
     @ApiModelProperty(value = "设备代码")
     @ExcelProperty(value = "设备代码")
-    private String equCode;//判断是否必填和位数
+    private String equCode;
+
+    @ApiModelProperty(value = "工程（装置）名称")
+    @ExcelProperty(value = "工程（装置）名称")
+    private String projectContraption;
+
+    @ApiModelProperty(value = "是否球罐")
+    @ExcelProperty(value = "是否球罐", converter = VehicleCylinderConverter.class)
+    private String whetherSphericalTank;
+
+    @ApiModelProperty(value = "是否撬装式压力容器")
+    @ExcelProperty(value = "是否撬装式压力容器")
+    private String whetherSkidMountedPressureVessel;
+
+    @ApiModelProperty(value = "是否车用气瓶")
+    @ExcelProperty(value = "是否车用气瓶", converter = VehicleCylinderConverter.class)
+    @NotBlank(message = "是否车用气瓶不能为空")
+    private String whetherVehicleCylinder;
+
+    @ApiModelProperty(value = "信息化管理情况")
+    @ExcelProperty(value = "信息化管理情况", converter = InformationSituationConverter.class)
+    private String informationSituation;
+
+    @ApiModelProperty(value = "二维码或者电子标签编号")
+    @ExcelProperty(value = "二维码或者电子标签编号")
+    private String informationManageCode;
 
     //-----------------------------------------------------------------------使用信息
 
@@ -175,7 +200,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "起升高度（m）")
     private String liftingHeight;
 
-    @ExcelProperty(value = "工作级别")
+    @ExcelProperty(value = "工作级别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "工作级别")
     private String workLevel;
 
@@ -183,7 +208,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "燃爆物质")
     private String explosiveSubstance;
 
-    @ExcelProperty(value = "区域防爆等级")
+    @ExcelProperty(value = "区域防爆等级", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "区域防爆等级")
     private String explosionProofGrade;
 
@@ -229,11 +254,11 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
 
     @ExcelProperty(value = "额定乘员数（人）")
     @ApiModelProperty(value = "额定乘员数（人）")
-    private String aa;
+    private String ratedMembers;
 
     @ExcelProperty(value = "额定提升速度(m/min)")
     @ApiModelProperty(value = "额定提升速度(m/min)")
-    private String ratedMembers;
+    private String ratedLiftingSpeed;
 
     @ExcelProperty(value = "自由端高度(m)")
     @ApiModelProperty(value = "自由端高度(m)")
@@ -340,7 +365,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "防爆温度组别")
     private String temperatureGroup;
 
-    @ExcelProperty(value = "防爆设备保护级别")
+    @ExcelProperty(value = "防爆设备保护级别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "防爆设备保护级别")
     private String protectGrade;
 
@@ -382,7 +407,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
 
     //--------------------------------------------------------------锅炉----技术参数
 
-    @ExcelProperty(value = "设备级别")
+    @ExcelProperty(value = "设备级别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "设备级别")
     private String deviceLevel;
 
@@ -438,11 +463,11 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "燃烧方式")
     private String combustionMode;
 
-    @ExcelProperty(value = "燃料（热源）种类")
+    @ExcelProperty(value = "燃料（热源）种类", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "燃料（热源）种类")
     private String fuelType;
 
-    @ExcelProperty(value = "主要受压部件-名称")
+    @ExcelProperty(value = "主要受压部件-名称", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "主要受压部件-名称")
     private String nameOfPressureParts;
 
@@ -454,7 +479,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "主要受压部件-壁厚(mm)")
     private String wallThicknessOfPressureParts;
 
-    @ExcelProperty(value = "主要受压部件-无损检测方法")
+    @ExcelProperty(value = "主要受压部件-无损检测方法", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "主要受压部件-无损检测方法")
     private String nonDestructiveTestingMethodsForPressureParts;
 
@@ -516,7 +541,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "壁厚")
     private String wallThickness;
 
-    @ExcelProperty(value = "无损检测方法（气瓶）")
+    @ExcelProperty(value = "无损检测方法（气瓶）", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "无损检测方法（气瓶）")
     private String qpLossless;
 
@@ -540,7 +565,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "单瓶容积(L)")
     private String singleBottleVolume;
 
-    @ExcelProperty(value = "充装介质")
+    @ExcelProperty(value = "充装介质",converter = DictParamsConverter.class)
     @ApiModelProperty(value = "充装介质")
     private String chargingMedium;
 
@@ -552,7 +577,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "材料（瓶体）")
     private String bottleBody;
 
-    @ExcelProperty(value = "无损检测方法（管路）")
+    @ExcelProperty(value = "无损检测方法（管路）", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "无损检测方法（管路）")
     private String glLossless;
 
@@ -712,11 +737,11 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "最高允许工作压力（壳程）")
     private String maxPressureShell;
 
-    @ExcelProperty(value = "主体结构型式")
+    @ExcelProperty(value = "主体结构型式", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "主体结构型式")
     private String mainStructureType;
 
-    @ExcelProperty(value = "无损检测方法")
+    @ExcelProperty(value = "无损检测方法", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "无损检测方法")
     private String checkLossless;
 
@@ -798,7 +823,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
 
     //--------------------------------------------------------------------压力管道----技术参数
 
-    @ExcelProperty(value = "管道类别")
+    @ExcelProperty(value = "管道类别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "管道类别")
     private String pipelineClass;
 
@@ -822,8 +847,8 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "介质")
     private String medium_YLGD;
 
-    @ExcelProperty(value = "起/始位置 （经纬度）")
-    @ApiModelProperty(value = "起/始位置 （经纬度）")
+    @ExcelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）")
+    @ApiModelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）")
     private String startePosition;
 
     @ExcelProperty(value = "温度(℃)")
@@ -834,7 +859,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "管道编号")
     private String pipelineNumber;
 
-    @ExcelProperty(value = "管道级别")
+    @ExcelProperty(value = "管道级别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "管道级别")
     private String deviceLevel_YLGD;
 
@@ -930,7 +955,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "运量（p/h）")
     private String freightVolume;
 
-    @ExcelProperty(value = "运载索")
+    @ExcelProperty(value = "运载索", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "运载索")
     private String carrierLine;
 

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsJgServiceFeignClient.java

@@ -14,7 +14,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name = "TZS-JG-htt", path = "/jg", configuration = {FeignConfiguration.class})
+@FeignClient(name = "TZS-JG", path = "/jg", configuration = {FeignConfiguration.class})
 public interface TzsJgServiceFeignClient {
 
     /**
@@ -92,4 +92,14 @@ public interface TzsJgServiceFeignClient {
      */
     @RequestMapping(value = "/common/checkEquCodeUniqueness", method = RequestMethod.GET)
     Boolean selectByEquCodeAndClaimStatus(@RequestParam("equCode") String equCode);
+
+
+    /**
+     * 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
+     *
+     * @param factoryNum
+     * @return
+     */
+    @RequestMapping(value = "/common/checkFactoryNumUniquenessForVehicleCylinder", method = RequestMethod.GET)
+    Integer checkFactoryNumUniquenessForVehicleCylinder(@RequestParam("factoryNum") String factoryNum);
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -12,12 +12,13 @@ import com.yeejoin.amos.api.openapi.dto.XiAnEquipInfoExcelDto;
 import com.yeejoin.amos.api.openapi.feign.TzsJgServiceFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
@@ -78,11 +79,19 @@ public class XiAnDataDockServiceImpl {
     public void batchSaveEquipmentData(List<XiAnEquipInfoExcelDto> equipInfoExcelDtos) {
         int batchSize = 1000;
         int totalSize = equipInfoExcelDtos.size();
+        // 主线程中获取登录信息传递到异步线程中
+        String appKey = RequestContext.getAppKey();
+        String product = RequestContext.getProduct();
+        String token = RequestContext.getToken();
+
         List<CompletableFuture<Void>> futures = new ArrayList<>();
         for (int i = 0; i < totalSize; i += batchSize) {
             List<XiAnEquipInfoExcelDto> batch = equipInfoExcelDtos.subList(i, Math.min(totalSize, i + batchSize));
             CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
                 try {
+                    RequestContext.setAppKey(appKey);
+                    RequestContext.setProduct(product);
+                    RequestContext.setToken(token);
                     jgServiceFeignClient.saveEquipmentData(batch);
                 } catch (Exception e) {
                     log.error("西安数据上传，保存设备数据失败: ", e);
@@ -127,24 +136,16 @@ public class XiAnDataDockServiceImpl {
                     // 每读一行都会执行
                     @Override
                     public void invoke(XiAnEquipInfoExcelDto data, AnalysisContext context) {
-                        XiAnEquipInfoExcelDto fireExperts = new XiAnEquipInfoExcelDto();
-                        BeanUtils.copyProperties(data, fireExperts);
                         // 数据检查
                         checkExcelData(sheetName, data, context, sheetError);
                         useInnerCodeList.add(data.getUseInnerCode());
                         equCodeList.add(data.getEquCode());
-                        dataList.add(fireExperts);
+                        dataList.add(data);
                     }
 
                     // 每个sheet页读完都会执行
                     @Override
                     public void doAfterAllAnalysed(AnalysisContext context) {
-
-                        if (CollectionUtils.isEmpty(dataList)) {
-                            resultError.put("allSheet", "你上传了一个空数据的Excel文档!");
-                            throw new BadRequest("你上传了一个空数据的Excel文档!");
-                        }
-
                         // 记录每一个sheet页的错误集
                         if (!ValidationUtil.isEmpty(sheetError)) {
                             resultError.put(String.format("%s sheet页", sheetName), sheetError);
@@ -152,8 +153,14 @@ public class XiAnDataDockServiceImpl {
                     }
                 }).headRowNumber(4).sheet(sheetNo, sheetName).doRead();
             }
+
             excelReader.finish(); // 关闭 reader，释放资源
 
+            if (CollectionUtils.isEmpty(dataList)) {
+                resultError.put("allSheet", "你上传了一个空数据的Excel文档!");
+                throw new BadRequest("你上传了一个空数据的Excel文档!");
+            }
+
             // 检查 resultError中的每一项，若存在内容，则有错误信息，直接抛异常
             if (!ValidationUtil.isEmpty(resultError)) {
                 throw new BadRequest(JSON.toJSONString(resultError));
@@ -194,8 +201,10 @@ public class XiAnDataDockServiceImpl {
 
         try {
             log.info("解析第{}行数据：{}", rowIndex, JSON.toJSONString(data));
+
             // 通用字段检查 每一个sheet页都有的基本信息，设计信息，制造信息和使用信息
             this.commonFieldCheck(data, rowError);
+
             // 起重机械----技术参数 检查
             if (isQZJX) {
                 this.QZJXTechnicalParamsCheck(data, rowError);
@@ -255,6 +264,10 @@ public class XiAnDataDockServiceImpl {
      * @param rowError 错误集合
      */
     private void commonFieldCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+
+        boolean isPressureVessel = !ObjectUtils.isEmpty(data.getEquList()) && "2000".equals(data.getEquList());// 是否压力容器
+        boolean isPressurePiping = !ObjectUtils.isEmpty(data.getEquList()) && "8000".equals(data.getEquList());// 是否压力管道
+
         // 基本信息
         checkNotBlank(data.getEquList(), "设备种类不能为空；", rowError);
         checkNotBlank(data.getEquCategory(), "设备类别不能为空；", rowError);
@@ -264,7 +277,7 @@ public class XiAnDataDockServiceImpl {
         }
         checkNotBlank(data.getProductName(), "产品名称不能为空；", rowError);
         checkNotBlank(data.getEquType(), "设备型号不能为空；", rowError);
-        checkNotBlank(data.getEquCodeType(), "是否有设备代码不能为空；", rowError);
+        checkNotBlank(data.getEquCodeType(), "有无设备代码不能为空；", rowError);
         if ("1".equals(data.getEquCodeType())) {
             checkNotBlank(data.getEquCode(), "设备代码不能为空；", rowError);
             String equCode = data.getEquCode();
@@ -285,11 +298,71 @@ public class XiAnDataDockServiceImpl {
         } else {
             data.setEquCode("");
         }
+        if (isPressurePiping) {// 校验压力管道特有的参数
+            checkNotBlank(data.getProjectContraption(), "工程（装置）名称不能为空；", rowError);
+        } else {
+            data.setProjectContraption("");
+        }
+        if (isPressureVessel) {// 校验压力容器特有的参数
+            boolean isGasCylinder = !ObjectUtils.isEmpty(data.getEquCategory()) && "2300".equals(data.getEquCategory());// 是否气瓶
+            boolean isFixedGasCylinder = !ObjectUtils.isEmpty(data.getEquCategory()) && "2100".equals(data.getEquCategory());//是否固定式压力容器
+            boolean isOxygenChamber = !ObjectUtils.isEmpty(data.getEquCategory()) && "2400".equals(data.getEquCategory());//是否氧舱
+            boolean isMobilePressureVessel = !ObjectUtils.isEmpty(data.getEquCategory()) && "2200".equals(data.getEquCategory());//是否移动式压力容器
+            boolean isSpecialGasCylinder = isGasCylinder && !ObjectUtils.isEmpty(data.getEquDefine()) && "23T0".equals(data.getEquDefine());// 是否特种气瓶
+            boolean isCarGasCylinder = isSpecialGasCylinder && (!ObjectUtils.isEmpty(data.getWhetherVehicleCylinder()) && "1".equals(data.getWhetherVehicleCylinder()));// 是否车用气瓶
+            if (isGasCylinder) { // 是气瓶
+                if (!isSpecialGasCylinder) { // 不是特种气瓶
+                    data.setWhetherVehicleCylinder("");
+                    checkNotBlank(data.getInformationSituation(), "信息化管理情况不能为空；", rowError);
+                    if (!ObjectUtils.isEmpty(data.getInformationSituation())) {
+                        checkNotBlank(data.getInformationManageCode(), "二维码或者电子标签编号不能为空；", rowError);
+                    }
+                }
+                if (isSpecialGasCylinder) { // 是特种气瓶
+                    checkNotBlank(data.getWhetherVehicleCylinder(), "是否车用气瓶不能为空；", rowError);
+                    if (!isCarGasCylinder) {// 不是车用气瓶
+                        checkNotBlank(data.getInformationSituation(), "信息化管理情况不能为空；", rowError);
+                        if (!ObjectUtils.isEmpty(data.getInformationSituation())) {
+                            checkNotBlank(data.getInformationManageCode(), "二维码或者电子标签编号不能为空；", rowError);
+                        }
+                    }
+                    if (isCarGasCylinder) { // 是车用气瓶
+                        data.setInformationSituation("");
+                        data.setInformationManageCode("");
+                        checkFactoryNumUniqueness(data, rowError);// 校验出厂编号/产品编码唯一性
+                    }
+                }
+                data.setWhetherSphericalTank("");
+                data.setWhetherSkidMountedPressureVessel("");
+            }
+            if (isFixedGasCylinder) { // 是固定式压力容器
+                checkNotBlank(data.getWhetherSphericalTank(), "是否球罐不能为空；", rowError);
+                checkNotBlank(data.getWhetherSkidMountedPressureVessel(), "是否撬装式压力容器不能为空；", rowError);
+                data.setInformationSituation("");
+                data.setInformationManageCode("");
+            }
+            if (isMobilePressureVessel) {// 是移动式压力容器
+                data.setWhetherSkidMountedPressureVessel("");
+                data.setWhetherVehicleCylinder("");
+                data.setWhetherSphericalTank("");
+                data.setInformationSituation("");
+                data.setInformationManageCode("");
+            }
+            if (isOxygenChamber) {//是氧舱
+                data.setWhetherSkidMountedPressureVessel("");
+                data.setWhetherVehicleCylinder("");
+                data.setWhetherSphericalTank("");
+                data.setInformationSituation("");
+                data.setInformationManageCode("");
+            }
+        }
         // 使用信息
         checkNotBlank(data.getUseUnitCode(), "使用单位统一社会信用代码不能为空；", rowError);
+        Optional.ofNullable(data.getUseUnitCode()).ifPresent(v -> checkCreditCode(v, "使用单位统一社会信用代码格式不正确；", rowError));
         checkNotBlank(data.getUseUnit(), "使用单位名称不能为空；", rowError);
         // 设计信息
         checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
+        Optional.ofNullable(data.getDesignUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "设计单位统一社会信用代码格式不正确；", rowError));
         checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
         checkNotBlank(data.getDesignUseDate(), "设计使用年限不能为空；", rowError);
         Optional.ofNullable(data.getDesignUseDate()).ifPresent(v -> checkDateFormatNumber(v, "设计使用年限不能为数字以外的其他类型；", rowError));
@@ -298,10 +371,10 @@ public class XiAnDataDockServiceImpl {
         Optional.ofNullable(data.getAppraisalDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计文件鉴定日期格式不正确；", rowError));
         // 制造信息
         checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", rowError);
+        Optional.ofNullable(data.getProduceUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "制造单位统一社会信用代码格式不正确；", rowError));
         checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", rowError);
         checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", rowError);
         checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", rowError);
-        checkFactoryNumUniqueness(data.getFactoryNum(), null, rowError);//todo
         checkNotBlank(data.getProduceDate(), "制造日期不能为空；", rowError);
         Optional.ofNullable(data.getProduceDate()).ifPresent(v -> checkDateFormatCorrect(v, "制造日期格式不正确；", rowError));
     }
@@ -320,6 +393,20 @@ public class XiAnDataDockServiceImpl {
     }
 
     /**
+     * 检查上传Excel中的统一信用代码格式
+     *
+     * @param code         待检查数据
+     * @param errorMessage 错误内容
+     * @param rowError     错误集
+     */
+    private void checkCreditCode(String code, String errorMessage, StringBuilder rowError) {
+        String regex = "^[A-Z0-9]{15}(?:[A-Z0-9]{3})?$";
+        if (!code.matches(regex)) {
+            rowError.append(errorMessage);
+        }
+    }
+
+    /**
      * 检查上传Excel中的数字格式是否正确
      *
      * @param date         待检查数据
@@ -332,11 +419,16 @@ public class XiAnDataDockServiceImpl {
         }
     }
 
-    private void checkFactoryNumUniqueness(String factoryNum, String sequenceNbr, StringBuilder rowError) {
-        // 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
-//        if (commonService.checkFactoryNumUniquenessForVehicleCylinder(factoryNum, sequenceNbr) > 0) {
-//            rowError.append("出厂编号/产品编码系统中已存在！");
-//        }
+    /**
+     * 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
+     *
+     * @param data
+     */
+    private void checkFactoryNumUniqueness(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
+        Integer count = jgServiceFeignClient.checkFactoryNumUniquenessForVehicleCylinder(data.getFactoryNum());
+        if (count > 0) {
+            rowError.append("出厂编号/产品编码系统中已存在！");
+        }
     }
 
     /**
@@ -359,7 +451,6 @@ public class XiAnDataDockServiceImpl {
      * @param rowError
      */
     private void QZJXTechnicalParamsCheck(XiAnEquipInfoExcelDto data, StringBuilder rowError) {
-
     }
 
     /**
@@ -407,6 +498,15 @@ public class XiAnDataDockServiceImpl {
         checkNotBlank(data.getTemperature_YLGD(), "温度不能为空；", rowError);
         checkNotBlank(data.getPipelineNumber(), "管道编号不能为空；", rowError);
         checkNotBlank(data.getDeviceLevel_YLGD(), "管道级别不能为空；", rowError);
+        Optional.ofNullable(data.getStartePosition()).ifPresent(v -> {
+            if (v.split("-").length <= 1) {
+                rowError.append("起/始位置 （经纬度）格式不正确");
+            }
+        });
+        if (!ObjectUtils.isEmpty(data.getStartePosition()) && data.getStartePosition().split("-").length == 2) {
+            String[] split = data.getStartePosition().split("-");
+            data.setStartePosition(String.format("{\"latitude\":%s,\"longitude\":%s}", split[0], split[1]));
+        }
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UnitTypeEnum.java

@@ -4,7 +4,6 @@ import lombok.Getter;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
-import java.util.HashMap;
 import java.util.List;
 
 @Getter
@@ -18,6 +17,8 @@ public enum UnitTypeEnum {
     AGWDW("安装改造维修单位","1234","1"),
     //使用单位
     SYDW("使用单位","1232","2"),
+    //使用单位
+    GRZT("个人主体","6601","2"),
     //充装单位
     CZDW("充装单位","1231","3"),
     //检验检测机构

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

@@ -157,4 +157,14 @@ public class JgChangeRegistrationReformDto extends BaseDto {
     @ApiModelProperty(value = "设备地址")
     private String equAddress;
 
+    @ApiModelProperty(value = "作废原因")
+    private String cancelReason;
+
+
+    @ApiModelProperty(value = "作废日期")
+    private Date cancelDate;
+
+    @ApiModelProperty(value = "作废人员id")
+    private String cancelUserId;
+
 }

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

@@ -233,4 +233,13 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty("工程装置")
     private String projectContraption;
+
+    @ApiModelProperty("作废原因")
+    private String cancelReason;
+
+    @ApiModelProperty("作废日期")
+    private Date cancelDate;
+
+    @ApiModelProperty("作废人员id")
+    private String cancelUserId;
 }

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

@@ -259,4 +259,22 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField("receive_company_org_code")
     private String receiveCompanyOrgCode;
+
+    /**
+     * 作废原因
+     */
+    @TableField("cancel_reason")
+    private String cancelReason;
+
+    /**
+     * 作废日期
+     */
+    @TableField("cancel_date")
+    private Date cancelDate;
+
+    /**
+     * 作废人员id
+     */
+    @TableField("cancel_user_id")
+    private String cancelUserId;
 }

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

@@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 维修告知
@@ -366,4 +368,28 @@ public class JgMaintainNotice extends BaseEntity {
      */
     @TableField("project_contraption")
     private String projectContraption;
+
+    /**
+     * 告知设备列表
+     */
+    @TableField(exist = false)
+    private List<Map<String, Object>> deviceList;
+
+    /**
+     * 作废原因
+     */
+    @TableField("cancel_reason")
+    private String cancelReason;
+
+    /**
+     * 作废日期
+     */
+    @TableField("cancel_date")
+    private Date cancelDate;
+
+    /**
+     * 作废人员id
+     */
+    @TableField("cancel_user_id")
+    private String cancelUserId;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintainNoticeService.java

@@ -61,4 +61,12 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
     void generateMaintainNoticeReport(Long sequenceNbr,HttpServletResponse response);
 
     boolean deleteBySequenceNbr(Long[] sequenceNbr);
+
+    /**
+     * 作废申请
+     * @param sequenceNbr 业务唯一标识
+     * @param cancelReason 作废原因
+     * @return JgInstallationNoticeDto
+     */
+    JgMaintainNotice cancelApplication(Long sequenceNbr, String cancelReason, Map<String, Object> model);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml

@@ -33,6 +33,7 @@
         ur.next_task_id as nextTaskId,
         ur.create_user_id as createUserId,
         oi.CODE96333 as code96333,
+        ur.cancel_reason as cancelReason,
         (SELECT name from tz_equipment_category ec WHERE ec.code = jri.EQU_LIST) AS equList,
         (select name from tz_equipment_category ec WHERE ec.code = jri.EQU_DEFINE) AS equDefine
         from tzs_jg_change_registration_reform ur

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml

@@ -67,6 +67,7 @@
         isn.create_user_company_name AS createUserCompanyName,
         isn.next_execute_user_ids AS nextExecuteUserIds,
         isn.transfer_to_user_ids AS transferToUserIds,
+        isn.cancel_reason AS cancelReason,
         (SELECT name from tz_equipment_category ec WHERE ec.code = isn.equ_list_code) AS equListName,
         DATE_FORMAT(isn.create_date,'%Y-%m-%d') AS createDate,
         (select name from tz_equipment_category ec WHERE ec.code = isn.equ_category) AS equCategoryName

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -151,6 +151,7 @@
         where
             pc.org_code like concat (#{reginCode},'%')
             and tjurm.certificate_status = '已登记'
+            and tjurm.is_delete = 0
     </select>
     <select id="getRecords" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
         <include refid="page_list"/>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -210,8 +210,8 @@
                 ibjui.USE_INNER_CODE as useInnerCode,
                 ibjui.LONGITUDE_LATITUDE as longitudeLatitude,
                 ibjui.FACTORY_USE_SITE_STREET as factoryUseSiteStreet
-        FROM "idx_biz_jg_use_info"  ibjui left join tzs_user_info tzi on ibjui."PHONE" = tzi."phone"
-        where RECORD = #{id} AND tzi.is_delete = 'f'
+        FROM "idx_biz_jg_use_info"  ibjui left join tzs_user_info tzi on ibjui."PHONE" = tzi."phone" AND tzi.is_delete = 'f'
+        where RECORD = #{id}
     </select>
     <select id="getEquipListPage" resultType="java.util.Map">
         SELECT jri.EQU_CODE as equCode,

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

@@ -627,10 +627,17 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(commonService.getLatestJgUseRegistrationManage(company.getCompanyCode(), equDefineCode));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/checkEquCodeUniqueness")
     @ApiOperation(httpMethod = "GET", value = "检查设备代码的唯一性", notes = "检查设备代码的唯一性")
     public Boolean checkEquCodeUniqueness(@RequestParam("equCode") String equCode) {
         return commonService.checkEquCodeUniqueness(equCode);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/checkFactoryNumUniquenessForVehicleCylinder")
+    @ApiOperation(httpMethod = "GET", value = "车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）", notes = "车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）")
+    public Integer checkFactoryNumUniquenessForVehicleCylinder(@RequestParam("factoryNum") String factoryNum) {
+        return commonService.checkFactoryNumUniquenessForVehicleCylinder(factoryNum,null);
+    }
 }

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
 import io.swagger.annotations.Api;
@@ -40,7 +41,6 @@ public class JgChangeRegistrationReformController extends BaseController {
 
     /**
      * 新增改造变更登记
-     *
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
@@ -48,6 +48,7 @@ public class JgChangeRegistrationReformController extends BaseController {
     public ResponseModel<Object> save(@RequestBody JSONObject map) {
         return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.save(map));
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/flowExecute")
     @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
@@ -59,6 +60,7 @@ public class JgChangeRegistrationReformController extends BaseController {
                 String.valueOf(map.get("nextTaskId")));
         return ResponseHelper.buildResponse("ok");
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/withdraw")
     @ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
@@ -91,20 +93,20 @@ public class JgChangeRegistrationReformController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/getList")
     public ResponseModel<Page<Map<String, Object>>> getList(JgChangeRegistrationReformDto dto,
-															@RequestParam(value = "sort",required = false) String sort,
+                                                            @RequestParam(value = "sort", required = false) String sort,
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
         ReginParams reginParams = getSelectedOrgInfo();
-		if(reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)){
+        if (reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)) {
             dto.setDataType(COMPANY_TYPE_COMPANY);
             dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
         } else {
             dto.setDataType(COMPANY_TYPE_SUPERVISION);
             dto.setReceiveOrgCode(reginParams.getCompany().getCompanyCode());
         }
-		Page<Map<String, Object>> list = jgChangeRegistrationReformServiceImpl.getList(dto,sort, page, dto.getRoleIds());
-		list.getRecords().forEach(x-> x.put("companyType",reginParams.getCompany().getCompanyType()));
+        Page<Map<String, Object>> list = jgChangeRegistrationReformServiceImpl.getList(dto, sort, page, dto.getRoleIds());
+        list.getRecords().forEach(x -> x.put("companyType", reginParams.getCompany().getCompanyType()));
         return ResponseHelper.buildResponse(list);
     }
 
@@ -112,12 +114,13 @@ public class JgChangeRegistrationReformController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
     @GetMapping(value = "/getDetail")
-	public ResponseModel<Map<String, Object>> getDetail(@RequestParam("currentDocumentId") String currentDocumentId,@RequestParam(value = "equipId",required = false) String equipId) {
-		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId,equipId));
+    public ResponseModel<Map<String, Object>> getDetail(@RequestParam("currentDocumentId") String currentDocumentId, @RequestParam(value = "equipId", required = false) String equipId) {
+        return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId, equipId));
     }
 
     /**
      * 改造登记-导出使用登记证
+     *
      * @param response    返回
      * @param sequenceNbr 主键
      * @param printType   打印类型，0-正常打印，1-套打（默认0）
@@ -126,19 +129,19 @@ public class JgChangeRegistrationReformController extends BaseController {
     @GetMapping(value = "/export")
     @ApiOperation(httpMethod = "GET", value = "改造登记-导出使用登记证", notes = "改造登记-导出使用登记证")
     public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
-							   @RequestParam(value = "printType", defaultValue = "0") String printType){
+                               @RequestParam(value = "printType", defaultValue = "0") String printType) {
         jgChangeRegistrationReformServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping (value = "/getEquDetail")
+    @GetMapping(value = "/getEquDetail")
     @ApiOperation(httpMethod = "GET", value = "根据使用登记证查询设备详情(前端组件默认传参record)", notes = "根据使用登记证查询设备详情")
     public ResponseModel<Map<String, Object>> getEquDetail(@RequestParam String record) {
         return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getEquDetail(record));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping (value = "/getUseRegistrationCodeData")
+    @GetMapping(value = "/getUseRegistrationCodeData")
     @ApiOperation(httpMethod = "GET", value = "获取当前企业，某接收机构审批的使用登记证信息", notes = "获取当前企业，某接收机构审批的使用登记证信息")
     public ResponseModel<Page<JgUseRegistrationManageDto>> getUseRegistrationCodeData(
             @RequestParam(value = "current") int current,
@@ -164,24 +167,24 @@ public class JgChangeRegistrationReformController extends BaseController {
             dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
         }
         // 新增时使用EQU_LIST_CODE，适配组件，适配原有表单
-		if (!ObjectUtils.isEmpty(EQU_LIST_CODE)){
+        if (!ObjectUtils.isEmpty(EQU_LIST_CODE)) {
             dto.setEquListCode(EQU_LIST_CODE);
         }
         // 流程页面使用equList，适配组件，适配原有表单
-		if (!ObjectUtils.isEmpty(equList)){
+        if (!ObjectUtils.isEmpty(equList)) {
             dto.setEquListCode(equList);
         }
         // 流程页面使用登记证号筛选，适配组件，适配原有表单
-		if (!ObjectUtils.isEmpty(useRegistrationCode)){
+        if (!ObjectUtils.isEmpty(useRegistrationCode)) {
             dto.setUseRegistrationCode(useRegistrationCode);
         }
         // 流程页面使用equList，适配组件，适配原有表单
-		if (!ObjectUtils.isEmpty(EQU_CATEGORY_CODE)){
+        if (!ObjectUtils.isEmpty(EQU_CATEGORY_CODE)) {
             dto.setEquCategoryCode(EQU_CATEGORY_CODE);
         }
-		if (!ValidationUtil.isEmpty(receiveCompanyCode)){
+        if (!ValidationUtil.isEmpty(receiveCompanyCode)) {
             String[] codes = receiveCompanyCode.split("_");
-			if (!ValidationUtil.isEmpty(codes)){
+            if (!ValidationUtil.isEmpty(codes)) {
                 dto.setReceiveCompanyCode(codes[0]);
             }
         }
@@ -194,4 +197,12 @@ public class JgChangeRegistrationReformController extends BaseController {
         dto.setCertificateStatus("1".equals(transferType) ? "已注销" : "已登记");
         return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "PUT", value = "改造变更登记作废", notes = "改造变更登记作废")
+    @PutMapping(value = "/cancel/application")
+    public ResponseModel<JgChangeRegistrationReform> cancelApplication(@RequestBody JgChangeRegistrationReformDto registrationReformDto) {
+        JgChangeRegistrationReform result = jgChangeRegistrationReformServiceImpl.cancelApplication(registrationReformDto.getSequenceNbr(), registrationReformDto.getCancelReason());
+        return ResponseHelper.buildResponse(result);
+    }
 }

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

@@ -144,4 +144,12 @@ public class JgMaintainNoticeController extends BaseController {
     public void generateReport(HttpServletResponse response, @RequestParam("sequenceNbr") Long sequenceNbr) {
         iJgMaintainNoticeService.generateMaintainNoticeReport(sequenceNbr,response);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "PUT", value = "维修告知单个作废", notes = "维修告知单个作废")
+    @PutMapping(value = "/cancel/application")
+    public ResponseModel<JgMaintainNotice> cancelApplication(@RequestBody Map<String, Object> model) {
+        JgMaintainNotice result = iJgMaintainNoticeService.cancelApplication(Long.parseLong((String) model.get("sequenceNbr")), (String) model.get("cancelReason"), model);
+        return ResponseHelper.buildResponse(result);
+    }
 }

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

@@ -32,10 +32,10 @@ public class XiAnDataDockController {
      * @param equLists 设备数据集合
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/saveEquipmentData")
     @ApiOperation(httpMethod = "POST", value = "设备批量导入", notes = "导入多个设备的数据文件")
-    public ResponseModel<?> saveEquipmentData(@RequestBody List<Map<?,?>> equLists) {
+    public ResponseModel<?> saveEquipmentData(@RequestBody List<Map<?,?>> equLists) throws Exception {
         return ResponseHelper.buildResponse(xiAnDataDockService.saveEquipmentData(equLists));
     }
 }

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;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsBoiler;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsBoiler;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsBoilerService {
+public interface IIdxBizJgTechParamsBoilerService extends IService<IdxBizJgTechParamsBoiler> {
 
     void saveOrUpdateData(IdxBizJgTechParamsBoiler boiler);
 

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.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsElevatorService {
+public interface IIdxBizJgTechParamsElevatorService extends IService<IdxBizJgTechParamsElevator> {
 
     boolean saveOrUpdateData(IdxBizJgTechParamsElevator techParamsElevator);
 

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;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsLiftingService {
+public interface IIdxBizJgTechParamsLiftingService extends IService<IdxBizJgTechParamsLifting> {
 
     void saveOrUpdateData(IdxBizJgTechParamsLifting lifting);
 

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;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsPipelineService {
+public interface IIdxBizJgTechParamsPipelineService extends IService<IdxBizJgTechParamsPipeline> {
 
     void saveOrUpdateData(IdxBizJgTechParamsPipeline pipeline);
 

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;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsRidesService {
+public interface IIdxBizJgTechParamsRidesService extends IService<IdxBizJgTechParamsRides> {
 
     void saveOrUpdateData(IdxBizJgTechParamsRides rides);
 

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;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsRopewayService {
+public interface IIdxBizJgTechParamsRopewayService extends IService<IdxBizJgTechParamsRopeway> {
 
     void saveOrUpdateData(IdxBizJgTechParamsRopeway ropeway);
 

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;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVehicle;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVehicle;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsVehicleService {
+public interface IIdxBizJgTechParamsVehicleService extends IService<IdxBizJgTechParamsVehicle> {
 
     void saveOrUpdateData(IdxBizJgTechParamsVehicle vehicle);
 

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;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsVesselService {
+public interface IIdxBizJgTechParamsVesselService extends IService<IdxBizJgTechParamsVessel> {
 
     void saveOrUpdateData(IdxBizJgTechParamsVessel vessel);
 

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

@@ -2139,6 +2139,7 @@ public class CommonServiceImpl implements ICommonService {
         LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgUseRegistrationManage::getUseUnitCreditCode, useUnitCreditCode)
                 .eq(JgUseRegistrationManage::getEquDefineCode, equDefineCode)
+                .eq(JgUseRegistrationManage::getIsDelete,0)
                 .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
                 .orderByDesc(JgUseRegistrationManage::getCertificateNo);
         return jgUseRegistrationManageMapper.selectList(queryWrapper).stream()

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

@@ -89,6 +89,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.alibaba.fastjson.JSON.toJSONString;
 import static com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum.SPECIAL_CYLINDER;
@@ -415,8 +416,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     private void checkEquCodeUniqueness(LinkedHashMap equipmentInfoForm) {
         // 根据设备代码检查唯一性
-        Integer count = idxBizJgRegisterInfoMapper.selectByEquCodeAndClaimStatus((String) equipmentInfoForm.get(EQU_CODE), (String) equipmentInfoForm.get(SEQUENCE_NBR));
-        if (count > 0) {
+        String equCode = (String) equipmentInfoForm.get(EQU_CODE);
+        String sequenceNbr = (String) equipmentInfoForm.get(SEQUENCE_NBR);
+        List<Integer> results = Stream.of(idxBizJgRegisterInfoMapper.selectByEquCodeAndClaimStatus(equCode, sequenceNbr),
+                idxBizJgRegisterInfoMapper.selectInstallNoticeEqByEquCode(equCode, sequenceNbr)
+        ).collect(Collectors.toList());
+
+        if (results.stream().anyMatch(count -> count > 0)) {
             throw new BadRequest("设备代码已存在，请重新输入！");
         }
     }
@@ -1129,7 +1135,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      * @param fieldType 返回字段类型【CamelCase:驼峰命名，“”：纯大写加下划线】
      * @return
      */
-    private Map<String, Object> getEquipParamsMap(String record, String fieldType, String equipCode) {
+    public Map<String, Object> getEquipParamsMap(String record, String fieldType, String equipCode) {
 
         Map<String, Object> objMap = new HashMap<>();
         if (EquipmentClassifityEnum.DT.getCode().equals(equipCode)) {
@@ -1488,21 +1494,26 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // DATA_SOURCE 为“jg”开头的数据（从监管新加或复制的设备）
         // 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增
         BoolQueryBuilder dBuilder = QueryBuilders.boolQuery();
-
+        String queryType = map.getString("QUERY_TYPE");
         if (map.containsKey("DATA_SOURCE") && !ObjectUtils.isEmpty(map.get("DATA_SOURCE"))) {
-            if ("jg_his".equals(map.get("DATA_SOURCE"))) {// 只查历史，前缀jg_his
+            String dataSource = map.getString("DATA_SOURCE");
+            if ("jg_his".equals(dataSource)) {
+                // 只查历史，前缀为 jg_his
                 dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
-            } else if (!"jg_his".equals(map.getString("DATA_SOURCE"))) {// 只查新增，前缀为jg且前缀不为jg_his
-                dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"));
-                dBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
+            } else {
+                // 只查新增，前缀为 jg 且前缀不为 jg_his
+                dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"))
+                        .mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
             }
+        } else if (ValidationUtil.equals(queryType, "WB")) {
+            // 对于xWB类型查询，排除jg_his
+            dBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
         } else {
-            // 查所有，前缀jg
+            // 查所有，前缀 jg
             dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"));
         }
         boolMust.must(dBuilder);
 
-        String queryType = map.getString("QUERY_TYPE");
         if (!ObjectUtils.isEmpty(queryType)) {
             // 查询 安装告知【可告知设备列表】【USE_UNIT_CREDIT_CODE=== null ||  ""】
             if (ValidationUtil.equals(queryType, "AZ")) {// 安装
@@ -2342,17 +2353,17 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         if (isCopy) {
             // 设备状态置空
-            useInfo.setEquState(null);
+            useInfo.setEquState("");
             // 如果为安改维单位复制设备，则将使用单位信息置空
             if (companyTypeStr.equals(CompanyTypeEnum.CONSTRUCTION.getCode())) {
-                useInfo.setUseUnitCreditCode(null);
-                useInfo.setUseUnitName(null);
+                useInfo.setUseUnitCreditCode("");
+                useInfo.setUseUnitName("");
             }
             // 如果既为安改维单位又是使用单位，则将厂车、起重机械-流动式起重机、压力容器-气瓶安改维单位信息置空
             if (companyTypeStr.contains(CompanyTypeEnum.CONSTRUCTION.getCode()) && companyTypeStr.contains(CompanyTypeEnum.USE.getCode())) {
                 if (!registerInfo.getEquList().equals("5000") && !registerInfo.getEquCategory().equals("4400") && !registerInfo.getEquCategory().equals("2300")) {
-                    constructionInfo.setUscUnitCreditCode(null);
-                    constructionInfo.setUscUnitName(null);
+                    constructionInfo.setUscUnitCreditCode("");
+                    constructionInfo.setUscUnitName("");
                 }
             }
         }
@@ -2386,14 +2397,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         if (isCopy) {
             if (companyTypeStr.equals(CompanyTypeEnum.USE.getCode()) || companyTypeStr.equals(CompanyTypeEnum.INDIVIDUAL.getCode())) {
-                constructionInfo.setUscUnitCreditCode(null);
-                constructionInfo.setUscUnitName(null);
+                constructionInfo.setUscUnitCreditCode("");
+                constructionInfo.setUscUnitName("");
             }
             // 如果既为安改维单位又是使用单位，则将厂车、起重机械-流动式起重机、压力容器-气瓶安改维单位信息置空
             if (companyTypeStr.contains(CompanyTypeEnum.CONSTRUCTION.getCode()) && companyTypeStr.contains(CompanyTypeEnum.USE.getCode())) {
                 if (registerInfo.getEquList().equals("5000") || registerInfo.getEquCategory().equals("4400") || registerInfo.getEquCategory().equals("2300")) {
-                    constructionInfo.setUscUnitCreditCode(null);
-                    constructionInfo.setUscUnitName(null);
+                    constructionInfo.setUscUnitCreditCode("");
+                    constructionInfo.setUscUnitName("");
                 }
             }
         }
@@ -2409,7 +2420,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 补丁：saveOrUpdate在update数据时不会更新字段为null的字段，但是编辑设备的代码时，从有改成无，equCode解析成null，但是此时需要将equcode删掉
         registerInfo.setEquCode(ObjectUtils.isEmpty(registerInfo.getEquCode()) ? "" : registerInfo.getEquCode());
         // copy设备 =》 使用登记证号置空
-        registerInfo.setUseOrgCode(isCopy ? null : registerInfo.getUseOrgCode());
+        registerInfo.setUseOrgCode(isCopy ? "" : registerInfo.getUseOrgCode());
         this.saveOrUpdate(registerInfo);
 
         // 维保备案
@@ -2430,12 +2441,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         otherInfo.setRecDate(date);
         otherInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("OTHERINFO_SEQ")));
         if (isCopy) {
-            // 96333码和监管码置空
-            otherInfo.setCode96333(null);
-            otherInfo.setSupervisoryCode(null);
-            otherInfo.setCylinderStampAttachment(null);
-            otherInfo.setInformationSituation(null);
-            otherInfo.setInformationManageCode(null);
+            // 复制且有无96333识别码选择 无 96333码置空
+            if("2".equals(otherInfo.getCode96333Type())){
+                otherInfo.setCode96333("");
+            }
+            // 监管码置空
+            otherInfo.setSupervisoryCode("");
+            otherInfo.setCylinderStampAttachment("");
+            otherInfo.setInformationSituation("");
+            otherInfo.setInformationManageCode("");
+        }
+        // 编辑时，如果选择<无96333识别码>，则把已经入库的数据清除掉
+        if(OPERATEEDIT.equals(operateType) && "2".equals(otherInfo.getCode96333Type())){
+            otherInfo.setCode96333("");
         }
         iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
 

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

@@ -962,7 +962,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         jgCertificateChangeRecordEqService.saveBatch(jgCertificateChangeRecordEqs);
 
         // 当企业下所有使用登记证单位信息都改为最新的时候再去修改系统中单位信息
-        Integer count = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseUnitCreditCode, jgChangeRegistrationName.getUseUnitCreditCode()).eq(JgUseRegistrationManage::getUseUnitName, jgChangeRegistrationName.getUseUnitName()).count();
+        Integer count = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseUnitCreditCode, jgChangeRegistrationName.getUseUnitCreditCode())
+                .eq(JgUseRegistrationManage::getIsDelete,0)
+                .eq(JgUseRegistrationManage::getUseUnitName, jgChangeRegistrationName.getUseUnitName()).count();
         if (count == 0) {
             // 修改企业信息
             LambdaUpdateWrapper<TzBaseEnterpriseInfo> updateWrapper2 = new LambdaUpdateWrapper<>();

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -17,7 +18,6 @@ import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
-import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
@@ -37,7 +37,9 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import io.seata.spring.annotation.GlobalTransactional;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
@@ -66,6 +68,7 @@ import static java.util.stream.Collectors.toList;
  * @date 2023-12-20
  */
 @Service
+@Slf4j
 public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeRegistrationReformDto, JgChangeRegistrationReform, JgChangeRegistrationReformMapper> implements IJgChangeRegistrationReformService {
 
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
@@ -129,8 +132,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private RedissonClient redissonClient;
 
-    @Autowired
-    private IJgChangeRegistrationTransferService jgChangeRegistrationTransferService;
 
     @Autowired
     private IdxBizJgRegisterInfoServiceImpl jgRegisterInfoService;
@@ -144,6 +145,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqService;
 
+    @Autowired
+    private Sequence sequence;
+
     /***
      * @deprecated 根据查询调教获取分页对象
      * @param dto 查询的dto对象
@@ -153,8 +157,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, String sort, Page<Map<String, Object>> page, List<String> roleIds) {
         SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
-        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, sortMap, dto, roleIds, RequestContext.getExeUserId());
-        return listPage;
+        return this.baseMapper.getListPage(page, sortMap, dto, roleIds, RequestContext.getExeUserId());
     }
 
     private void rollBackForDelRedisData() {
@@ -186,6 +189,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
     }
 
+    private void clearDataForCheckEquipRepeatUsed2(JgChangeRegistrationReform data) {
+        LambdaQueryWrapper<JgChangeRegistrationReformEq> lambda = new QueryWrapper<JgChangeRegistrationReformEq>().lambda();
+        lambda.eq(JgChangeRegistrationReformEq::getEquipTransferId, data.getSequenceNbr());
+        lambda.select(JgChangeRegistrationReformEq::getEquId);
+        List<JgChangeRegistrationReformEq> eqList = jgChangeRegistrationReformEqMapper.selectList(lambda);
+        List<String> records = eqList.stream().map(JgChangeRegistrationReformEq::getEquId).collect(toList());
+        EquipUsedCheckStrategyContext.getUsedStrategy(BUSINESS_TYPE_KEY).delDataForCheckEquipRepeatUsed(records, data.getUseUnitCreditCode());
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public List<Map<String, Object>> save(JSONObject map) {
@@ -260,6 +273,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgRegistrationHistory.setChangeData(JSONObject.toJSONString(map));
             //设备监管码
             jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
+            // 原始的技术参数，在作废时，需要用来恢复之前的数据使用
+            jgRegistrationHistory.setOldData(JSONObject.toJSONString(idxBizJgRegisterInfoService.getEquipParamsMap(equipId, "", getEquListCode(jgRegistrationHistory))));
             //数据状态
             jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
             String equipListName = Optional.ofNullable(map.get("equListDesc")).orElse("无").toString();
@@ -452,7 +467,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
         JSONObject object = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         // 更新使用登记证信息
-        JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, object.get("useRegistrationCode")).one();
+        JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, object.get("useRegistrationCode"))
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
+                .one();
         useRegistrationCode.setAuditPassDate(new Date());
         jgUseRegistrationManageService.updateById(useRegistrationCode);
         // 生成业务流水信息
@@ -493,6 +511,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 .build();
     }
 
+    @Override
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public void flowExecute(Long id, String instanceId, String operate, String comment, String nextTaskId) {
@@ -1153,4 +1172,164 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                                                                        JgUseRegistrationManageDto dto) {
         return jgUseRegistrationManageService.queryForJgUseRegistrationManagePage(page, dto, null);
     }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
+    public JgChangeRegistrationReform cancelApplication(Long sequenceNbr, String cancelReason) {
+        // 1.更新为已作废
+        JgChangeRegistrationReform jgChangeRegistrationReform = this.getById(sequenceNbr);
+        String oldStatus = jgChangeRegistrationReform.getAuditStatus();
+        jgChangeRegistrationReform.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_DISCARD.getName()));
+        jgChangeRegistrationReform.setStatus(String.valueOf(FlowStatusEnum.TO_BE_DISCARD.getName()));
+        jgChangeRegistrationReform.setCancelReason(cancelReason);
+        jgChangeRegistrationReform.setCancelDate(new Date());
+        jgChangeRegistrationReform.setCancelUserId(RequestContext.getExeUserId());
+        jgChangeRegistrationReform.setNextExecuteUserIds(null);
+        jgChangeRegistrationReform.setPromoter(null);
+        this.updateById(jgChangeRegistrationReform);
+        // 2.更新关联的业务
+        this.processElseDataByStatus(oldStatus, jgChangeRegistrationReform);
+        return jgChangeRegistrationReform;
+    }
+
+    private void processElseDataByStatus(String oldStatus, JgChangeRegistrationReform jgChangeRegistrationReform) {
+        switch (oldStatus) {
+            case "使用单位待提交":
+                // do no thing
+                break;
+            case "已完成":
+                // 1.技术参数恢复原数据
+                this.restoreTechParams(jgChangeRegistrationReform);
+                break;
+            default:
+                // 流程中（驳回、撤回等）
+                // 1.待办任务更新为已完成
+                this.finishedTask(jgChangeRegistrationReform);
+                // 2.终止流程
+                iCmWorkflowService.stopProcess(jgChangeRegistrationReform.getInstanceId(), jgChangeRegistrationReform.getCancelReason());
+                // 3.清空redis（缓存的流程中的设备）
+                this.clearDataForCheckEquipRepeatUsed2(jgChangeRegistrationReform);
+        }
+    }
+
+    private void finishedTask(JgChangeRegistrationReform jgChangeRegistrationReform) {
+        HashMap<String, Object> taskMap = new HashMap<>();
+        taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        taskMap.put("relationId", jgChangeRegistrationReform.getInstanceId());
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        jgChangeRegistrationReform.setOtherAccessories(null);
+        BeanUtils.copyProperties(jgChangeRegistrationReform, taskMessageDto);
+        taskMap.put("model", taskMessageDto);
+        commonServiceImpl.updateTaskModel(taskMap);
+    }
+
+
+    private void restoreTechParams(JgChangeRegistrationReform jgChangeRegistrationReform) {
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(
+                new LambdaQueryWrapper<JgRegistrationHistory>()
+                        .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationReform.getApplyNo()));
+        if (jgRegistrationHistory == null) {
+            return;
+        }
+        String record = jgRegistrationHistory.getEquId();
+        String equList = getEquListCode(jgRegistrationHistory);
+        String oldTechInfo = jgRegistrationHistory.getOldData();
+        //将历史数据更新到技术参数表中
+        EquipmentClassifityEnum anEnum = EquipmentClassifityEnum.getOne(equList);
+        assert anEnum != null;
+        if (StringUtils.isEmpty(oldTechInfo) || anEnum == null) {
+            log.warn("技术参数为空，无法进行回滚技术参数，单据编号：{}", jgChangeRegistrationReform.getApplyNo());
+            return;
+        }
+        switch (anEnum) {
+            //电梯
+            case DT:
+                IdxBizJgTechParamsElevator elevator = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsElevator.class);
+                // 删除
+                iIdxBizJgTechParamsElevatorService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsElevator>().eq(IdxBizJgTechParamsElevator::getRecord, record));
+                // 新插入
+                elevator.setSequenceNbr(sequence.nextId() + "");
+                iIdxBizJgTechParamsElevatorService.save(elevator);
+                break;
+            // 厂车
+            case CC:
+                IdxBizJgTechParamsVehicle vehicle = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsVehicle.class);
+                // 删除
+                iIdxBizJgTechParamsVehicleService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsVehicle>().eq(IdxBizJgTechParamsVehicle::getRecord, record));
+                // 插入
+                vehicle.setSequenceNbr(sequence.nextId() + "");
+                iIdxBizJgTechParamsVehicleService.save(vehicle);
+                break;
+            // 索道
+            case KYSD:
+                IdxBizJgTechParamsRopeway ropeway = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsRopeway.class);
+                // 删除
+                iIdxBizJgTechParamsRopewayService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsRopeway>().eq(IdxBizJgTechParamsRopeway::getRecord, record));
+                // 插入
+                ropeway.setSequenceNbr(sequence.nextId() + "");
+                iIdxBizJgTechParamsRopewayService.save(ropeway);
+                break;
+            // 游乐设施
+            case YLSS:
+                IdxBizJgTechParamsRides rides = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsRides.class);
+                // 删除
+                iIdxBizJgTechParamsRidesService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsRides>().eq(IdxBizJgTechParamsRides::getRecord, record));
+                // 插入
+                rides.setSequenceNbr(sequence.nextId() + "");
+                iIdxBizJgTechParamsRidesService.save(rides);
+                break;
+            // 锅炉
+            case GL:
+                IdxBizJgTechParamsBoiler boiler = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsBoiler.class);
+                // 删除
+                iIdxBizJgTechParamsBoilerService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsBoiler>().eq(IdxBizJgTechParamsBoiler::getRecord, record));
+                // 插入
+                boiler.setSequenceNbr(sequence.nextId() + "");
+                iIdxBizJgTechParamsBoilerService.save(boiler);
+                break;
+            // 压力容器
+            case YLRQ:
+                IdxBizJgTechParamsVessel vessel = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsVessel.class);
+                // 删除
+                iIdxBizJgTechParamsVesselService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsVessel>().eq(IdxBizJgTechParamsVessel::getRecord, record));
+                // 插入
+                vessel.setSequenceNbr(sequence.nextId() + "");
+                iIdxBizJgTechParamsVesselService.save(vessel);
+                break;
+
+            // 压力管道
+            case YLGD:
+                IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsPipeline.class);
+                // 删除
+                iIdxBizJgTechParamsPipelineService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().eq(IdxBizJgTechParamsPipeline::getRecord, record));
+                // 插入
+                pipeline.setSequenceNbr(sequence.nextId() + "");
+                iIdxBizJgTechParamsPipelineService.save(pipeline);
+                break;
+
+            // 起重机械
+            case QZJX:
+                IdxBizJgTechParamsLifting lifting = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsLifting.class);
+                // 删除
+                iIdxBizJgTechParamsLiftingService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsLifting>().eq(IdxBizJgTechParamsLifting::getRecord, record));
+                // 插入
+                lifting.setSequenceNbr(sequence.nextId() + "");
+                iIdxBizJgTechParamsLiftingService.save(lifting);
+                break;
+            default:
+                log.warn("un support type of {}", equList);
+        }
+    }
+
+
+    private String getEquListCode(JgRegistrationHistory jgRegistrationHistory) {
+        String record = jgRegistrationHistory.getEquId();
+        IdxBizJgRegisterInfo idxBizJgRegisterInfo = jgRegisterInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record));
+        return idxBizJgRegisterInfo.getEquList();
+    }
+
 }
\ 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/JgChangeVehicleRegistrationUnitServiceImpl.java

@@ -456,7 +456,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
 
     public void saveRecord(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, TaskV2Model taskV2Model) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, jgChangeVehicleRegistrationUnit.getUseRegistCode()).one();
+        JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, jgChangeVehicleRegistrationUnit.getUseRegistCode())
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
+                .one();
         // 业务流水生成
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeVehicleRegistrationUnit.getSequenceNbr()).one();
         JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
@@ -707,7 +710,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         HashMap<String, Object> map = new HashMap<>();
         // 组件回显
         map.put("useRegistrationCode", useRegistrationCode);
-        JgUseRegistrationManage registrationManage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode).one();
+        JgUseRegistrationManage registrationManage = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
+                .eq(JgUseRegistrationManage::getIsDelete,0)
+                .one();
         List<JSONObject> jsonObjects = jgUseRegistrationManageService.queryEquByCertificateSeq(registrationManage.getSequenceNbr());
         if (!ObjectUtils.isEmpty(jsonObjects)) {
 //            JgVehicleInformation information = jgVehicleInformationService.lambdaQuery().eq(JgVehicleInformation::getUseRegistrationCode, useRegistrationCode).one();

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

@@ -625,6 +625,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         String useCode = String.valueOf(informObj.get("installUnitCreditCode"));
         LambdaQueryWrapper<TzBaseUnitLicence> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TzBaseUnitLicence::getUnitCode, useCode);
+        wrapper.orderByDesc(TzBaseUnitLicence::getExpiryDate);
+        wrapper.orderByDesc(TzBaseUnitLicence::getRecDate);
         wrapper.last(" LIMIT 3");
         List<TzBaseUnitLicence> list = baseUnitLicenceMapper.selectList(wrapper);
 

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.pagehelper.util.StringUtil;
 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.entity.DataDictionary;
@@ -30,7 +29,10 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
+import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
+import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
@@ -48,6 +50,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -78,6 +82,12 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
 
     @Autowired
+    EventPublisher eventPublisher;
+
+    @Autowired
+    private ICmWorkflowService iCmWorkflowService;
+
+    @Autowired
     IJgInstallationNoticeService iJgInstallationNoticeService;
 
     @Autowired
@@ -182,11 +192,12 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         if (!ValidationUtil.isEmpty(notice.getStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
             maintainInfo.put("street", notice.getStreet() + "_" + notice.getStreetName());
         }
-        if (Integer.parseInt(notice.getNoticeStatus()) == FlowStatusEnum.TO_BE_FINISHED.getCode()) {
-            // 完成时显示历史数据
+        if ((Integer.parseInt(notice.getNoticeStatus()) == FlowStatusEnum.TO_BE_FINISHED.getCode()) ||
+                (Integer.parseInt(notice.getNoticeStatus()) == FlowStatusEnum.TO_BE_DISCARD.getCode())) {
+            // 完成 或者 作废时显示历史数据
             JSONObject hisData = commonService.queryHistoryData(notice.getSequenceNbr());
             // 兼容老数据
-            if (hisData == null) {
+            if (hisData == null || ObjectUtils.isEmpty(hisData.get("deviceList"))) {
                 // 老数据逻辑
                 setNewEquipInfo(sequenceNbr, maintainInfo);
                 return new HashMap<String, Map<String, Object>>() {{
@@ -196,8 +207,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 // 新数据逻辑
                 hisData.putAll(maintainInfo);
                 CommonServiceImpl.formatTime2StrDateForEquip(hisData);
-                setNewEquipInfo(sequenceNbr, maintainInfo);
-                hisData.put("deviceList", maintainInfo.get("deviceList"));
+//                setNewEquipInfo(sequenceNbr, maintainInfo);
+//                hisData.put("deviceList", maintainInfo.get("deviceList"));
                 return new HashMap<String, Map<String, Object>>() {{
                     this.put(TABLE_PAGE_ID, hisData);
                 }};
@@ -343,7 +354,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     notice.setEquList(String.valueOf(deviceList.get(0).get("EQU_LIST")));
                     jgMaintainNoticeMapper.updateById(notice);
                     // 如果为保存并提交，则创建代办
-                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
+                    buildTask(notice, Collections.singletonList(workflowResultDto), Boolean.TRUE);
                 } else {
                     // 只调用执行API，返回下个节点信息，用于填充业务字段
                     //组装信息
@@ -385,7 +396,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     TaskV2Model taskV2Model = commonService.updateTaskModel(map);
                     if (ObjectUtils.isEmpty(taskV2Model)) {
                         // 如果为保存并提交，则创建代办
-                        buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
+                        buildTask(notice, Collections.singletonList(workflowResultDto), Boolean.FALSE);
                     } else {
                         TaskModelDto taskModelDto = new TaskModelDto();
                         BeanUtils.copyProperties(taskV2Model, taskModelDto);
@@ -422,6 +433,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 equipList.add(jgRelationEquip);
             });
             jgMaintainNoticeEqMapper.insertBatchSomeColumn(equipList);
+            // 更新历史表
+            commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName(), JSON.parseObject(JSON.toJSONString(notice)), "", notice.getSequenceNbr().toString());
             return noticeDto;
         } catch (BadRequest | LocalBadRequest e) {
             log.error(e.getMessage(), e);
@@ -555,45 +568,43 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 throw new RuntimeException();
             }
             String applyNo = applyNoResult.getResult().get(0);
-            List<WorkflowResultDto> workflowResultDtoList = workFlowInfo(submitType, deviceList, model.getReceiveCompanyCode());
-            List<JgMaintainNotice> list = new ArrayList<>();
+            List<WorkflowResultDto> workflowResultDtoList = workFlowInfo(submitType, model.getReceiveCompanyCode());
             List<JgMaintainNoticeEq> equipList = new ArrayList<>();
             CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
             // 维修告知表添加数据
-            JgMaintainNotice dto = new JgMaintainNotice();
-            BeanUtils.copyProperties(model, dto);
-            dto.setApplyNo(applyNo);
+            JgMaintainNotice notice = new JgMaintainNotice();
+            BeanUtils.copyProperties(model, notice);
+            notice.setApplyNo(applyNo);
             // 统计使用
-            dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
-            dto.setNoticeDate(new Date());
-            dto.setEquListCode(model.getEquListCode());
-            dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
+            notice.setReceiveCompanyOrgCode(companyBo.getOrgCode());
+            notice.setNoticeDate(new Date());
+            notice.setEquListCode(model.getEquListCode());
+            notice.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
 
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-                dto.setNextExecuteIds(workflowResultDtoList.get(0).getNextExecutorRoleIds());
-                dto.setInstanceStatus(workflowResultDtoList.get(0).getNextExecutorRoleIds() + "," + workflowResultDtoList.get(0).getExecutorRoleIds());
-                dto.setPromoter(reginParams.getUserModel().getUserId());
-                dto.setNextExecuteUserIds(workflowResultDtoList.get(0).getNextExecutorUserIds());
-                dto.setNextTaskId(workflowResultDtoList.get(0).getNextTaskId());
-                dto.setInstanceId(workflowResultDtoList.get(0).getInstanceId());
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                notice.setNextExecuteIds(workflowResultDtoList.get(0).getNextExecutorRoleIds());
+                notice.setInstanceStatus(workflowResultDtoList.get(0).getNextExecutorRoleIds() + "," + workflowResultDtoList.get(0).getExecutorRoleIds());
+                notice.setPromoter(reginParams.getUserModel().getUserId());
+                notice.setNextExecuteUserIds(workflowResultDtoList.get(0).getNextExecutorUserIds());
+                notice.setNextTaskId(workflowResultDtoList.get(0).getNextTaskId());
+                notice.setInstanceId(workflowResultDtoList.get(0).getInstanceId());
+                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
             } else {
-                dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-            }
-            dto.setEquListCode(String.valueOf(deviceList.get(0).get("EQU_LIST_CODE")));
-            dto.setEquCategory(String.valueOf(deviceList.get(0).get("EQU_CATEGORY_CODE")));
-
-            dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
-            dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
-            dto.setCreateUserName(reginParams.getUserModel().getRealName());
-            dto.setCreateUserId(reginParams.getUserModel().getUserId());
-            DataDictionary dictionary = iDataDictionaryService.getByCode(dto.getMaintainType(), "WXLX");
-            dto.setMaintainTypeDesc(dictionary.getName());
-            dto.setFullAddress(dto.getProvinceName() + dto.getCityName() + dto.getCountyName() + dto.getStreetName() + dto.getAddress());
-            dto.setEquCategoryDesc(String.valueOf(deviceList.get(0).get("EQU_CATEGORY")));
-            dto.setEquList(String.valueOf(deviceList.get(0).get("EQU_LIST")));
-            list.add(dto);
+                notice.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
+                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            }
+            notice.setEquListCode(String.valueOf(deviceList.get(0).get("EQU_LIST_CODE")));
+            notice.setEquCategory(String.valueOf(deviceList.get(0).get("EQU_CATEGORY_CODE")));
+
+            notice.setInstallUnitName(reginParams.getCompany().getCompanyName());
+            notice.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
+            notice.setCreateUserName(reginParams.getUserModel().getRealName());
+            notice.setCreateUserId(reginParams.getUserModel().getUserId());
+            DataDictionary dictionary = iDataDictionaryService.getByCode(notice.getMaintainType(), "WXLX");
+            notice.setMaintainTypeDesc(dictionary.getName());
+            notice.setFullAddress(notice.getProvinceName() + notice.getCityName() + notice.getCountyName() + notice.getStreetName() + notice.getAddress());
+            notice.setEquCategoryDesc(String.valueOf(deviceList.get(0).get("EQU_CATEGORY")));
+            notice.setEquList(String.valueOf(deviceList.get(0).get("EQU_LIST")));
             deviceList.forEach(obj -> {
                 JgMaintainNoticeEq jgRelationEquip = new JgMaintainNoticeEq();
                 jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
@@ -603,21 +614,20 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 jgRelationEquip.setEquCategoryCode(String.valueOf(obj.get("EQU_CATEGORY_CODE")));
                 equipList.add(jgRelationEquip);
             });
-            jgMaintainNoticeMapper.insertBatchSomeColumn(list);
+            notice.setCreateDate(new Date());
+            jgMaintainNoticeMapper.insert(notice);
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-                buildTask(list, workflowResultDtoList, Boolean.TRUE);
+                buildTask(notice, workflowResultDtoList, Boolean.TRUE);
             } else {
                 // 暂存任务
-                buildTaskDraft(list);
+                buildTaskDraft(notice);
             }
-            List<JgMaintainNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
-                List<JgMaintainNotice> collect = list.stream().filter(JgMaintainNotice -> jgRelationEquip.getEquipTransferId().equals(JgMaintainNotice.getApplyNo())).collect(Collectors.toList());
-                Long sequenceNbr = collect.get(0).getSequenceNbr();
-                return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
-            }).collect(Collectors.toList());
+            List<JgMaintainNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> jgRelationEquip.setEquipTransferId(String.valueOf(notice.getSequenceNbr()))).collect(Collectors.toList());
             jgMaintainNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
-            this.updateRedisBatch(list);
-            return list;
+            this.updateRedisBatch(notice);
+            // 写入历史表
+            commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName(), JSON.parseObject(JSON.toJSONString(notice)), "", notice.getSequenceNbr().toString());
+            return Collections.singletonList(notice);
         } catch (BadRequest | LocalBadRequest e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
@@ -631,80 +641,80 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         }
     }
 
-    private void updateRedisBatch(List<JgMaintainNotice> jgMaintainNotices) {
-        jgMaintainNotices.stream().filter(n -> StringUtil.isNotEmpty(n.getInstanceId())).forEach(jgMaintainNotice -> {
+    private void updateRedisBatch(JgMaintainNotice jgMaintainNotice) {
+        if (!ObjectUtils.isEmpty(jgMaintainNotice.getInstanceId())){
             commonService.saveExecuteFlowData2Redis(jgMaintainNotice.getInstanceId(), this.buildInstanceRuntimeData(jgMaintainNotice));
-        });
+        }
     }
 
     /**
      * 暂存任务生成待办
      *
-     * @param list 业务信息
+     * @param maintainNotice 业务信息
      */
-    private void buildTaskDraft(List<JgMaintainNotice> list) {
+    private void buildTaskDraft(JgMaintainNotice maintainNotice) {
         List<TaskModelDto> modelDtos = new ArrayList<>();
-        list.forEach(obj -> {
+
         TaskModelDto dto = new TaskModelDto();
         //行数据
         TaskMessageDto taskMessageDto = new TaskMessageDto();
-            BeanUtils.copyProperties(obj, taskMessageDto);
-            taskMessageDto.setNextTaskId(obj.getNextTaskId());
+        BeanUtils.copyProperties(maintainNotice, taskMessageDto);
+        taskMessageDto.setNextTaskId(maintainNotice.getNextTaskId());
         dto.setModel(taskMessageDto);
         //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s的业务办理，【申请单号%s】",obj.getEquList(), obj.getApplyNo()));
+        dto.setTaskContent(String.format("来自%s的业务办理，【申请单号%s】",maintainNotice.getEquList(), maintainNotice.getApplyNo()));
         //申请单号
-            dto.setTaskCode(obj.getApplyNo());
+        dto.setTaskCode(maintainNotice.getApplyNo());
         //业务类型枚举code值
         dto.setTaskType(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
         ////业务主键
-            dto.setRelationId(obj.getSequenceNbr() + "");
+        dto.setRelationId(maintainNotice.getSequenceNbr() + "");
         modelDtos.add(dto);
-        });
+
         commonService.buildTaskModel(modelDtos);
     }
 
     /**
      * 插入代办
      */
-    private void buildTask(List<JgMaintainNotice> list, List<WorkflowResultDto> workflowResultList, Boolean bool) {
+    private void buildTask(JgMaintainNotice dto, List<WorkflowResultDto> workflowResultList, Boolean bool) {
         List<TaskModelDto> taskModelDtoList = new ArrayList<>();
         WorkflowResultDto workflowResultDto = workflowResultList.get(0);
-        list.forEach(item -> {
+
         TaskModelDto taskModelDto = new TaskModelDto();
-            taskModelDto.setFlowCreateDate(item.getCreateDate());
+        taskModelDto.setFlowCreateDate(dto.getCreateDate());
         taskModelDto.setTaskName(workflowResultDto.getNextTaskName()); // 工作流API返回
-            taskModelDto.setTaskCode(item.getApplyNo());
+        taskModelDto.setTaskCode(dto.getApplyNo());
         taskModelDto.setTaskType(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
         taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName());
-            String instanceId = workflowResultList.stream().filter(e -> e.getInstanceId().equals(item.getInstanceId())).findFirst().orElse(null).getInstanceId();
+        String instanceId = workflowResultList.stream().filter(e -> e.getInstanceId().equals(dto.getInstanceId())).findFirst().orElse(null).getInstanceId();
         taskModelDto.setRelationId(instanceId);
         taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); // 工作流API返回
         taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
         taskModelDto.setFlowStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
         taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-            taskModelDto.setFlowCode(item.getNextTaskId());
-            taskModelDto.setStartUserId(item.getCreateUserId());
-            taskModelDto.setStartUser(item.getCreateUserName());
-            taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
-            taskModelDto.setStartDate(item.getCreateDate());
+        taskModelDto.setFlowCode(dto.getNextTaskId());
+        taskModelDto.setStartUserId(dto.getCreateUserId());
+        taskModelDto.setStartUser(dto.getCreateUserName());
+        taskModelDto.setStartUserCompanyName(dto.getCreateUserCompanyName()); // 任务发起人所在单位
+        taskModelDto.setStartDate(dto.getCreateDate());
         TaskMessageDto taskMessageDto = new TaskMessageDto();
-            BeanUtils.copyProperties(item, taskMessageDto);
-            taskMessageDto.setNextTaskId(item.getNextTaskId());
+        BeanUtils.copyProperties(dto, taskMessageDto);
+        taskMessageDto.setNextTaskId(dto.getNextTaskId());
         taskModelDto.setModel(taskMessageDto);
-            taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】",item.getEquList(), item.getApplyNo()));
+        taskModelDto.setNextExecuteUser(dto.getNextExecuteIds());
+        taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】",dto.getEquList(), dto.getApplyNo()));
         taskModelDtoList.add(taskModelDto);
         if (bool) {
             // 删除暂存时生成的待办
-                commonService.deleteTasksByRelationId(item.getSequenceNbr() + "");
+            commonService.deleteTasksByRelationId(dto.getSequenceNbr() + "");
         }
-        });
+
         commonService.buildTaskModel(taskModelDtoList);
     }
 
 
-    private List<WorkflowResultDto> workFlowInfo(String submitType, List<Map<String, Object>> deviceList, String receiveCompanyCode) {
+    private List<WorkflowResultDto> workFlowInfo(String submitType,String receiveCompanyCode) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 发起流程
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
@@ -919,7 +929,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
             // 提取节点等信息
             WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
-            TaskV2Model taskV2Model = new TaskV2Model();
+            TaskV2Model taskV2Model;
             if ("0".equals(op)) {
                 // 判断如果下一步执行角色列表为空则流程完成
                 if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
@@ -927,8 +937,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     queryWrapper.eq(JgMaintainNoticeEq::getEquipTransferId, dto.getSequenceNbr());
                     List<JgMaintainNoticeEq> jgRelationEquip = jgMaintainNoticeEqMapper.selectList(queryWrapper);
                     for (JgMaintainNoticeEq jgMaintainNoticeEq : jgRelationEquip) {
-                        this.saveHisDataBeforeUpdate(jgMaintainNotice, jgMaintainNoticeEq.getEquId());
-
                         LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                         queryWrapper2.eq(RegistrationInfo::getRecord, jgMaintainNoticeEq.getEquId());
                         RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
@@ -1082,12 +1090,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         }
     }
 
-    private void saveHisDataBeforeUpdate(JgMaintainNotice jgMaintainNotice, String equId) {
-        Map<String, Object> map = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equId);
-        commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName(), new JSONObject(map), null, jgMaintainNotice.getSequenceNbr().toString());
-    }
-
-
     private TaskResultDTO assembleData(JgMaintainNotice jgMaintainNotice, String op, String opinion) {
         TaskResultDTO taskResultDTO = new TaskResultDTO();
         taskResultDTO.setResultCode("approvalStatus");
@@ -1101,4 +1103,71 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         taskResultDTO.setVariable(map);
         return taskResultDTO;
     }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
+    public JgMaintainNotice cancelApplication(Long sequenceNbr, String cancelReason, Map<String, Object> model) {
+        // 1.更新为已作废
+        JgMaintainNotice maintainNotice = this.getById(sequenceNbr);
+        String oldNoticeStatus = maintainNotice.getNoticeStatus();
+        maintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_DISCARD.getCode()));
+        maintainNotice.setCancelReason(cancelReason);
+        maintainNotice.setCancelDate(new Date());
+        maintainNotice.setCancelUserId(RequestContext.getExeUserId());
+        maintainNotice.setNextExecuteUserIds(null);
+        maintainNotice.setPromoter(null);
+        this.updateById(maintainNotice);
+        // 2.更新关联的业务
+        this.processElseDataByStatus(Objects.requireNonNull(FlowStatusEnum.getEumByCode(Integer.parseInt(oldNoticeStatus))), maintainNotice, model);
+        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+            @Override
+            public void afterCommit() {
+                eventPublisher.publish(new CancellationEvent(this, getEquList(maintainNotice)));
+            }
+        });
+        return maintainNotice;
+    }
+
+    private List<String> getEquList(JgMaintainNotice jgMaintainNotice) {
+        LambdaQueryWrapper<JgMaintainNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(JgMaintainNoticeEq::getEquipTransferId, jgMaintainNotice.getSequenceNbr());
+        List<JgMaintainNoticeEq> jgInstallationNoticeEqs = jgMaintainNoticeEqMapper.selectList(queryWrapper);
+        return jgInstallationNoticeEqs.stream().map(JgMaintainNoticeEq::getEquId).collect(Collectors.toList());
+    }
+
+    private void processElseDataByStatus(FlowStatusEnum oldNoticeStatus, JgMaintainNotice maintainNotice, Map<String, Object> model) {
+        switch (oldNoticeStatus) {
+            case TO_BE_SUBMITTED: // 待提交
+                // 1.删除暂存时生成的待办
+                commonService.deleteTasksByRelationId(maintainNotice.getSequenceNbr() + "");
+                break;
+            case TO_BE_FINISHED: // 已完成
+                // 1.清空redis 缓存的流程中及已完成安装告知的设备
+                this.delRepeatUseEquipData(maintainNotice);
+                break;
+            default:
+                // 流程中（驳回、撤回等）
+                // 1.待办任务更新为已完成
+                this.finishedTask(maintainNotice);
+                // 2.终止流程-工作流报错暂时注释掉
+                iCmWorkflowService.stopProcess(maintainNotice.getInstanceId(), maintainNotice.getCancelReason());
+                // 3.清空redis（缓存的流程中及已完成安装告知的设备）
+                this.delRepeatUseEquipData(maintainNotice);
+        }
+    }
+
+    private void finishedTask(JgMaintainNotice maintainNotice) {
+        HashMap<String, Object> taskMap = new HashMap<>();
+        taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        taskMap.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        taskMap.put("relationId", maintainNotice.getInstanceId());
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        BeanUtils.copyProperties(maintainNotice, taskMessageDto);
+        taskMap.put("model", taskMessageDto);
+        commonService.updateTaskModel(taskMap);
+    }
 }
\ 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/JgUseRegistrationServiceImpl.java

@@ -1033,6 +1033,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(jgUseRegistration.getUseRegistrationCode())){
             JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .eq(JgUseRegistrationManage::getCertificateStatus,CertificateStatusEnum.YIDENGJI.getName()).one();
             changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
         }
@@ -2362,7 +2363,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             Map<String, Object> result = code.getResult();
             if (!ObjectUtils.isEmpty(result)) {
                 otherInfo.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
-                otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? null : String.valueOf(result.get("code96333")));
+                // 历史登记时 96333如果自行输入则不再进行生成插入
+                if(StringUtils.isEmpty(otherInfo.getCode96333())){
+                    otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? "" : String.valueOf(result.get("code96333")));
+                }
                 // 更新使用登记业务表
                 jgUseRegistration.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
             }
@@ -3015,8 +3019,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 设备安装信息更新
                 this.historyEquUpdateInstallInfo(map);
 
-                // 设备维保信息更新
+                // 设备维保信息更新,只有电梯
+                if ("3000".equals(map.get("equList"))){
                     this.historyEquUpdateMaintenanceInfo(map);
+                }
 
                 // 历史设备 生成证书管理表记录 & 生成安装 维保等操作记录
                 this.historyEquGenManageRelated(map, jgUseRegistration, registerInfo, idxBizJgFactoryInfo);
@@ -3043,8 +3049,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         SimpleDateFormat format = new SimpleDateFormat();
         IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
         if (!ValidationUtil.isEmpty(info.getSequenceNbr())) {
-            info.setMeUnitName(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[1]);
-            info.setMeUnitCreditCode(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[0]);
+            String meUnitName = String.valueOf(map.get("meUnitName"));
+            info.setMeUnitName(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[1] : null);
+            info.setMeUnitCreditCode(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[0] : null);
             info.setMeMaster(ValidationUtil.isEmpty(map.get("maintenanceManagerOneName")) ? null : String.valueOf(map.get("maintenanceManagerOneName")));
             info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("maintenanceManagerOnePhone")) ? null : String.valueOf(map.get("maintenanceManagerOnePhone")));
             info.setMeMasterId(ValidationUtil.isEmpty(map.get("maintenanceManagerOneID")) ? null : String.valueOf(map.get("maintenanceManagerOneID")));

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

@@ -1573,6 +1573,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         if (!ObjectUtils.isEmpty(jgVehicleInformation.getUseRegistrationCode())){
             JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, jgVehicleInformation.getUseRegistrationCode())
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .eq(JgUseRegistrationManage::getCertificateStatus,CertificateStatusEnum.YIDENGJI.getName()).one();
             changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
         }
@@ -1890,6 +1891,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             this.getBaseMapper().updateById(vehicleInformation);
             JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, vehicleInformation.getUseRegistrationCode())
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .one();
             if (useRegistrationCode != null) {
                 useRegistrationCode.setCarNumber(vehicleInformation.getCarNumber());
@@ -2086,6 +2088,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         this.getBaseMapper().updateById(vehicleInformation);
         JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery()
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, vehicleInformation.getUseRegistrationCode())
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
                 .one();
         if (useRegistrationCode != null) {
             useRegistrationCode.setCarNumber(vehicleInformation.getCarNumber());

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
@@ -43,20 +46,31 @@ public class XiAnDataDockServiceImpl {
     private IdxBizJgSupervisionInfoServiceImpl idxBizJgSupervisionInfoService;
     @Autowired
     private IdxBizJgOtherInfoServiceImpl idxBizJgOtherInfoService;
+
+    @Autowired
+    IIdxBizJgTechParamsVehicleService iIdxBizJgTechParamsVehicleService;
+
     @Autowired
-    private EquipTechParamLiftingMapper equipTechParamLiftingMapper;
+    IIdxBizJgTechParamsLiftingService iIdxBizJgTechParamsLiftingService;
+
     @Autowired
-    private EquipTechParamVehicleMapper equipTechParamVehicleMapper;
+    IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
+
     @Autowired
-    private EquipTechParamBoilerMapper equipTechParamBoilerMapper;
+    IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
+
     @Autowired
-    private EquipTechParamVesselMapper equipTechParamVesselMapper;
+    IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
+
     @Autowired
-    private EquipTechParamPipelineMapper equipTechParamPipelineMapper;
+    IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
+
     @Autowired
-    private EquipTechParamRidesMapper equipTechParamRidesMapper;
+    IIdxBizJgTechParamsRopewayService iIdxBizJgTechParamsRopewayService;
+
     @Autowired
-    private EquipTechParamRopewayMapper equipTechParamRopewayMapper;
+    private TransactionTemplate transactionTemplate;
+
 
     /**
      * 保存设备信息
@@ -65,10 +79,15 @@ public class XiAnDataDockServiceImpl {
      * @return 保存结果
      */
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public boolean saveEquipmentData(List<Map<?, ?>> equLists) {
-        // 异步
-        CompletableFuture.allOf(equLists.stream().map(equ ->
-                CompletableFuture.runAsync(() -> {
+        CompletableFuture.allOf(equLists.stream().map(equ -> CompletableFuture.runAsync(() -> saveEquipmentDataInTransaction(equ))).toArray(CompletableFuture[]::new)).join();
+        return Boolean.TRUE;
+    }
+
+    private void saveEquipmentDataInTransaction(Map<?, ?> equ) {
+        try {
+            transactionTemplate.execute(status -> {
                 String record = UUID.randomUUID().toString();
                 String equList = String.valueOf(equ.get("equList"));
                 // 保存到设备表
@@ -82,10 +101,14 @@ public class XiAnDataDockServiceImpl {
                 saveTechParams(equ, record, equList);
                 // 保存到ES
                 saveEquInfoToEs(record);
-                })
-        ).toArray(CompletableFuture[]::new)).join();
-
-        return Boolean.TRUE;
+                return null;
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("西安数据：保存时出现异常，对应数据：{}", JSONObject.toJSONString(equ));
+            log.error("异常信息：{}", e.getMessage());
+            log.error("异常原因：{}", e.getMessage());
+        }
     }
 
     /**
@@ -99,11 +122,11 @@ public class XiAnDataDockServiceImpl {
         if (!ValidationUtil.isEmpty(useInfo)) {
             useInfo.setRecDate(new Date());
             useInfo.setRecord(record);
-            useInfo.setDataSource("jg_his_xx");
+            useInfo.setDataSource("jg_his_xa");
             useInfo.setIsNotEs("1");
             useInfo.setIsIntoManagement(Boolean.FALSE);
-            useInfo.setUseUnitCreditCode(String.valueOf(equ.get("useUnitCode")));
-            useInfo.setUseUnitName(String.valueOf(equ.get("useUnit")));
+            useInfo.setUseUnitCreditCode(String.valueOf(equ.get("useUnitCode")).trim());
+            useInfo.setUseUnitName(String.valueOf(equ.get("useUnit")).trim());
             idxBizJgUseInfoService.save(useInfo);
         }
     }
@@ -217,10 +240,11 @@ public class XiAnDataDockServiceImpl {
      * @param record
      */
     private void saveLiftingParams(Map<?, ?> equ, String record) {
-        EquipTechParamLifting equipTechParamLifting = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamLifting.class);
+        IdxBizJgTechParamsLifting equipTechParamLifting = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsLifting.class);
         if (!ValidationUtil.isEmpty(equipTechParamLifting)) {
             equipTechParamLifting.setRecord(record);
-            equipTechParamLiftingMapper.insert(equipTechParamLifting);
+            equipTechParamLifting.setRecDate(new Date());
+            iIdxBizJgTechParamsLiftingService.saveOrUpdateData(equipTechParamLifting);
         }
     }
 
@@ -231,10 +255,11 @@ public class XiAnDataDockServiceImpl {
      * @param record
      */
     private void saveVehicleParams(Map<?, ?> equ, String record) {
-        EquipTechParamVehicle equipTechParamVehicle = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamVehicle.class);
+        IdxBizJgTechParamsVehicle equipTechParamVehicle = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsVehicle.class);
         if (!ValidationUtil.isEmpty(equipTechParamVehicle)) {
             equipTechParamVehicle.setRecord(record);
-            equipTechParamVehicleMapper.insert(equipTechParamVehicle);
+            equipTechParamVehicle.setRecDate(new Date());
+            iIdxBizJgTechParamsVehicleService.saveOrUpdateData(equipTechParamVehicle);
         }
     }
 
@@ -245,10 +270,11 @@ public class XiAnDataDockServiceImpl {
      * @param record
      */
     private void saveBoilerParams(Map<?, ?> equ, String record) {
-        EquipTechParamBoiler equipTechParamBoiler = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamBoiler.class);
+        IdxBizJgTechParamsBoiler equipTechParamBoiler = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsBoiler.class);
         if (!ValidationUtil.isEmpty(equipTechParamBoiler)) {
             equipTechParamBoiler.setRecord(record);
-            equipTechParamBoilerMapper.insert(equipTechParamBoiler);
+            equipTechParamBoiler.setRecDate(new Date());
+            iIdxBizJgTechParamsBoilerService.saveOrUpdateData(equipTechParamBoiler);
         }
     }
 
@@ -259,10 +285,11 @@ public class XiAnDataDockServiceImpl {
      * @param record
      */
     private void saveVesselParams(Map<?, ?> equ, String record) {
-        EquipTechParamVessel equipTechParamVessel = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamVessel.class);
+        IdxBizJgTechParamsVessel equipTechParamVessel = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsVessel.class);
         if (!ValidationUtil.isEmpty(equipTechParamVessel)) {
             equipTechParamVessel.setRecord(record);
-            equipTechParamVesselMapper.insert(equipTechParamVessel);
+            equipTechParamVessel.setRecDate(new Date());
+            iIdxBizJgTechParamsVesselService.saveOrUpdateData(equipTechParamVessel);
         }
     }
 
@@ -273,10 +300,15 @@ public class XiAnDataDockServiceImpl {
      * @param record
      */
     private void savePipelineParams(Map<?, ?> equ, String record) {
-        EquipTechParamPipeline equipTechParamPipeline = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamPipeline.class);
+        IdxBizJgTechParamsPipeline equipTechParamPipeline = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsPipeline.class);
         if (!ValidationUtil.isEmpty(equipTechParamPipeline)) {
+            equipTechParamPipeline.setWallThickness(String.valueOf(equ.get("wallThickness_YLGD")));
+            equipTechParamPipeline.setMedium(String.valueOf(equ.get("medium_YLGD")));
+            equipTechParamPipeline.setTemperature(String.valueOf(equ.get("temperature_YLGD")));
+            equipTechParamPipeline.setDeviceLevel(String.valueOf(equ.get("deviceLevel_YLGD")));
             equipTechParamPipeline.setRecord(record);
-            equipTechParamPipelineMapper.insert(equipTechParamPipeline);
+            equipTechParamPipeline.setRecDate(new Date());
+            iIdxBizJgTechParamsPipelineService.saveOrUpdateData(equipTechParamPipeline);
         }
     }
 
@@ -287,10 +319,14 @@ public class XiAnDataDockServiceImpl {
      * @param record
      */
     private void saveRidesParams(Map<?, ?> equ, String record) {
-        EquipTechParamRides equipTechParamRides = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamRides.class);
+        IdxBizJgTechParamsRides equipTechParamRides = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsRides.class);
         if (!ValidationUtil.isEmpty(equipTechParamRides)) {
             equipTechParamRides.setRecord(record);
-            equipTechParamRidesMapper.insert(equipTechParamRides);
+            equipTechParamRides.setRecDate(new Date());
+            equipTechParamRides.setRunningSpeed(String.valueOf(equ.get("runningSpeed_DXYLSS")));
+            equipTechParamRides.setSlideLength(String.valueOf(equ.get("slideLength_DXYLSS")));
+            equipTechParamRides.setOperatingHeight(String.valueOf(equ.get("operatingHeight_DXYLSS")));
+            iIdxBizJgTechParamsRidesService.saveOrUpdateData(equipTechParamRides);
         }
     }
 
@@ -301,10 +337,11 @@ public class XiAnDataDockServiceImpl {
      * @param record
      */
     private void saveRopewayParams(Map<?, ?> equ, String record) {
-        EquipTechParamRopeway equipTechParamRopeway = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamRopeway.class);
+        IdxBizJgTechParamsRopeway equipTechParamRopeway = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsRopeway.class);
         if (!ValidationUtil.isEmpty(equipTechParamRopeway)) {
             equipTechParamRopeway.setRecord(record);
-            equipTechParamRopewayMapper.insert(equipTechParamRopeway);
+            equipTechParamRopeway.setRecDate(new Date());
+            iIdxBizJgTechParamsRopewayService.saveOrUpdateData(equipTechParamRopeway);
         }
     }
 

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

@@ -190,7 +190,7 @@ public class JyjcInspectionResultController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "检验类型-按照身份查询", notes = "\"检验类型-按照身份查询")
+    @ApiOperation(httpMethod = "GET", value = "检验类型-按照身份查询", notes = "检验类型-按照身份查询")
     @GetMapping(value = "/inspectType/list")
     public ResponseModel<List<DictionarieModel>> inspectTypeListByPerson(){
         return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.inspectTypeListByPerson(getSelectedOrgInfo()));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZLStatisticsMapper.xml

@@ -34,7 +34,8 @@
 					INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
 					INNER JOIN tzs_user_info tui ON bi.use_code = tui.unit_code
 		WHERE
-			tui.post LIKE concat ( '%', '6552', '%' )
+			tui.new_post LIKE concat ( '%', '6552', '%' )
+		  AND tui.is_delete = 'f'
 		  AND bi.unit_type IS NOT NULL
 	</select>
 	<select id="supervisorCount" resultType="java.util.Map">
@@ -54,14 +55,15 @@
 	</select>
 	<select id="userCountNew" resultType="java.util.Map">
 		SELECT
-			tui.post
+			tui.new_post
 		FROM
 			( SELECT org_code FROM privilege_company WHERE company_code = #{screenDto.cityCode} ) AS subquery
 				INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
 				INNER JOIN tzs_user_info tui ON bi.use_code = tui.unit_code
 		WHERE
 		  bi.unit_type IS NOT NULL
-		  AND tui.post IS NOT NULL
+		  AND tui.new_post IS NOT NULL
+		  AND tui.is_delete = 'f'
 		  <if test="unitTypeList != null and unitTypeList.size() > 0">
 			AND
 			<foreach collection="unitTypeList" item="unitType" open="(" separator="OR" close=")">

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/AQZSDPStatisticsServiceImpl.java

@@ -372,6 +372,8 @@ public class AQZSDPStatisticsServiceImpl {
         countItemDto.setCzjc("0");
         countItemDto.setCzjchege("0");
         countItemDto.setJianyanchaoqi("0");
+        countItemDto.setRyhg("0");
+        countItemDto.setSjhg("0");
     }
 
     public Map<String, Object> mainBodyCount(DPFilterParamDto dpFilterParamDto) {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderDPStatisticsServiceImpl.java

@@ -467,11 +467,11 @@ public class CylinderDPStatisticsServiceImpl {
 
     private Map<String,Object> getStationRate(String orgCode,Map<String,Object> result){
         // 气站总数
-        Long totalNum = cylinderStatisticsMapper.countEnterpriseNumForCylinder(orgCode);
+        Long totalNum = null == orgCode ? null : cylinderStatisticsMapper.countEnterpriseNumForCylinder(orgCode);
         // 已对接总数(存在充装业务数据的企业则认为已对接)
-        Long count = cylinderStatisticsMapper.countEnterpriseUsed(orgCode);
+        Long count = null == orgCode ? null : cylinderStatisticsMapper.countEnterpriseUsed(orgCode);
 
-        if (totalNum != null && count != null) {
+        if (totalNum != null && count != null && totalNum > 0 ) {
             BigDecimal percent = (new BigDecimal(count.doubleValue() * 100).divide(new BigDecimal(totalNum.doubleValue()), 2, RoundingMode.HALF_UP));
             result.put("stationRate", Double.valueOf(percent.toString()));
         } else {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -2673,6 +2673,7 @@ public class JGDPStatisticsServiceImpl {
         if(!ValidationUtil.isEmpty(registerInfo.getUseOrgCode())){
             Optional<JgUseRegistrationManage> firstRecord = jgUseRegistrationManageMapper.selectList(new QueryWrapper<JgUseRegistrationManage>().lambda()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .orderByDesc(JgUseRegistrationManage::getRecDate)).stream().findFirst();
 
             firstRecord.ifPresent(jgUseRegistrationManage -> {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -565,7 +565,7 @@ public class ZLDPStatisticsServiceImpl {
         List<Map<String, String>> list = screenMapper.userCountNew(screenDto, unitTypeList);
         Map<String, Integer> dataMap = new HashMap<>();
         for (Map<String, String> map : list) {
-            JSONArray jsonArray = JSONArray.parseArray(map.get("post"));
+            JSONArray jsonArray = JSONArray.parseArray(map.get("new_post"));
             for(int j = 0; j < jsonArray.size(); j++){
                 dataMap.put(jsonArray.getString(j), dataMap.getOrDefault(jsonArray.getString(j), 0) + 1);
             }

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

@@ -19,7 +19,7 @@ public enum EquipmentClassifityEnum {
     QZJX("起重机械","4000"),
     CC("场（厂）内专用机动车辆","5000"),
     YLSS("大型游乐设施","6000"),
-    KYSD("压力管道元件","9000"),
+    KYSD("客运索道","9000"),
     YLGD("压力管道","8000"),
     QP("气瓶","2300"),
 

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

@@ -656,7 +656,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 			tzBaseEnterpriseInfo.setDistrict(addressList.get(2));
 			tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
 			tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("street")) ? null : String.valueOf(map.get("street")));
-			tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("regAddress")) ? null : String.valueOf(map.get("regAddress")));
+//			tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("regAddress")) ? null : String.valueOf(map.get("regAddress")));
 			tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
 			regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
 			DataDictionary regOrganCodeDict = iDataDictionaryService.getByCode(String.valueOf(map.get("registeredOrganCode")),"DJJG");
@@ -682,9 +682,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 		// 企业信息变更-同步修改企业下人员绑定设备类型
 		ArrayList<String> newData = new ArrayList<>();
 		JSONArray objects = JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory());
-		objects.forEach(item ->{
-			newData.add(item.toString());
-		});
+		objects.forEach(item -> newData.add(item.toString()));
         boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
         if (b) {
 			try {

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

@@ -130,4 +130,10 @@ public class IdxBizJgOtherInfo extends TzsBaseEntity {
     @TableField(value = "\"CYLINDER_STAMP_ATTACHMENT\"")
     private String cylinderStampAttachment;
 
+
+    /**
+     * 96333码类型，类型手工输入（1）、系统自动生成（2）（历史登记时使用）,默认2
+     */
+    @TableField("\"CODE96333_TYPE\"")
+    private String code96333Type;
 }

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

@@ -49,4 +49,13 @@ public enum EquipmentClassifityEnum {
         }
         return "";
     }
+
+    public static EquipmentClassifityEnum getOne(String code){
+        for (EquipmentClassifityEnum value : EquipmentClassifityEnum.values()) {
+            if (value.getCode().equals(code)){
+                return value;
+            }
+        }
+        return null;
+    }
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -58,4 +58,6 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
     Boolean updateCylinderCategoryByEquCodeBatch(@Param("cylinderCategory") String cylinderCategory, @Param("equCodeList") List<String> equCodeList);
 
     Integer selectByEquCodeAndClaimStatus(@Param("equCode") String equCode, @Param("sequenceNbr") String sequenceNbr);
+
+    Integer selectInstallNoticeEqByEquCode(@Param("equCode") String equCode, @Param("sequenceNbr") String sequenceNbr);
 }

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

@@ -29,6 +29,16 @@
 		AND joi.claim_status = '已认领'
 	</select>
 
+	<select id="selectInstallNoticeEqByEquCode" resultType="java.lang.Integer">
+		SELECT COUNT(*)
+		FROM tzs_jg_installation_notice_eq tjine
+		JOIN idx_biz_jg_register_info ibjri ON ibjri.record = tjine.equ_id
+		WHERE ibjri.equ_code = #{equCode}
+		<if test="sequenceNbr != null and sequenceNbr != ''">
+			AND ibjri.sequence_nbr != #{sequenceNbr}
+		</if>
+	</select>
+
 	<update id="updateCylinderCategoryByRecordBatch">
 		UPDATE idx_biz_jg_register_info
 		SET "CYLINDER_CATEGORY" = #{cylinderCategory}

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

@@ -56,7 +56,7 @@
              tz_base_enterprise_info bi
         WHERE
             tui.unit_code =  bi.use_code
-            and tui.post LIKE concat ('%', #{post}, '%')
+            and tui.new_post LIKE concat ('%', #{post}, '%')
             and ((bi.supervise_org_code != '50' and bi.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (bi.supervise_org_code = '50' and bi.office_region LIKE CONCAT ('%', #{regionCode}, '%')))
             and tui.is_delete=false
     </select>