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

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

@@ -92,6 +92,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private static final String EQUSTATE = "EQU_STATE";
     private static final String CONSTRUCTIONTYPE = "CONSTRUCTION_TYPE";
     private static final String EQUDEFINE = "EQU_DEFINE";
+    private static final String EQUDEFINECODE = "EQU_DEFINE_CODE";
 
     /**
      * levlel=company,是企业,如果不是都是监管单位,
@@ -143,7 +144,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     ICommonService commonService;
 
     @Autowired
-    CategoryOtherInfoMapper categoryOtherInfoMapper;
+    private CategoryOtherInfoMapper categoryOtherInfoMapper;
     @Autowired
     private SuperviseInfoMapper superviseInfoMapper;
 
@@ -584,6 +585,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     } else {
                         dto2.put(EQUDEFINE, code);
                     }
+                    dto2.put(EQUDEFINECODE, code);
                 }
                 list.add(dto2);
             }

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

+package com.yeejoin.amos.boot.module.jyjc.api.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@ApiModel (value = "JyjcGeographicModel", description = "")
+public class JyjcGeographicModel {
+
+    @ApiModelProperty (value = "单位地理坐标经度")
+    private String longitude;
+
+    @ApiModelProperty (value = "单位地理坐标纬度")
+    private String latitude;
+}

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

@@ -101,6 +101,9 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     @ApiModelProperty (value = "单位地理坐标纬度")
     private String latitude;
 
+    @ApiModelProperty (value = "单位地理坐标")
+    private JyjcGeographicModel geographic;
+
     @ApiModelProperty ("企业营业执照")
     private List<AttachmentDto> unitBusinessLicense;
 }

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

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcGeographicModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstDto;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
@@ -268,6 +269,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                     jyjcOpeningApplicationModel.setIndustrySupervisor(baseUnitLicenceEntity.getIndustrySupervisor());
                 }
             }
+            // {  "latitude": "34.311788",  "longitude": "108.948721"}
+            jyjcOpeningApplicationModel.setGeographic(JyjcGeographicModel.builder().latitude(baseUnitLicenceEntity.getLatitude()).longitude(baseUnitLicenceEntity.getLongitude()).build());
             jyjcOpeningApplicationModel.setLongitude(baseUnitLicenceEntity.getLongitude());
             jyjcOpeningApplicationModel.setLatitude(baseUnitLicenceEntity.getLatitude());
             if (ObjectUtils.isNotEmpty(baseUnitLicenceEntity.getUnitBusinessLicense())) {

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

@@ -42,6 +42,9 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text)
     private String EQU_CATEGORY;
 
+    @Field(type = FieldType.Text)
+    private String EQU_CATEGORY_CODE;
+
     @Field(type = FieldType.Keyword)
     private String USE_ORG_CODE;
 

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

@@ -78,6 +78,7 @@
                EQU_LIST_CODE,
                EQU_LIST,
                EQU_CATEGORY,
+               EQU_CATEGORY_CODE,
                USE_ORG_CODE,
                CODE96333,
                EQU_CODE,