Merge branch 'develop_tzs_register' into develop_tzs_test

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -118,4 +119,19 @@ public class BaseUnitLicenceDto extends BaseDto {
 
     @ApiModelProperty(value = "企业资质状态：报检预留字段，如启用、停用、超期等")
     private Integer licenceState;
+
+    @ApiModelProperty(value = "是否采用自动焊接或焊接机器人")
+    private String autoOrRobotsWelding;
+
+    @ApiModelProperty(value = "是否外委")
+    private String outsource;
+
+    @ApiModelProperty(value = "是否涉及焊接")
+    private String involveWelding;
+
+    @ApiModelProperty(value = "是否涉及热处理")
+    private String involveHeatTreatment;
+
+    @ApiModelProperty(value = "是否涉及无损检测")
+    private String involveNondestructiveTesting;
 }

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

@@ -205,4 +205,30 @@ public class BaseUnitLicence extends BaseEntity {
      */
     @TableField("licence_state")
     private Integer licenceState;
+
+    /**
+     * 是否采用自动焊接或焊接机器人
+     */
+    @TableField("auto_or_robots_welding")
+    private String autoOrRobotsWelding;
+    /**
+     * 是否外委
+     */
+    @TableField("outsource")
+    private String outsource;
+    /**
+     * 是否涉及焊接
+     */
+    @TableField("involve_welding")
+    private String involveWelding;
+    /**
+     * 是否涉及热处理
+     */
+    @TableField("involve_heat_treatment")
+    private String involveHeatTreatment;
+    /**
+     * 是否涉及无损检测
+     */
+    @TableField("involve_nondestructive_testing")
+    private String involveNondestructiveTesting;
 }

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

@@ -292,7 +292,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
 				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode())
 				.eq(BaseUnitLicence::getIsDelete, false));
-		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<>();
+ 		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<>();
 		List<BaseUnitLicence> unitLicencesCollect = Optional.ofNullable(unitLicences).orElse(Collections.emptyList());
 		if (BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel)) {
 			List<String> certTypeList = Arrays.asList(Optional.ofNullable(COMPANY_TYPE_CERT_TYPE_MAP.get(companyType))