refeat(jyjc): 报检规则4.0开发

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESEquipmentCategoryDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
@@ -211,4 +213,10 @@ public class ESEquipmentCategoryDto {
      */
     @Field(type = FieldType.Keyword)
     private String tag1;
+
+    /**
+     * 是否球罐
+     */
+    @Field(type = FieldType.Keyword, name = "WHETHER_SPHERICAL_TANK")
+    private String whetherSphericalTank;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/event/EquipCreateOrEditEvent.java

@@ -5,6 +5,9 @@ import org.springframework.context.ApplicationEvent;
 
 import java.util.Set;
 
+/**
+ * 数据质量等级计算消息
+ */
 @Getter
 public class EquipCreateOrEditEvent extends ApplicationEvent {
 

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

@@ -3971,10 +3971,16 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 Date nextInspectDate = (Date) map.get("NEXT_INSPECT_DATE");
                 dto.setNEXT_INSPECT_DATE(DateUtil.parse(DateUtil.format(nextInspectDate, DatePattern.NORM_DATE_PATTERN)).getTime());
             }
+            this.setWhetherSphericalTank(dto);
             equipmentCategoryService.saveWithImmediateRefresh(dto);
         }
     }
 
+    private void setWhetherSphericalTank(ESEquipmentCategoryDto dto) {
+        IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, dto.getSEQUENCE_NBR()).select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getWhetherSphericalTank));
+        dto.setWhetherSphericalTank(registerInfo.getWhetherSphericalTank());
+    }
+
     private List getAccessoryEntity(Map<String, Object> map, List<String> list, String subFormType, String record, Date date, String type) {
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
         List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();