diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java index 695f914f..288431ad 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java @@ -44,6 +44,12 @@ public class QualFilingPersonnelInfoCO { @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; + @ApiModelProperty(value = "是否技术负责人(0否1是)") + private Integer technicalDirectorFlag; + + @ApiModelProperty(value = "是否过程控制负责人(0否1是)") + private Integer processControlLeaderFlag; + @ApiModelProperty(value = "评价师证书编号") private String evaluatorCertNo; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgFilingPersonnelPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgFilingPersonnelPageQuery.java index 300fa209..778dd80b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgFilingPersonnelPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgFilingPersonnelPageQuery.java @@ -18,4 +18,7 @@ public class OrgFilingPersonnelPageQuery extends BasePageQuery { @ApiModelProperty(value = "人员姓名") private String personName; + + @ApiModelProperty(value = "是否管理人员") + private Boolean managementFlag; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/CapabilityAssessmentDTO.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/CapabilityAssessmentDTO.java index e2b6c157..38d634ad 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/CapabilityAssessmentDTO.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/CapabilityAssessmentDTO.java @@ -17,7 +17,6 @@ public class CapabilityAssessmentDTO implements Serializable { /** * 专业能力编码,取值见 * {@link org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilityEnum} - * {@link org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilitySourceEnum} */ private String professionalCapabilityCode; diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml index 769a512e..f3132a48 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml @@ -71,7 +71,8 @@ diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml index 7f574488..cf8a3d44 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml @@ -50,7 +50,8 @@