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

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

@@ -9,7 +9,7 @@ import com.yeejoin.amos.boot.module.tcm.api.converter.*;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.util.*;
+import java.util.Date;
 
 @Data
 public class CompanyUserImportDto {
@@ -81,15 +81,15 @@ public class CompanyUserImportDto {
     @Data
     public static class InspectQualification {
 
-        @NotBlank(message = "证件编号不能为空！")
+        @NotBlank(message = "检验资质证件编号不能为空！")
         @ExcelProperty(value = "证件编号")
         private String certificateNum;
 
-        @NotBlank(message = "检验资质发证机关不能为空！")
+        @NotBlank(message = "检验资质证书编号不能为空！")
         @ExcelProperty(value = "证书编号")
         private String certNo;
 
-        @NotBlank(message = "发证机关不能为空！")
+        @NotBlank(message = "检验资质发证机关不能为空！")
         @ExcelProperty(value = "发证机关")
         private String approvedOrgan;
 
@@ -118,15 +118,15 @@ public class CompanyUserImportDto {
      */
     @Data
     public static class TestingQualification {
-        @NotBlank(message = "证件编号不能为空！")
+        @NotBlank(message = "检测资质证件编号不能为空！")
         @ExcelProperty(value = "证件编号")
         private String certificateNum;
 
-        @NotBlank(message = "检测资质发证机关不能为空！")
+        @NotBlank(message = "检测资质证书编号不能为空！")
         @ExcelProperty(value = "证书编号")
         private String certNo;
 
-        @NotBlank(message = "发证机关不能为空！")
+        @NotBlank(message = "检测资质发证机关不能为空！")
         @ExcelProperty(value = "发证机关")
         private String approvedOrgan;
 
@@ -158,11 +158,11 @@ public class CompanyUserImportDto {
         @ExcelProperty(value = "证件编号")
         private String certificateNum;
 
-        @NotBlank(message = "作业人员资质发证机关不能为空！")
+        @NotBlank(message = "作业人员证书编号不能为空！")
         @ExcelProperty(value = "证书编号")
         private String certNo;
 
-        @NotBlank(message = "作业人员资质证书类型不能为空！")
+        @NotBlank(message = "作业人员发证机关不能为空！")
         @ExcelProperty(value = "发证机关")
         private String approvedOrgan;
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/RiskReportMapper.java

@@ -26,6 +26,6 @@ public interface RiskReportMapper extends BaseMapper<RiskReport> {
 
     Map<String, String> getCompanyBySeq(@Param("companySeq") String companySeq);
 
-    @Select("select risk_disposal_unit_org_code from tzs_risk_report where sequence_nbr = #{sequenceNbr}")
+    @Select("select all_risk_disposal_unit_org_code from tzs_risk_report where sequence_nbr = #{sequenceNbr}")
     String getRiskDisposalUnitOrgCode(Long sequenceNbr);
 }