diff --git a/docs/db/phase2/init-phase2.sql b/docs/db/phase2/init-phase2.sql index 221757d..5c379b6 100644 --- a/docs/db/phase2/init-phase2.sql +++ b/docs/db/phase2/init-phase2.sql @@ -816,6 +816,20 @@ CREATE TABLE IF NOT EXISTS `qual_on_site_review_file` ( KEY `idx_qual_on_site_review_id` (`qual_on_site_review_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='资质现场核查-文件信息'; +-- ============================================= +-- 3. 字段重命名：cert_type_name -> cert_level（人员证书相关表） +-- 证书类型名称 调整为 证书等级(CertLevelEnum: SENIOR高级/MIDDLE中级/JUNIOR初级) +-- ============================================= + +ALTER TABLE `org_personnel_cert` + CHANGE COLUMN `cert_type_name` `cert_level` varchar(50) DEFAULT NULL COMMENT '证书等级(CertLevelEnum:SENIOR高级/MIDDLE中级/JUNIOR初级)'; + +ALTER TABLE `qual_filing_personnel_cert` + CHANGE COLUMN `cert_type_name` `cert_level` varchar(50) DEFAULT NULL COMMENT '证书等级(CertLevelEnum:SENIOR高级/MIDDLE中级/JUNIOR初级)'; + +ALTER TABLE `qual_filing_personnel_cert_change` + CHANGE COLUMN `cert_type_name` `cert_level` varchar(128) DEFAULT NULL COMMENT '证书等级(CertLevelEnum:SENIOR高级/MIDDLE中级/JUNIOR初级)'; + set foreign_key_checks = 1; -- ============================================= diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java index 76c4593..6a77c80 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java @@ -33,7 +33,7 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA QualFilingPersonnelCertEntity entity = new QualFilingPersonnelCertEntity(); entity.setCertName(cmd.getCertName()); entity.setCertTypeCode(cmd.getCertTypeCode()); - entity.setCertTypeName(cmd.getCertTypeName()); + entity.setCertLevel(cmd.getCertLevel()); entity.setCertCategoryCode(cmd.getCertCategoryCode()); entity.setCertCategoryName(cmd.getCertCategoryName()); entity.setOperationCategoryCode(cmd.getOperationCategoryCode()); @@ -61,7 +61,7 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA entity.setId(cmd.getId()); entity.setCertName(cmd.getCertName()); entity.setCertTypeCode(cmd.getCertTypeCode()); - entity.setCertTypeName(cmd.getCertTypeName()); + entity.setCertLevel(cmd.getCertLevel()); entity.setCertCategoryCode(cmd.getCertCategoryCode()); entity.setCertCategoryName(cmd.getCertCategoryName()); entity.setOperationCategoryCode(cmd.getOperationCategoryCode()); @@ -112,7 +112,7 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA co.setFilingPersonnelId(entity.getFilingPersonnelId()); co.setCertName(entity.getCertName()); co.setCertTypeCode(entity.getCertTypeCode()); - co.setCertTypeName(entity.getCertTypeName()); + co.setCertLevel(entity.getCertLevel()); co.setCertCategoryCode(entity.getCertCategoryCode()); co.setCertCategoryName(entity.getCertCategoryName()); co.setOperationCategoryCode(entity.getOperationCategoryCode()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java index e3448bf..c539965 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java @@ -103,7 +103,7 @@ public class QualFilingOrgPersonnelImporter { entity.setSourceCertId(source.getId()); entity.setCertName(source.getCertName()); entity.setCertTypeCode(source.getCertTypeCode()); - entity.setCertTypeName(source.getCertTypeName()); + entity.setCertLevel(source.getCertLevel()); entity.setCertCategoryCode(source.getCertCategoryCode()); entity.setCertCategoryName(source.getCertCategoryName()); entity.setOperationCategoryCode(source.getOperationCategoryCode()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java index 4f4153a..d24e66e 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java @@ -43,11 +43,11 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable { @Size(max = 512, message = "证书类型编码不能超过512个字符") private String certTypeCode; /** - * 证书类型名称 + * 证书等级 */ - @ApiModelProperty(value = "证书类型名称") - @Size(max = 128, message = "证书类型名称不能超过128个字符") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + @Size(max = 128, message = "证书等级不能超过128个字符") + private String certLevel; /** * 证书类别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java index 3efbe41..406bdae 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java @@ -37,10 +37,10 @@ public class QualFilingPersonnelCertChangePageQry extends PageQuery { @ApiModelProperty(value = "证书类型编码") private String certTypeCode; /** - * 证书类型名称 + * 证书等级 */ - @ApiModelProperty(value = "证书类型名称") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + private String certLevel; /** * 证书类别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java index 6820771..f989176 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java @@ -42,10 +42,10 @@ public class QualFilingPersonnelCertChangeUpdateCmd implements Serializable { @ApiModelProperty(value = "证书类型编码") private String certTypeCode; /** - * 证书类型名称 + * 证书等级 */ - @ApiModelProperty(value = "证书类型名称") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + private String certLevel; /** * 证书类别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java index 5eec800..f41740a 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java @@ -39,10 +39,10 @@ public class QualFilingPersonnelCertChangeCo extends ClientObject { @ApiModelProperty(value = "证书类型编码") private String certTypeCode; /** - * 证书类型名称 + * 证书等级 */ - @ApiModelProperty(value = "证书类型名称") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + private String certLevel; /** * 证书类别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCO.java index dcbdd60..74df0ce 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCO.java @@ -24,8 +24,8 @@ public class OrgPersonnelCertCO { @ApiModelProperty(value = "证书类型编码") private String certTypeCode; - @ApiModelProperty(value = "证书类型名称") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + private String certLevel; @ApiModelProperty(value = "证书分类编码") private String certCategoryCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java index 6467a00..a922c18 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java @@ -27,8 +27,8 @@ public class QualFilingPersonnelCertCO { @ApiModelProperty(value = "证书类型编码") private String certTypeCode; - @ApiModelProperty(value = "证书类型名称") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + private String certLevel; @ApiModelProperty(value = "证书分类编码") private String certCategoryCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java index d8d3134..00bf099 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java @@ -21,9 +21,9 @@ public class OrgPersonnelCertAddCmd { @Size(max = 32, message = "证书类型编码不能超过32个字符") private String certTypeCode; - @ApiModelProperty(value = "证书类型名称") - @Size(max = 50, message = "证书类型名称不能超过50个字符") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + @Size(max = 50, message = "证书等级不能超过50个字符") + private String certLevel; @ApiModelProperty(value = "证书类别编码") @Size(max = 32, message = "证书类别编码不能超过32个字符") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java index 0b721fc..9f300db 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java @@ -24,9 +24,9 @@ public class OrgPersonnelCertModifyCmd { @Size(max = 32, message = "证书类型编码不能超过32个字符") private String certTypeCode; - @ApiModelProperty(value = "证书类型名称") - @Size(max = 50, message = "证书类型名称不能超过50个字符") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + @Size(max = 50, message = "证书等级不能超过50个字符") + private String certLevel; @ApiModelProperty(value = "证书类别编码") @Size(max = 32, message = "证书类别编码不能超过32个字符") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java index e5f56e9..abe6e23 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java @@ -18,8 +18,8 @@ public class QualFilingPersonnelCertAddCmd { @ApiModelProperty(value = "证书类型编码") private String certTypeCode; - @ApiModelProperty(value = "证书类型名称") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + private String certLevel; @ApiModelProperty(value = "证书类别编码") private String certCategoryCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java index 9e8077c..d315b4b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java @@ -21,8 +21,8 @@ public class QualFilingPersonnelCertModifyCmd { @ApiModelProperty(value = "证书类型编码") private String certTypeCode; - @ApiModelProperty(value = "证书类型名称") - private String certTypeName; + @ApiModelProperty(value = "证书等级") + private String certLevel; @ApiModelProperty(value = "证书类别编码") private String certCategoryCode; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java index 485c2f7..ac16d1b 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java @@ -39,9 +39,9 @@ public class QualFilingPersonnelCertChangeE extends BaseE { */ private String certTypeCode; /** - * 证书类型名称 + * 证书等级 */ - private String certTypeName; + private String certLevel; /** * 证书类别编码 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertLevelEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertLevelEnum.java new file mode 100644 index 0000000..96191aa --- /dev/null +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertLevelEnum.java @@ -0,0 +1,19 @@ +package org.qinan.safetyeval.domain.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 证书等级枚举 + */ +@AllArgsConstructor +@Getter +public enum CertLevelEnum { + + SENIOR("SENIOR", "高级"), + MIDDLE("MIDDLE", "中级"), + JUNIOR("JUNIOR", "初级"); + + private final String code; + private final String desc; +} diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertTypeCodeEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertTypeCodeEnum.java index ecc291d..4451fc2 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertTypeCodeEnum.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertTypeCodeEnum.java @@ -8,7 +8,6 @@ import java.util.Objects; public enum CertTypeCodeEnum { REGISTERED_SAFETY_ENGINEER("注册安全工程师"), - SENIOR_ENGINEER("高工"), EVALUATOR("评价师"), ; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelCertEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelCertEntity.java index 339251b..d4f2556 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelCertEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelCertEntity.java @@ -27,8 +27,8 @@ public class OrgPersonnelCertEntity { /** 证书类型编码 */ private String certTypeCode; - /** 证书类型名称 */ - private String certTypeName; + /** 证书等级 */ + private String certLevel; /** 证书类别编码 */ private String certCategoryCode; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java index 4e78435..b53dba8 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java @@ -28,8 +28,8 @@ public class QualFilingPersonnelCertEntity { /** 证书类型编码 */ private String certTypeCode; - /** 证书类型名称 */ - private String certTypeName; + /** 证书等级 */ + private String certLevel; /** 证书类别编码 */ private String certCategoryCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelCertDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelCertDO.java index f5eb421..4c3edf1 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelCertDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelCertDO.java @@ -20,7 +20,7 @@ public class OrgPersonnelCertDO { private Long personnelId; private String certName; private String certTypeCode; - private String certTypeName; + private String certLevel; private String certCategoryCode; private String certCategoryName; private String operationCategoryCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelCertDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelCertDO.java index 7417873..24bd0df 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelCertDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelCertDO.java @@ -20,7 +20,7 @@ public class QualFilingPersonnelCertDO { private Long filingPersonnelId; private String certName; private String certTypeCode; - private String certTypeName; + private String certLevel; private String certCategoryCode; private String certCategoryName; private String operationCategoryCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java index 9173675..d0c39bc 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java @@ -104,7 +104,7 @@ public class QualFilingPersonnelCertGatewayImpl implements QualFilingPersonnelCe dataObject.setFilingPersonnelId(entity.getFilingPersonnelId()); dataObject.setCertName(entity.getCertName()); dataObject.setCertTypeCode(entity.getCertTypeCode()); - dataObject.setCertTypeName(entity.getCertTypeName()); + dataObject.setCertLevel(entity.getCertLevel()); dataObject.setCertCategoryCode(entity.getCertCategoryCode()); dataObject.setCertCategoryName(entity.getCertCategoryName()); dataObject.setOperationCategoryCode(entity.getOperationCategoryCode()); @@ -130,7 +130,7 @@ public class QualFilingPersonnelCertGatewayImpl implements QualFilingPersonnelCe entity.setFilingPersonnelId(dataObject.getFilingPersonnelId()); entity.setCertName(dataObject.getCertName()); entity.setCertTypeCode(dataObject.getCertTypeCode()); - entity.setCertTypeName(dataObject.getCertTypeName()); + entity.setCertLevel(dataObject.getCertLevel()); entity.setCertCategoryCode(dataObject.getCertCategoryCode()); entity.setCertCategoryName(dataObject.getCertCategoryName()); entity.setOperationCategoryCode(dataObject.getOperationCategoryCode()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/handler/ProjectNodeListTypeHandler.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/handler/ProjectNodeListTypeHandler.java index 5032742..7b19da3 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/handler/ProjectNodeListTypeHandler.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/handler/ProjectNodeListTypeHandler.java @@ -1,11 +1,10 @@ package org.qinan.safetyeval.infrastructure.handler; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; -import org.qinan.safetyeval.client.co.institution.EvalProjectNodeItemCO; +import org.qinan.safetyeval.client.co.institution.ProjectNodeCO; import java.sql.CallableStatement; import java.sql.PreparedStatement; @@ -15,40 +14,40 @@ import java.util.Collections; import java.util.List; /** - * MyBatis TypeHandler: 在数据库的 varchar/text 列中以 JSON 数组字符串形式存储 List。 + * MyBatis TypeHandler: 在数据库的 varchar/text 列中以 JSON 数组字符串形式存储 List。 *

- * 入库: List -> JSON.toJSONString -> String - * 出库: String -> JSON.parseArray -> List + * 入库: List -> JSON.toJSONString -> String + * 出库: String -> JSON.parseArray -> List * * @author safety-eval */ @MappedJdbcTypes(JdbcType.VARCHAR) -public class ProjectNodeListTypeHandler extends BaseTypeHandler> { +public class ProjectNodeListTypeHandler extends BaseTypeHandler> { @Override - public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) throws SQLException { + public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) throws SQLException { ps.setString(i, JSONUtil.toJsonStr(parameter)); } @Override - public List getNullableResult(ResultSet rs, String columnName) throws SQLException { + public List getNullableResult(ResultSet rs, String columnName) throws SQLException { return parse(rs.getString(columnName)); } @Override - public List getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + public List getNullableResult(ResultSet rs, int columnIndex) throws SQLException { return parse(rs.getString(columnIndex)); } @Override - public List getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + public List getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { return parse(cs.getString(columnIndex)); } - private List parse(String json) { + private List parse(String json) { if (json == null || json.isEmpty()) { return Collections.emptyList(); } - return JSONUtil.toList(json, EvalProjectNodeItemCO.class); + return JSONUtil.toList(json, ProjectNodeCO.class); } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java index 4f029f7..f0ff866 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java @@ -44,9 +44,9 @@ public class QualFilingPersonnelCertChangeDO extends BaseDO { */ private String certTypeCode; /** - * 证书类型名称 + * 证书等级 */ - private String certTypeName; + private String certLevel; /** * 证书类别编码 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.java index eb02502..dfab3a8 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.java @@ -48,8 +48,8 @@ public class QualFilingPersonnelCertChangeRepositoryImpl extends BaseRepositoryI if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertTypeCode())) { qualFilingPersonnelCertChangeDoQueryWrapper.eq("cert_type_code", qualFilingPersonnelCertChangePageQry.getCertTypeCode()); } - if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertTypeName())) { - qualFilingPersonnelCertChangeDoQueryWrapper.like("cert_type_name", qualFilingPersonnelCertChangePageQry.getCertTypeName()); + if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertLevel())) { + qualFilingPersonnelCertChangeDoQueryWrapper.like("cert_level", qualFilingPersonnelCertChangePageQry.getCertLevel()); } if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertCategoryCode())) { qualFilingPersonnelCertChangeDoQueryWrapper.eq("cert_category_code", qualFilingPersonnelCertChangePageQry.getCertCategoryCode()); diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml index d3c37cf..9a1a7a4 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml @@ -9,7 +9,7 @@ - + @@ -38,7 +38,7 @@ - `id`, `org_id`, `personnel_id`, `cert_name`, `cert_type_code`, `cert_type_name`, `cert_category_code`, `cert_category_name`, `operation_category_code`, `operation_category_name`, `cert_no`, `issue_org`, `valid_start_date`, `valid_end_date`, `review_date`, `cert_attachment_url`, `business_scope`, `professional_capability_code`, `industry_professional_standards_id`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + `id`, `org_id`, `personnel_id`, `cert_name`, `cert_type_code`, `cert_level`, `cert_category_code`, `cert_category_name`, `operation_category_code`, `operation_category_name`, `cert_no`, `issue_org`, `valid_start_date`, `valid_end_date`, `review_date`, `cert_attachment_url`, `business_scope`, `professional_capability_code`, `industry_professional_standards_id`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` @@ -63,7 +63,7 @@ opc.personnel_id, opc.cert_name, opc.cert_type_code, - opc.cert_type_name, + opc.cert_level, opc.cert_category_code, opc.cert_category_name, opc.operation_category_code, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml index 41ad57a..1421115 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml @@ -11,7 +11,7 @@ - + @@ -45,7 +45,7 @@ filing_personnel_id, cert_name, cert_type_code, - cert_type_name, + cert_level, cert_category_code, cert_category_name, operation_category_code, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml index abc54eb..f6ec311 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml @@ -9,7 +9,7 @@ - + @@ -39,7 +39,7 @@ - `id`, `filing_id`, `filing_personnel_id`, `cert_name`, `cert_type_code`, `cert_type_name`, `cert_category_code`, `cert_category_name`, `operation_category_code`, `operation_category_name`, `cert_no`, `issue_org`, `valid_start_date`, `valid_end_date`, `review_date`, `cert_attachment_url`, `source_cert_id`, `business_scope`, `professional_capability_code`, `industry_professional_standards_id`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + `id`, `filing_id`, `filing_personnel_id`, `cert_name`, `cert_type_code`, `cert_level`, `cert_category_code`, `cert_category_name`, `operation_category_code`, `operation_category_name`, `cert_no`, `issue_org`, `valid_start_date`, `valid_end_date`, `review_date`, `cert_attachment_url`, `source_cert_id`, `business_scope`, `professional_capability_code`, `industry_professional_standards_id`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`