dev
parent
fe13c0d57a
commit
75a0658753
|
|
@ -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`)
|
KEY `idx_qual_on_site_review_id` (`qual_on_site_review_id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='资质现场核查-文件信息';
|
) 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;
|
set foreign_key_checks = 1;
|
||||||
|
|
||||||
-- =============================================
|
-- =============================================
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA
|
||||||
QualFilingPersonnelCertEntity entity = new QualFilingPersonnelCertEntity();
|
QualFilingPersonnelCertEntity entity = new QualFilingPersonnelCertEntity();
|
||||||
entity.setCertName(cmd.getCertName());
|
entity.setCertName(cmd.getCertName());
|
||||||
entity.setCertTypeCode(cmd.getCertTypeCode());
|
entity.setCertTypeCode(cmd.getCertTypeCode());
|
||||||
entity.setCertTypeName(cmd.getCertTypeName());
|
entity.setCertLevel(cmd.getCertLevel());
|
||||||
entity.setCertCategoryCode(cmd.getCertCategoryCode());
|
entity.setCertCategoryCode(cmd.getCertCategoryCode());
|
||||||
entity.setCertCategoryName(cmd.getCertCategoryName());
|
entity.setCertCategoryName(cmd.getCertCategoryName());
|
||||||
entity.setOperationCategoryCode(cmd.getOperationCategoryCode());
|
entity.setOperationCategoryCode(cmd.getOperationCategoryCode());
|
||||||
|
|
@ -61,7 +61,7 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA
|
||||||
entity.setId(cmd.getId());
|
entity.setId(cmd.getId());
|
||||||
entity.setCertName(cmd.getCertName());
|
entity.setCertName(cmd.getCertName());
|
||||||
entity.setCertTypeCode(cmd.getCertTypeCode());
|
entity.setCertTypeCode(cmd.getCertTypeCode());
|
||||||
entity.setCertTypeName(cmd.getCertTypeName());
|
entity.setCertLevel(cmd.getCertLevel());
|
||||||
entity.setCertCategoryCode(cmd.getCertCategoryCode());
|
entity.setCertCategoryCode(cmd.getCertCategoryCode());
|
||||||
entity.setCertCategoryName(cmd.getCertCategoryName());
|
entity.setCertCategoryName(cmd.getCertCategoryName());
|
||||||
entity.setOperationCategoryCode(cmd.getOperationCategoryCode());
|
entity.setOperationCategoryCode(cmd.getOperationCategoryCode());
|
||||||
|
|
@ -112,7 +112,7 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA
|
||||||
co.setFilingPersonnelId(entity.getFilingPersonnelId());
|
co.setFilingPersonnelId(entity.getFilingPersonnelId());
|
||||||
co.setCertName(entity.getCertName());
|
co.setCertName(entity.getCertName());
|
||||||
co.setCertTypeCode(entity.getCertTypeCode());
|
co.setCertTypeCode(entity.getCertTypeCode());
|
||||||
co.setCertTypeName(entity.getCertTypeName());
|
co.setCertLevel(entity.getCertLevel());
|
||||||
co.setCertCategoryCode(entity.getCertCategoryCode());
|
co.setCertCategoryCode(entity.getCertCategoryCode());
|
||||||
co.setCertCategoryName(entity.getCertCategoryName());
|
co.setCertCategoryName(entity.getCertCategoryName());
|
||||||
co.setOperationCategoryCode(entity.getOperationCategoryCode());
|
co.setOperationCategoryCode(entity.getOperationCategoryCode());
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ public class QualFilingOrgPersonnelImporter {
|
||||||
entity.setSourceCertId(source.getId());
|
entity.setSourceCertId(source.getId());
|
||||||
entity.setCertName(source.getCertName());
|
entity.setCertName(source.getCertName());
|
||||||
entity.setCertTypeCode(source.getCertTypeCode());
|
entity.setCertTypeCode(source.getCertTypeCode());
|
||||||
entity.setCertTypeName(source.getCertTypeName());
|
entity.setCertLevel(source.getCertLevel());
|
||||||
entity.setCertCategoryCode(source.getCertCategoryCode());
|
entity.setCertCategoryCode(source.getCertCategoryCode());
|
||||||
entity.setCertCategoryName(source.getCertCategoryName());
|
entity.setCertCategoryName(source.getCertCategoryName());
|
||||||
entity.setOperationCategoryCode(source.getOperationCategoryCode());
|
entity.setOperationCategoryCode(source.getOperationCategoryCode());
|
||||||
|
|
|
||||||
|
|
@ -43,11 +43,11 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable {
|
||||||
@Size(max = 512, message = "证书类型编码不能超过512个字符")
|
@Size(max = 512, message = "证书类型编码不能超过512个字符")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
/**
|
/**
|
||||||
* 证书类型名称
|
* 证书等级
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
@Size(max = 128, message = "证书类型名称不能超过128个字符")
|
@Size(max = 128, message = "证书等级不能超过128个字符")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
/**
|
/**
|
||||||
* 证书类别编码
|
* 证书类别编码
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -37,10 +37,10 @@ public class QualFilingPersonnelCertChangePageQry extends PageQuery {
|
||||||
@ApiModelProperty(value = "证书类型编码")
|
@ApiModelProperty(value = "证书类型编码")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
/**
|
/**
|
||||||
* 证书类型名称
|
* 证书等级
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
/**
|
/**
|
||||||
* 证书类别编码
|
* 证书类别编码
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -42,10 +42,10 @@ public class QualFilingPersonnelCertChangeUpdateCmd implements Serializable {
|
||||||
@ApiModelProperty(value = "证书类型编码")
|
@ApiModelProperty(value = "证书类型编码")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
/**
|
/**
|
||||||
* 证书类型名称
|
* 证书等级
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
/**
|
/**
|
||||||
* 证书类别编码
|
* 证书类别编码
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -39,10 +39,10 @@ public class QualFilingPersonnelCertChangeCo extends ClientObject {
|
||||||
@ApiModelProperty(value = "证书类型编码")
|
@ApiModelProperty(value = "证书类型编码")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
/**
|
/**
|
||||||
* 证书类型名称
|
* 证书等级
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
/**
|
/**
|
||||||
* 证书类别编码
|
* 证书类别编码
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,8 @@ public class OrgPersonnelCertCO {
|
||||||
@ApiModelProperty(value = "证书类型编码")
|
@ApiModelProperty(value = "证书类型编码")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书分类编码")
|
@ApiModelProperty(value = "证书分类编码")
|
||||||
private String certCategoryCode;
|
private String certCategoryCode;
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ public class QualFilingPersonnelCertCO {
|
||||||
@ApiModelProperty(value = "证书类型编码")
|
@ApiModelProperty(value = "证书类型编码")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书分类编码")
|
@ApiModelProperty(value = "证书分类编码")
|
||||||
private String certCategoryCode;
|
private String certCategoryCode;
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,9 @@ public class OrgPersonnelCertAddCmd {
|
||||||
@Size(max = 32, message = "证书类型编码不能超过32个字符")
|
@Size(max = 32, message = "证书类型编码不能超过32个字符")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
@Size(max = 50, message = "证书类型名称不能超过50个字符")
|
@Size(max = 50, message = "证书等级不能超过50个字符")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类别编码")
|
@ApiModelProperty(value = "证书类别编码")
|
||||||
@Size(max = 32, message = "证书类别编码不能超过32个字符")
|
@Size(max = 32, message = "证书类别编码不能超过32个字符")
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,9 @@ public class OrgPersonnelCertModifyCmd {
|
||||||
@Size(max = 32, message = "证书类型编码不能超过32个字符")
|
@Size(max = 32, message = "证书类型编码不能超过32个字符")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
@Size(max = 50, message = "证书类型名称不能超过50个字符")
|
@Size(max = 50, message = "证书等级不能超过50个字符")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类别编码")
|
@ApiModelProperty(value = "证书类别编码")
|
||||||
@Size(max = 32, message = "证书类别编码不能超过32个字符")
|
@Size(max = 32, message = "证书类别编码不能超过32个字符")
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@ public class QualFilingPersonnelCertAddCmd {
|
||||||
@ApiModelProperty(value = "证书类型编码")
|
@ApiModelProperty(value = "证书类型编码")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类别编码")
|
@ApiModelProperty(value = "证书类别编码")
|
||||||
private String certCategoryCode;
|
private String certCategoryCode;
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,8 @@ public class QualFilingPersonnelCertModifyCmd {
|
||||||
@ApiModelProperty(value = "证书类型编码")
|
@ApiModelProperty(value = "证书类型编码")
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书等级")
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
|
|
||||||
@ApiModelProperty(value = "证书类别编码")
|
@ApiModelProperty(value = "证书类别编码")
|
||||||
private String certCategoryCode;
|
private String certCategoryCode;
|
||||||
|
|
|
||||||
|
|
@ -39,9 +39,9 @@ public class QualFilingPersonnelCertChangeE extends BaseE {
|
||||||
*/
|
*/
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
/**
|
/**
|
||||||
* 证书类型名称
|
* 证书等级
|
||||||
*/
|
*/
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
/**
|
/**
|
||||||
* 证书类别编码
|
* 证书类别编码
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
}
|
||||||
|
|
@ -8,7 +8,6 @@ import java.util.Objects;
|
||||||
public enum CertTypeCodeEnum {
|
public enum CertTypeCodeEnum {
|
||||||
|
|
||||||
REGISTERED_SAFETY_ENGINEER("注册安全工程师"),
|
REGISTERED_SAFETY_ENGINEER("注册安全工程师"),
|
||||||
SENIOR_ENGINEER("高工"),
|
|
||||||
EVALUATOR("评价师"),
|
EVALUATOR("评价师"),
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ public class OrgPersonnelCertEntity {
|
||||||
/** 证书类型编码 */
|
/** 证书类型编码 */
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
|
|
||||||
/** 证书类型名称 */
|
/** 证书等级 */
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
|
|
||||||
/** 证书类别编码 */
|
/** 证书类别编码 */
|
||||||
private String certCategoryCode;
|
private String certCategoryCode;
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@ public class QualFilingPersonnelCertEntity {
|
||||||
/** 证书类型编码 */
|
/** 证书类型编码 */
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
|
|
||||||
/** 证书类型名称 */
|
/** 证书等级 */
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
|
|
||||||
/** 证书类别编码 */
|
/** 证书类别编码 */
|
||||||
private String certCategoryCode;
|
private String certCategoryCode;
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ public class OrgPersonnelCertDO {
|
||||||
private Long personnelId;
|
private Long personnelId;
|
||||||
private String certName;
|
private String certName;
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
private String certCategoryCode;
|
private String certCategoryCode;
|
||||||
private String certCategoryName;
|
private String certCategoryName;
|
||||||
private String operationCategoryCode;
|
private String operationCategoryCode;
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ public class QualFilingPersonnelCertDO {
|
||||||
private Long filingPersonnelId;
|
private Long filingPersonnelId;
|
||||||
private String certName;
|
private String certName;
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
private String certCategoryCode;
|
private String certCategoryCode;
|
||||||
private String certCategoryName;
|
private String certCategoryName;
|
||||||
private String operationCategoryCode;
|
private String operationCategoryCode;
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ public class QualFilingPersonnelCertGatewayImpl implements QualFilingPersonnelCe
|
||||||
dataObject.setFilingPersonnelId(entity.getFilingPersonnelId());
|
dataObject.setFilingPersonnelId(entity.getFilingPersonnelId());
|
||||||
dataObject.setCertName(entity.getCertName());
|
dataObject.setCertName(entity.getCertName());
|
||||||
dataObject.setCertTypeCode(entity.getCertTypeCode());
|
dataObject.setCertTypeCode(entity.getCertTypeCode());
|
||||||
dataObject.setCertTypeName(entity.getCertTypeName());
|
dataObject.setCertLevel(entity.getCertLevel());
|
||||||
dataObject.setCertCategoryCode(entity.getCertCategoryCode());
|
dataObject.setCertCategoryCode(entity.getCertCategoryCode());
|
||||||
dataObject.setCertCategoryName(entity.getCertCategoryName());
|
dataObject.setCertCategoryName(entity.getCertCategoryName());
|
||||||
dataObject.setOperationCategoryCode(entity.getOperationCategoryCode());
|
dataObject.setOperationCategoryCode(entity.getOperationCategoryCode());
|
||||||
|
|
@ -130,7 +130,7 @@ public class QualFilingPersonnelCertGatewayImpl implements QualFilingPersonnelCe
|
||||||
entity.setFilingPersonnelId(dataObject.getFilingPersonnelId());
|
entity.setFilingPersonnelId(dataObject.getFilingPersonnelId());
|
||||||
entity.setCertName(dataObject.getCertName());
|
entity.setCertName(dataObject.getCertName());
|
||||||
entity.setCertTypeCode(dataObject.getCertTypeCode());
|
entity.setCertTypeCode(dataObject.getCertTypeCode());
|
||||||
entity.setCertTypeName(dataObject.getCertTypeName());
|
entity.setCertLevel(dataObject.getCertLevel());
|
||||||
entity.setCertCategoryCode(dataObject.getCertCategoryCode());
|
entity.setCertCategoryCode(dataObject.getCertCategoryCode());
|
||||||
entity.setCertCategoryName(dataObject.getCertCategoryName());
|
entity.setCertCategoryName(dataObject.getCertCategoryName());
|
||||||
entity.setOperationCategoryCode(dataObject.getOperationCategoryCode());
|
entity.setOperationCategoryCode(dataObject.getOperationCategoryCode());
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
package org.qinan.safetyeval.infrastructure.handler;
|
package org.qinan.safetyeval.infrastructure.handler;
|
||||||
|
|
||||||
import cn.hutool.json.JSONUtil;
|
import cn.hutool.json.JSONUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
|
||||||
import org.apache.ibatis.type.BaseTypeHandler;
|
import org.apache.ibatis.type.BaseTypeHandler;
|
||||||
import org.apache.ibatis.type.JdbcType;
|
import org.apache.ibatis.type.JdbcType;
|
||||||
import org.apache.ibatis.type.MappedJdbcTypes;
|
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.CallableStatement;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
|
|
@ -15,40 +14,40 @@ import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MyBatis TypeHandler: 在数据库的 varchar/text 列中以 JSON 数组字符串形式存储 List<EvalProjectNodeItemCO>。
|
* MyBatis TypeHandler: 在数据库的 varchar/text 列中以 JSON 数组字符串形式存储 List<ProjectNodeCO>。
|
||||||
* <p>
|
* <p>
|
||||||
* 入库: List<EvalProjectNodeItemCO> -> JSON.toJSONString -> String
|
* 入库: List<ProjectNodeCO> -> JSON.toJSONString -> String
|
||||||
* 出库: String -> JSON.parseArray -> List<EvalProjectNodeItemCO>
|
* 出库: String -> JSON.parseArray -> List<ProjectNodeCO>
|
||||||
*
|
*
|
||||||
* @author safety-eval
|
* @author safety-eval
|
||||||
*/
|
*/
|
||||||
@MappedJdbcTypes(JdbcType.VARCHAR)
|
@MappedJdbcTypes(JdbcType.VARCHAR)
|
||||||
public class ProjectNodeListTypeHandler extends BaseTypeHandler<List<EvalProjectNodeItemCO>> {
|
public class ProjectNodeListTypeHandler extends BaseTypeHandler<List<ProjectNodeCO>> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setNonNullParameter(PreparedStatement ps, int i, List<EvalProjectNodeItemCO> parameter, JdbcType jdbcType) throws SQLException {
|
public void setNonNullParameter(PreparedStatement ps, int i, List<ProjectNodeCO> parameter, JdbcType jdbcType) throws SQLException {
|
||||||
ps.setString(i, JSONUtil.toJsonStr(parameter));
|
ps.setString(i, JSONUtil.toJsonStr(parameter));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<EvalProjectNodeItemCO> getNullableResult(ResultSet rs, String columnName) throws SQLException {
|
public List<ProjectNodeCO> getNullableResult(ResultSet rs, String columnName) throws SQLException {
|
||||||
return parse(rs.getString(columnName));
|
return parse(rs.getString(columnName));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<EvalProjectNodeItemCO> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
|
public List<ProjectNodeCO> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
|
||||||
return parse(rs.getString(columnIndex));
|
return parse(rs.getString(columnIndex));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<EvalProjectNodeItemCO> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
|
public List<ProjectNodeCO> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
|
||||||
return parse(cs.getString(columnIndex));
|
return parse(cs.getString(columnIndex));
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<EvalProjectNodeItemCO> parse(String json) {
|
private List<ProjectNodeCO> parse(String json) {
|
||||||
if (json == null || json.isEmpty()) {
|
if (json == null || json.isEmpty()) {
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
return JSONUtil.toList(json, EvalProjectNodeItemCO.class);
|
return JSONUtil.toList(json, ProjectNodeCO.class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,9 +44,9 @@ public class QualFilingPersonnelCertChangeDO extends BaseDO {
|
||||||
*/
|
*/
|
||||||
private String certTypeCode;
|
private String certTypeCode;
|
||||||
/**
|
/**
|
||||||
* 证书类型名称
|
* 证书等级
|
||||||
*/
|
*/
|
||||||
private String certTypeName;
|
private String certLevel;
|
||||||
/**
|
/**
|
||||||
* 证书类别编码
|
* 证书类别编码
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -48,8 +48,8 @@ public class QualFilingPersonnelCertChangeRepositoryImpl extends BaseRepositoryI
|
||||||
if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertTypeCode())) {
|
if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertTypeCode())) {
|
||||||
qualFilingPersonnelCertChangeDoQueryWrapper.eq("cert_type_code", qualFilingPersonnelCertChangePageQry.getCertTypeCode());
|
qualFilingPersonnelCertChangeDoQueryWrapper.eq("cert_type_code", qualFilingPersonnelCertChangePageQry.getCertTypeCode());
|
||||||
}
|
}
|
||||||
if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertTypeName())) {
|
if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertLevel())) {
|
||||||
qualFilingPersonnelCertChangeDoQueryWrapper.like("cert_type_name", qualFilingPersonnelCertChangePageQry.getCertTypeName());
|
qualFilingPersonnelCertChangeDoQueryWrapper.like("cert_level", qualFilingPersonnelCertChangePageQry.getCertLevel());
|
||||||
}
|
}
|
||||||
if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertCategoryCode())) {
|
if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getCertCategoryCode())) {
|
||||||
qualFilingPersonnelCertChangeDoQueryWrapper.eq("cert_category_code", qualFilingPersonnelCertChangePageQry.getCertCategoryCode());
|
qualFilingPersonnelCertChangeDoQueryWrapper.eq("cert_category_code", qualFilingPersonnelCertChangePageQry.getCertCategoryCode());
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<result column="personnel_id" property="personnelId"/>
|
<result column="personnel_id" property="personnelId"/>
|
||||||
<result column="cert_name" property="certName"/>
|
<result column="cert_name" property="certName"/>
|
||||||
<result column="cert_type_code" property="certTypeCode"/>
|
<result column="cert_type_code" property="certTypeCode"/>
|
||||||
<result column="cert_type_name" property="certTypeName"/>
|
<result column="cert_level" property="certLevel"/>
|
||||||
<result column="cert_category_code" property="certCategoryCode"/>
|
<result column="cert_category_code" property="certCategoryCode"/>
|
||||||
<result column="cert_category_name" property="certCategoryName"/>
|
<result column="cert_category_name" property="certCategoryName"/>
|
||||||
<result column="operation_category_code" property="operationCategoryCode"/>
|
<result column="operation_category_code" property="operationCategoryCode"/>
|
||||||
|
|
@ -38,7 +38,7 @@
|
||||||
|
|
||||||
<!-- 通用查询结果列 -->
|
<!-- 通用查询结果列 -->
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
`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`
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<!-- 根据人员id列表查询证书专业能力信息 -->
|
<!-- 根据人员id列表查询证书专业能力信息 -->
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
opc.personnel_id,
|
opc.personnel_id,
|
||||||
opc.cert_name,
|
opc.cert_name,
|
||||||
opc.cert_type_code,
|
opc.cert_type_code,
|
||||||
opc.cert_type_name,
|
opc.cert_level,
|
||||||
opc.cert_category_code,
|
opc.cert_category_code,
|
||||||
opc.cert_category_name,
|
opc.cert_category_name,
|
||||||
opc.operation_category_code,
|
opc.operation_category_code,
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
<result property="filingPersonnelId" column="filing_personnel_id"/>
|
<result property="filingPersonnelId" column="filing_personnel_id"/>
|
||||||
<result property="certName" column="cert_name"/>
|
<result property="certName" column="cert_name"/>
|
||||||
<result property="certTypeCode" column="cert_type_code"/>
|
<result property="certTypeCode" column="cert_type_code"/>
|
||||||
<result property="certTypeName" column="cert_type_name"/>
|
<result property="certLevel" column="cert_level"/>
|
||||||
<result property="certCategoryCode" column="cert_category_code"/>
|
<result property="certCategoryCode" column="cert_category_code"/>
|
||||||
<result property="certCategoryName" column="cert_category_name"/>
|
<result property="certCategoryName" column="cert_category_name"/>
|
||||||
<result property="operationCategoryCode" column="operation_category_code"/>
|
<result property="operationCategoryCode" column="operation_category_code"/>
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
filing_personnel_id,
|
filing_personnel_id,
|
||||||
cert_name,
|
cert_name,
|
||||||
cert_type_code,
|
cert_type_code,
|
||||||
cert_type_name,
|
cert_level,
|
||||||
cert_category_code,
|
cert_category_code,
|
||||||
cert_category_name,
|
cert_category_name,
|
||||||
operation_category_code,
|
operation_category_code,
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<result column="filing_personnel_id" property="filingPersonnelId"/>
|
<result column="filing_personnel_id" property="filingPersonnelId"/>
|
||||||
<result column="cert_name" property="certName"/>
|
<result column="cert_name" property="certName"/>
|
||||||
<result column="cert_type_code" property="certTypeCode"/>
|
<result column="cert_type_code" property="certTypeCode"/>
|
||||||
<result column="cert_type_name" property="certTypeName"/>
|
<result column="cert_level" property="certLevel"/>
|
||||||
<result column="cert_category_code" property="certCategoryCode"/>
|
<result column="cert_category_code" property="certCategoryCode"/>
|
||||||
<result column="cert_category_name" property="certCategoryName"/>
|
<result column="cert_category_name" property="certCategoryName"/>
|
||||||
<result column="operation_category_code" property="operationCategoryCode"/>
|
<result column="operation_category_code" property="operationCategoryCode"/>
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
|
|
||||||
<!-- 通用查询结果列 -->
|
<!-- 通用查询结果列 -->
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
`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`
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue