@@ -1,6 +1,7 @@ | |||||
package com.ningdatech.pmapi.expert.assembler; | package com.ningdatech.pmapi.expert.assembler; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import com.ningdatech.pmapi.expert.model.*; | import com.ningdatech.pmapi.expert.model.*; | ||||
import com.ningdatech.pmapi.expert.model.bo.ExpertInfoSensitiveFieldCheckBO; | import com.ningdatech.pmapi.expert.model.bo.ExpertInfoSensitiveFieldCheckBO; | ||||
import com.ningdatech.pmapi.expert.model.cmd.ExpertFullInfoSaveCmd; | import com.ningdatech.pmapi.expert.model.cmd.ExpertFullInfoSaveCmd; | ||||
@@ -1,26 +1,10 @@ | |||||
package com.ningdatech.pmapi.expert.assembler; | package com.ningdatech.pmapi.expert.assembler; | ||||
//import com.ningdatech.emapi.common.enumeration.BoolDisplayEnum; | |||||
//import com.ningdatech.emapi.common.helper.RegionCache; | |||||
//import com.ningdatech.emapi.common.utils.JSONObject; | |||||
//import com.ningdatech.emapi.expert.constants.DictExpertInfoTypeEnum; | |||||
//import com.ningdatech.emapi.expert.constants.ExpertApplyTypeEnum; | |||||
//import com.ningdatech.emapi.expert.constants.ExpertTagEnum; | |||||
//import com.ningdatech.emapi.expert.entity.*; | |||||
//import com.ningdatech.emapi.expert.entity.domain.*; | |||||
//import com.ningdatech.emapi.expert.entity.dto.*; | |||||
//import com.ningdatech.emapi.expert.entity.vo.ExpertFullInfoVO; | |||||
//import com.ningdatech.emapi.sys.file.entity.FileBasicInfo; | |||||
//import com.ningdatech.emapi.sys.file.entity.vo.result.AttachFileVo; | |||||
//import com.ningdatech.emapi.sys.meta.entity.RegionDtoMapKey; | |||||
//import com.ningdatech.emapi.sys.meta.entity.dto.DictionaryDTO; | |||||
//import com.ningdatech.emapi.sys.meta.entity.dto.TagDTO; | |||||
//import com.ningdatech.emapi.sys.meta.helper.DictionaryCache; | |||||
//import com.ningdatech.emapi.sys.meta.helper.TagCache; | |||||
import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
import com.ningdatech.file.entity.vo.result.AttachFileVo; | import com.ningdatech.file.entity.vo.result.AttachFileVo; | ||||
import com.ningdatech.pmapi.common.enumeration.BoolDisplayEnum; | import com.ningdatech.pmapi.common.enumeration.BoolDisplayEnum; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import com.ningdatech.pmapi.expert.constant.ExpertApplyTypeEnum; | import com.ningdatech.pmapi.expert.constant.ExpertApplyTypeEnum; | ||||
import com.ningdatech.pmapi.expert.entity.ExpertAvoidCompany; | import com.ningdatech.pmapi.expert.entity.ExpertAvoidCompany; | ||||
import com.ningdatech.pmapi.expert.entity.ExpertIntentionWorkRegion; | import com.ningdatech.pmapi.expert.entity.ExpertIntentionWorkRegion; | ||||
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||||
import com.ningdatech.basic.exception.BizException; | import com.ningdatech.basic.exception.BizException; | ||||
import com.ningdatech.file.entity.vo.result.AttachFileVo; | import com.ningdatech.file.entity.vo.result.AttachFileVo; | ||||
import com.ningdatech.file.service.FileService; | import com.ningdatech.file.service.FileService; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import com.ningdatech.pmapi.expert.assembler.ExpertUserInfoAssembler; | import com.ningdatech.pmapi.expert.assembler.ExpertUserInfoAssembler; | ||||
import com.ningdatech.pmapi.expert.constant.ExpertSensitiveFieldTypeEnum; | import com.ningdatech.pmapi.expert.constant.ExpertSensitiveFieldTypeEnum; | ||||
import com.ningdatech.pmapi.expert.constant.ExpertUserInfoSensitiveFieldEnum; | import com.ningdatech.pmapi.expert.constant.ExpertUserInfoSensitiveFieldEnum; | ||||
@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.expert.manage; | |||||
import com.ningdatech.basic.exception.BizException; | import com.ningdatech.basic.exception.BizException; | ||||
import com.ningdatech.file.entity.vo.result.AttachFileVo; | import com.ningdatech.file.entity.vo.result.AttachFileVo; | ||||
import com.ningdatech.file.service.FileService; | import com.ningdatech.file.service.FileService; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import com.ningdatech.pmapi.expert.assembler.ExpertInfoCmdAssembler; | import com.ningdatech.pmapi.expert.assembler.ExpertInfoCmdAssembler; | ||||
import com.ningdatech.pmapi.expert.assembler.ExpertUserInfoAssembler; | import com.ningdatech.pmapi.expert.assembler.ExpertUserInfoAssembler; | ||||
import com.ningdatech.pmapi.expert.constant.ExpertAccountStatusEnum; | import com.ningdatech.pmapi.expert.constant.ExpertAccountStatusEnum; | ||||
@@ -1,5 +1,6 @@ | |||||
package com.ningdatech.pmapi.expert.model; | package com.ningdatech.pmapi.expert.model; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import com.ningdatech.pmapi.meta.model.ExpertRegionInfo; | import com.ningdatech.pmapi.meta.model.ExpertRegionInfo; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
@@ -1,5 +1,6 @@ | |||||
package com.ningdatech.pmapi.expert.model; | package com.ningdatech.pmapi.expert.model; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
@@ -1,5 +1,6 @@ | |||||
package com.ningdatech.pmapi.expert.model; | package com.ningdatech.pmapi.expert.model; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
@@ -1,5 +1,6 @@ | |||||
package com.ningdatech.pmapi.expert.model; | package com.ningdatech.pmapi.expert.model; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
@@ -1,5 +1,6 @@ | |||||
package com.ningdatech.pmapi.expert.model; | package com.ningdatech.pmapi.expert.model; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
@@ -1,24 +0,0 @@ | |||||
package com.ningdatech.pmapi.expert.model; | |||||
import io.swagger.annotations.ApiModel; | |||||
import io.swagger.annotations.ApiModelProperty; | |||||
import lombok.Data; | |||||
/** | |||||
* @author liuxinxin | |||||
* @date 2022/7/25 下午1:55 | |||||
* 用于包装使用 | |||||
*/ | |||||
@Data | |||||
@ApiModel("文件信息基类") | |||||
public class FileBasicInfo { | |||||
@ApiModelProperty("文件id") | |||||
private Long fileId; | |||||
@ApiModelProperty("文件url") | |||||
private String url; | |||||
@ApiModelProperty("文件名") | |||||
private String fileName; | |||||
} |
@@ -1,5 +1,6 @@ | |||||
package com.ningdatech.pmapi.expert.model; | package com.ningdatech.pmapi.expert.model; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
@@ -1,6 +1,6 @@ | |||||
package com.ningdatech.pmapi.expert.model.dto; | package com.ningdatech.pmapi.expert.model.dto; | ||||
import com.ningdatech.pmapi.expert.model.FileBasicInfo; | |||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import lombok.Data; | import lombok.Data; | ||||
import javax.validation.constraints.NotBlank; | import javax.validation.constraints.NotBlank; | ||||
@@ -1,5 +1,6 @@ | |||||
package com.ningdatech.pmapi.expert.model.req; | package com.ningdatech.pmapi.expert.model.req; | ||||
import com.ningdatech.pmapi.common.model.FileBasicInfo; | |||||
import com.ningdatech.pmapi.expert.model.*; | import com.ningdatech.pmapi.expert.model.*; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||