dev
luotaiqian 2026-07-14 18:16:02 +08:00
parent 0c961326dd
commit bab04be9f7
27 changed files with 130 additions and 26 deletions

View File

@ -0,0 +1,65 @@
-- 安全评价机构业务范围与专业能力配备标准 数据初始化
-- 行业code参照 IndustryEnum 枚举专业能力code参照 ProfessionalCapabilityEnum 枚举
-- 专业能力配备标准拆解为单条记录,每条记录对应一个专业能力及人员数量要求
INSERT INTO `industry_professional_standards`
(`id`, `industry_code`, `professional_capability_code`, `professional_capability_name`, `person_num`, `delete_enum`, `tenant_id`, `version`, `create_time`, `update_time`, `env`)
VALUES
-- ========== 煤炭开采业 (COAL_MINING) ==========
(1, 'COAL_MINING', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(2, 'COAL_MINING', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(3, 'COAL_MINING', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(4, 'COAL_MINING', 'MINING', '采矿', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(5, 'COAL_MINING', 'VENTILATION', '通风', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(6, 'COAL_MINING', 'GEOLOGY', '地质', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(7, 'COAL_MINING', 'MINE_CONSTRUCTION', '矿建', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
-- ========== 金属、非金属矿及其他矿采选业 (METAL_NONMETAL_MINING) ==========
(8, 'METAL_NONMETAL_MINING', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(9, 'METAL_NONMETAL_MINING', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(10, 'METAL_NONMETAL_MINING', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(11, 'METAL_NONMETAL_MINING', 'MINING', '采矿', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(12, 'METAL_NONMETAL_MINING', 'VENTILATION', '通风', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(13, 'METAL_NONMETAL_MINING', 'GEOLOGY', '地质', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(14, 'METAL_NONMETAL_MINING', 'HYDRAULIC_STRUCTURE', '水工结构', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
-- ========== 陆地石油和天然气开采业 (ONSHORE_OIL_GAS) ==========
(15, 'ONSHORE_OIL_GAS', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(16, 'ONSHORE_OIL_GAS', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(17, 'ONSHORE_OIL_GAS', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(18, 'ONSHORE_OIL_GAS', 'OIL_PRODUCTION', '采油', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(19, 'ONSHORE_OIL_GAS', 'STORAGE_AND_TRANSPORT', '储运', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
-- ========== 陆上油气管道运输业 (ONSHORE_OIL_GAS_PIPELINE) ==========
(20, 'ONSHORE_OIL_GAS_PIPELINE', 'OIL_GAS_STORAGE_TRANSPORT', '油气储运', 2, 'false', NULL, 0, NOW(), NOW(), NULL),
(21, 'ONSHORE_OIL_GAS_PIPELINE', 'EQUIPMENT', '设备', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(22, 'ONSHORE_OIL_GAS_PIPELINE', 'INSTRUMENT', '仪表', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(23, 'ONSHORE_OIL_GAS_PIPELINE', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(24, 'ONSHORE_OIL_GAS_PIPELINE', 'ANTICORROSION', '防腐', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(25, 'ONSHORE_OIL_GAS_PIPELINE', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
-- ========== 石油加工业,化学原料、化学品及医药制造业 (PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL) ==========
(26, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'CHEMICAL_PROCESS', '化工工艺', 2, 'false', NULL, 0, NOW(), NOW(), NULL),
(27, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'CHEMICAL_MECHANICAL', '化工机械', 2, 'false', NULL, 0, NOW(), NOW(), NULL),
(28, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'INSTRUMENT_AUTOMATION', '仪表自动化', 2, 'false', NULL, 0, NOW(), NOW(), NULL),
(29, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'ELECTRICAL', '电气', 2, 'false', NULL, 0, NOW(), NOW(), NULL),
(30, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'SAFETY', '安全', 2, 'false', NULL, 0, NOW(), NOW(), NULL),
-- ========== 烟花爆竹制造业和仓储业 (FIREWORKS_FIRECRACKERS) ==========
(31, 'FIREWORKS_FIRECRACKERS', 'EXPLOSIVES', '火炸药(爆炸技术)', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(32, 'FIREWORKS_FIRECRACKERS', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(33, 'FIREWORKS_FIRECRACKERS', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(34, 'FIREWORKS_FIRECRACKERS', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
-- ========== 金属冶炼 (METAL_SMELTING) ==========
(35, 'METAL_SMELTING', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(36, 'METAL_SMELTING', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(37, 'METAL_SMELTING', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(38, 'METAL_SMELTING', 'METALLURGY', '冶金', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
(39, 'METAL_SMELTING', 'NONFERROUS_METAL', '有色金属', 1, 'false', NULL, 0, NOW(), NOW(), NULL),
-- ========== 民用爆炸物品行业 (CIVIL_EXPLOSIVES) ==========
(40, 'CIVIL_EXPLOSIVES', 'EXPLOSIVES', '火炸药(爆炸技术)', 10, 'false', NULL, 0, NOW(), NOW(), NULL),
(41, 'CIVIL_EXPLOSIVES', 'MECHANICAL', '机械', 2, 'false', NULL, 0, NOW(), NOW(), NULL),
(42, 'CIVIL_EXPLOSIVES', 'ELECTRICAL', '电气', 2, 'false', NULL, 0, NOW(), NOW(), NULL),
(43, 'CIVIL_EXPLOSIVES', 'SAFETY', '安全', 2, 'false', NULL, 0, NOW(), NOW(), NULL);

View File

@ -20,7 +20,7 @@ import java.io.Serializable;
* *
* *
* @Author: ltq * @Author: ltq
* @Date: 2026-07-14 18:05:26 * @Date: 2026-07-14 18:07:00
*/ */
@RestController @RestController
@AllArgsConstructor @AllArgsConstructor

View File

@ -10,7 +10,7 @@ import org.qinan.safetyeval.domain.standards.model.IndustryProfessionalStandards
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Mapper(componentModel = "spring") @Mapper(componentModel = "spring")
public interface IndustryProfessionalStandardsCmdConvertor { public interface IndustryProfessionalStandardsCmdConvertor {

View File

@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
* *
* *
* @author ltq * @author ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Component @Component
@AllArgsConstructor @AllArgsConstructor

View File

@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
* *
* *
* @author ltq * @author ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Component @Component
@AllArgsConstructor @AllArgsConstructor

View File

@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
* *
* *
* @author ltq * @author ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Component @Component
@AllArgsConstructor @AllArgsConstructor

View File

@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
* *
* *
* @author ltq * @author ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Component @Component
@AllArgsConstructor @AllArgsConstructor

View File

@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
* *
* *
* @author ltq * @author ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Component @Component
@AllArgsConstructor @AllArgsConstructor

View File

@ -10,7 +10,7 @@ import org.qinan.safetyeval.client.standards.response.IndustryProfessionalStanda
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
public interface IndustryProfessionalStandardsServiceI { public interface IndustryProfessionalStandardsServiceI {
/** /**

View File

@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor

View File

@ -4,13 +4,14 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
/** /**
* Cmd * Cmd
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Data @Data
public class IndustryProfessionalStandardsAddCmd implements Serializable { public class IndustryProfessionalStandardsAddCmd implements Serializable {
@ -33,6 +34,12 @@ public class IndustryProfessionalStandardsAddCmd implements Serializable {
*/ */
@ApiModelProperty(value = "专业能力名称") @ApiModelProperty(value = "专业能力名称")
private String professionalCapabilityName; private String professionalCapabilityName;
/**
*
*/
@ApiModelProperty(value = "人员数量要求", required = true)
@NotNull(message = "人员数量要求不能为空")
private Long personNum;
/** /**
* *
*/ */

View File

@ -8,7 +8,7 @@ import lombok.Data;
* Qry * Qry
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Data @Data
public class IndustryProfessionalStandardsPageQry extends PageQuery { public class IndustryProfessionalStandardsPageQry extends PageQuery {
@ -29,6 +29,11 @@ public class IndustryProfessionalStandardsPageQry extends PageQuery {
*/ */
@ApiModelProperty(value = "专业能力名称") @ApiModelProperty(value = "专业能力名称")
private String professionalCapabilityName; private String professionalCapabilityName;
/**
*
*/
@ApiModelProperty(value = "人员数量要求")
private Long personNum;
/** /**
* *
*/ */

View File

@ -12,7 +12,7 @@ import java.io.Serializable;
* Cmd * Cmd
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Data @Data
public class IndustryProfessionalStandardsUpdateCmd implements Serializable { public class IndustryProfessionalStandardsUpdateCmd implements Serializable {
@ -36,6 +36,12 @@ public class IndustryProfessionalStandardsUpdateCmd implements Serializable {
*/ */
@ApiModelProperty(value = "专业能力名称") @ApiModelProperty(value = "专业能力名称")
private String professionalCapabilityName; private String professionalCapabilityName;
/**
*
*/
@ApiModelProperty(value = "人员数量要求", required = true)
@NotNull(message = "人员数量要求不能为空")
private Long personNum;
/** /**
* *
*/ */

View File

@ -9,7 +9,7 @@ import lombok.Data;
* Co * Co
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Data @Data
public class IndustryProfessionalStandardsCo extends ClientObject { public class IndustryProfessionalStandardsCo extends ClientObject {
@ -31,6 +31,11 @@ public class IndustryProfessionalStandardsCo extends ClientObject {
*/ */
@ApiModelProperty(value = "专业能力名称") @ApiModelProperty(value = "专业能力名称")
private String professionalCapabilityName; private String professionalCapabilityName;
/**
*
*/
@ApiModelProperty(value = "人员数量要求")
private Long personNum;
/** /**
* *
*/ */

View File

@ -10,14 +10,15 @@ public enum IndustryEnum {
ONSHORE_OIL_GAS("ONSHORE_OIL_GAS", "陆地石油和天然气开采业"), ONSHORE_OIL_GAS("ONSHORE_OIL_GAS", "陆地石油和天然气开采业"),
ONSHORE_OIL_GAS_PIPELINE("ONSHORE_OIL_GAS_PIPELINE", "陆上油气管道运输业"), ONSHORE_OIL_GAS_PIPELINE("ONSHORE_OIL_GAS_PIPELINE", "陆上油气管道运输业"),
PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL("PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL", "石油加工业,化学原料、化学品及医药制造业"), PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL("PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL", "石油加工业,化学原料、化学品及医药制造业"),
FIREWORKS_FIRECRACKERS("FIREWORKS_FIRECRACKERS", "烟花爆竹制造业"), FIREWORKS_FIRECRACKERS("FIREWORKS_FIRECRACKERS", "烟花爆竹制造业和仓储业"),
METAL_SMELTING("METAL_SMELTING", "金属冶炼"), METAL_SMELTING("METAL_SMELTING", "金属冶炼"),
CIVIL_EXPLOSIVES("CIVIL_EXPLOSIVES", "民用爆炸物品行业"),
; ;
private final String code; private final String code;
private final String value; private final String value;
public static final String REMARKS = "行业类型枚举=COAL_MINING:煤炭开采业,METAL_NONMETAL_MINING:金属、非金属矿及其他矿采选业" + public static final String REMARKS = "行业类型枚举=COAL_MINING:煤炭开采业,METAL_NONMETAL_MINING:金属、非金属矿及其他矿采选业" +
",ONSHORE_OIL_GAS:陆地石油和天然气开采业,ONSHORE_OIL_GAS_PIPELINE:陆上油气管道运输业,PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL:石油加工业,化学原料、化学品及医药制造业,FIREWORKS_FIRECRACKERS:烟花爆竹制造业,METAL_SMELTING:金属冶炼"; ",ONSHORE_OIL_GAS:陆地石油和天然气开采业,ONSHORE_OIL_GAS_PIPELINE:陆上油气管道运输业,PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL:石油加工业,化学原料、化学品及医药制造业,FIREWORKS_FIRECRACKERS:烟花爆竹制造业和仓储业,METAL_SMELTING:金属冶炼,CIVIL_EXPLOSIVES:民用爆炸物品行业";
IndustryEnum(String code, String value) { IndustryEnum(String code, String value) {
this.code = code; this.code = code;

View File

@ -26,6 +26,8 @@ public enum ProfessionalCapabilityEnum {
EXPLOSION_TECHNOLOGY("EXPLOSION_TECHNOLOGY", "爆炸技术"), EXPLOSION_TECHNOLOGY("EXPLOSION_TECHNOLOGY", "爆炸技术"),
METALLURGY("METALLURGY", "冶金"), METALLURGY("METALLURGY", "冶金"),
NONFERROUS_METAL("NONFERROUS_METAL", "有色金属"), NONFERROUS_METAL("NONFERROUS_METAL", "有色金属"),
EQUIPMENT("EQUIPMENT", "设备"),
INSTRUMENT("INSTRUMENT", "仪表"),
; ;
private final String code; private final String code;
@ -35,7 +37,7 @@ public enum ProfessionalCapabilityEnum {
"MINE_CONSTRUCTION:矿建,GEOLOGY:地质,HYDRAULIC_STRUCTURE:水工结构,OIL_PRODUCTION:采油,STORAGE_AND_TRANSPORT:储运" + "MINE_CONSTRUCTION:矿建,GEOLOGY:地质,HYDRAULIC_STRUCTURE:水工结构,OIL_PRODUCTION:采油,STORAGE_AND_TRANSPORT:储运" +
",OIL_GAS_STORAGE_TRANSPORT:油气储运,PROCESS_EQUIPMENT_CONTROL:工艺设备与控制,AUTOMATION_INSTRUMENT:自动化(仪表)" + ",OIL_GAS_STORAGE_TRANSPORT:油气储运,PROCESS_EQUIPMENT_CONTROL:工艺设备与控制,AUTOMATION_INSTRUMENT:自动化(仪表)" +
",ANTICORROSION:防腐,CHEMICAL_PROCESS:化工工艺,CHEMICAL_MECHANICAL:化工机械,AUTOMATION:自动化,EXPLOSIVES:火炸药" + ",ANTICORROSION:防腐,CHEMICAL_PROCESS:化工工艺,CHEMICAL_MECHANICAL:化工机械,AUTOMATION:自动化,EXPLOSIVES:火炸药" +
",EXPLOSION_TECHNOLOGY:爆炸技术,METALLURGY:冶金,NONFERROUS_METAL:有色金属"; ",EXPLOSION_TECHNOLOGY:爆炸技术,METALLURGY:冶金,NONFERROUS_METAL:有色金属,EQUIPMENT:设备,INSTRUMENT:仪表";
ProfessionalCapabilityEnum(String code, String value) { ProfessionalCapabilityEnum(String code, String value) {
this.code = code; this.code = code;

View File

@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor

View File

@ -12,7 +12,7 @@ import org.qinan.safetyeval.domain.standards.gateway.IndustryProfessionalStandar
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Data @Data
@Entity @Entity
@ -32,6 +32,10 @@ public class IndustryProfessionalStandardsE extends BaseE {
* *
*/ */
private String professionalCapabilityName; private String professionalCapabilityName;
/**
*
*/
private Long personNum;
/** /**
* *
*/ */

View File

@ -13,7 +13,7 @@ import java.util.List;
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Mapper(componentModel = "spring") @Mapper(componentModel = "spring")
public interface IndustryProfessionalStandardsDoConvertor { public interface IndustryProfessionalStandardsDoConvertor {

View File

@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor

View File

@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -29,6 +29,10 @@ public class IndustryProfessionalStandardsDO extends BaseDO {
* *
*/ */
private String professionalCapabilityName; private String professionalCapabilityName;
/**
*
*/
private Long personNum;
/** /**
* *
*/ */

View File

@ -8,7 +8,7 @@ import org.qinan.safetyeval.infrastructure.persistence.domainobject.IndustryProf
* Mapper * Mapper
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Mapper @Mapper
public interface IndustryProfessionalStandardsMapper extends BaseMapper<IndustryProfessionalStandardsDO> { public interface IndustryProfessionalStandardsMapper extends BaseMapper<IndustryProfessionalStandardsDO> {

View File

@ -9,7 +9,7 @@ import org.qinan.safetyeval.infrastructure.persistence.domainobject.IndustryProf
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
public interface IndustryProfessionalStandardsQueryService { public interface IndustryProfessionalStandardsQueryService {

View File

@ -18,7 +18,7 @@ import java.util.List;
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor

View File

@ -9,7 +9,7 @@ import org.qinan.safetyeval.infrastructure.persistence.domainobject.IndustryProf
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
public interface IndustryProfessionalStandardsRepository extends BaseRepository<IndustryProfessionalStandardsDO> { public interface IndustryProfessionalStandardsRepository extends BaseRepository<IndustryProfessionalStandardsDO> {
/** /**

View File

@ -18,7 +18,7 @@ import java.util.Arrays;
* *
* *
* @Author: ltq * @Author: ltq
* @date 2026-07-14 18:05:26 * @date 2026-07-14 18:07:00
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
@ -43,6 +43,9 @@ public class IndustryProfessionalStandardsRepositoryImpl extends BaseRepositoryI
if (ObjectUtil.isNotEmpty(industryProfessionalStandardsPageQry.getProfessionalCapabilityName())) { if (ObjectUtil.isNotEmpty(industryProfessionalStandardsPageQry.getProfessionalCapabilityName())) {
industryProfessionalStandardsDoQueryWrapper.like("professional_capability_name", industryProfessionalStandardsPageQry.getProfessionalCapabilityName()); industryProfessionalStandardsDoQueryWrapper.like("professional_capability_name", industryProfessionalStandardsPageQry.getProfessionalCapabilityName());
} }
if (ObjectUtil.isNotEmpty(industryProfessionalStandardsPageQry.getPersonNum())) {
industryProfessionalStandardsDoQueryWrapper.eq("person_num", industryProfessionalStandardsPageQry.getPersonNum());
}
if (ObjectUtil.isNotEmpty(industryProfessionalStandardsPageQry.getEnv())) { if (ObjectUtil.isNotEmpty(industryProfessionalStandardsPageQry.getEnv())) {
industryProfessionalStandardsDoQueryWrapper.eq("env", industryProfessionalStandardsPageQry.getEnv()); industryProfessionalStandardsDoQueryWrapper.eq("env", industryProfessionalStandardsPageQry.getEnv());
} }

View File

@ -9,6 +9,7 @@
<result property="industryCode" column="industry_code"/> <result property="industryCode" column="industry_code"/>
<result property="professionalCapabilityCode" column="professional_capability_code"/> <result property="professionalCapabilityCode" column="professional_capability_code"/>
<result property="professionalCapabilityName" column="professional_capability_name"/> <result property="professionalCapabilityName" column="professional_capability_name"/>
<result property="personNum" column="person_num"/>
<result property="deleteEnum" column="delete_enum"/> <result property="deleteEnum" column="delete_enum"/>
<result property="remarks" column="remarks"/> <result property="remarks" column="remarks"/>
<result property="createName" column="create_name"/> <result property="createName" column="create_name"/>
@ -28,6 +29,7 @@
industry_code, industry_code,
professional_capability_code, professional_capability_code,
professional_capability_name, professional_capability_name,
person_num,
delete_enum, delete_enum,
remarks, remarks,
create_name, create_name,