去掉员工无用的字段和表
This commit is contained in:
parent
4e524a8128
commit
d4f460223d
|
|
@ -41,10 +41,6 @@ public class EmployeesApplyMQDto implements Serializable {
|
|||
private String height;
|
||||
/**体重*/
|
||||
private String weight;
|
||||
/**家庭住址*/
|
||||
private String address;
|
||||
/**是否吸烟*/
|
||||
private String isSmoking;
|
||||
/**健康状况*/
|
||||
private String healthStatus;
|
||||
/**户籍所在地*/
|
||||
|
|
@ -67,12 +63,8 @@ public class EmployeesApplyMQDto implements Serializable {
|
|||
private String idCardNegative;
|
||||
/**健康证正面*/
|
||||
private String healthCertificatePositive;
|
||||
/**健康证反面*/
|
||||
private String healthCertificateNegative;
|
||||
/**银行卡正面*/
|
||||
private String bankPositive;
|
||||
/**银行卡反面*/
|
||||
private String bankNegative;
|
||||
/**开户行*/
|
||||
private String openingBank;
|
||||
/**银行卡号*/
|
||||
|
|
@ -81,8 +73,6 @@ public class EmployeesApplyMQDto implements Serializable {
|
|||
private String qualification;
|
||||
/**无犯罪证明*/
|
||||
private String noCrimeCertificate;
|
||||
/**区域*/
|
||||
private String regional;
|
||||
/**是否删除 0未删除 1删除*/
|
||||
private String delFlag;
|
||||
/**申请日期*/
|
||||
|
|
|
|||
|
|
@ -45,8 +45,6 @@ public class EmployeesInfoEntity implements Serializable {
|
|||
private Date dateOfBirth;
|
||||
/**婚否*/
|
||||
private String marriedOrNot;
|
||||
/**工资*/
|
||||
private String wages;
|
||||
/**身高*/
|
||||
private String height;
|
||||
/**体重*/
|
||||
|
|
@ -57,8 +55,6 @@ public class EmployeesInfoEntity implements Serializable {
|
|||
* 现住址
|
||||
*/
|
||||
private String currentAddress;
|
||||
/**是否吸烟*/
|
||||
private String isSmoking;
|
||||
/**健康状况*/
|
||||
private String healthStatus;
|
||||
/**户籍所在地*/
|
||||
|
|
@ -79,18 +75,10 @@ public class EmployeesInfoEntity implements Serializable {
|
|||
private String idCardPositive;
|
||||
/**身份证反面*/
|
||||
private String idCardNegative;
|
||||
/**合同正面*/
|
||||
private String contractPositive;
|
||||
/**合同反面*/
|
||||
private String contractNegative;
|
||||
/**健康证正面*/
|
||||
private String healthCertificatePositive;
|
||||
/**健康证反面*/
|
||||
private String healthCertificateNegative;
|
||||
/**银行卡正面*/
|
||||
private String bankPositive;
|
||||
/**银行卡反面*/
|
||||
private String bankNegative;
|
||||
/**开户行*/
|
||||
private String openingBank;
|
||||
/**银行卡号*/
|
||||
|
|
@ -99,10 +87,6 @@ public class EmployeesInfoEntity implements Serializable {
|
|||
private String qualification;
|
||||
/**无犯罪证明*/
|
||||
private String noCrimeCertificate;
|
||||
/**区域*/
|
||||
private String regional;
|
||||
/**服务标签*/
|
||||
private String serviceTag;
|
||||
|
||||
/**创建人*/
|
||||
private String createBy;
|
||||
|
|
|
|||
|
|
@ -79,10 +79,6 @@ public class BizEmployeesInfo implements Serializable {
|
|||
@Excel(name = "婚否", width = 15, dicCode = "married_or_not")
|
||||
@ApiModelProperty(value = "婚否")
|
||||
private java.lang.String marriedOrNot;
|
||||
/**工资*/
|
||||
@Excel(name = "工资", width = 15, dicCode = "wages")
|
||||
@ApiModelProperty(value = "工资")
|
||||
private java.lang.String wages;
|
||||
/**身高*/
|
||||
@Excel(name = "身高", width = 15)
|
||||
@ApiModelProperty(value = "身高")
|
||||
|
|
@ -101,10 +97,6 @@ public class BizEmployeesInfo implements Serializable {
|
|||
@Excel(name = "现住址", width = 15)
|
||||
@ApiModelProperty(value = "现住址")
|
||||
private String currentAddress;
|
||||
/**是否吸烟*/
|
||||
@Excel(name = "是否吸烟", width = 15, dicCode = "is_smoking")
|
||||
@ApiModelProperty(value = "是否吸烟")
|
||||
private java.lang.String isSmoking;
|
||||
/**健康状况*/
|
||||
@Excel(name = "健康状况", width = 15, dicCode = "health_status")
|
||||
@ApiModelProperty(value = "健康状况")
|
||||
|
|
@ -145,30 +137,14 @@ public class BizEmployeesInfo implements Serializable {
|
|||
@Excel(name = "身份证反面", width = 15)
|
||||
@ApiModelProperty(value = "身份证反面")
|
||||
private java.lang.String idCardNegative;
|
||||
/**合同正面*/
|
||||
@Excel(name = "合同正面", width = 15)
|
||||
@ApiModelProperty(value = "合同正面")
|
||||
private java.lang.String contractPositive;
|
||||
/**合同反面*/
|
||||
@Excel(name = "合同反面", width = 15)
|
||||
@ApiModelProperty(value = "合同反面")
|
||||
private java.lang.String contractNegative;
|
||||
/**健康证正面*/
|
||||
@Excel(name = "健康证正面", width = 15)
|
||||
@ApiModelProperty(value = "健康证正面")
|
||||
private java.lang.String healthCertificatePositive;
|
||||
/**健康证反面*/
|
||||
@Excel(name = "健康证反面", width = 15)
|
||||
@ApiModelProperty(value = "健康证反面")
|
||||
private java.lang.String healthCertificateNegative;
|
||||
/**银行卡正面*/
|
||||
@Excel(name = "银行卡正面", width = 15)
|
||||
@ApiModelProperty(value = "银行卡正面")
|
||||
private java.lang.String bankPositive;
|
||||
/**银行卡反面*/
|
||||
@Excel(name = "银行卡反面", width = 15)
|
||||
@ApiModelProperty(value = "银行卡反面")
|
||||
private java.lang.String bankNegative;
|
||||
/**开户行*/
|
||||
@Excel(name = "开户行", width = 15)
|
||||
@ApiModelProperty(value = "开户行")
|
||||
|
|
@ -185,14 +161,6 @@ public class BizEmployeesInfo implements Serializable {
|
|||
@Excel(name = "无犯罪证明", width = 15)
|
||||
@ApiModelProperty(value = "无犯罪证明")
|
||||
private java.lang.String noCrimeCertificate;
|
||||
/**区域*/
|
||||
@Excel(name = "区域", width = 15)
|
||||
@ApiModelProperty(value = "区域")
|
||||
private java.lang.String regional;
|
||||
/**服务标签*/
|
||||
@Excel(name = "服务标签", width = 15)
|
||||
@ApiModelProperty(value = "服务标签")
|
||||
private java.lang.String serviceTag;
|
||||
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
|
|
|
|||
|
|
@ -8,118 +8,14 @@
|
|||
</update>
|
||||
|
||||
<select id="findById" resultType="com.nu.modules.employeesInfo.entity.BizEmployeesInfo">
|
||||
select id,
|
||||
name,
|
||||
sex,
|
||||
national,
|
||||
head_path,
|
||||
id_card,
|
||||
tel,
|
||||
entry_time,
|
||||
post_level,
|
||||
date_of_birth,
|
||||
married_or_not,
|
||||
wages,
|
||||
CONCAT(height, '') as height,
|
||||
CONCAT(weight, '') as weight,
|
||||
address,
|
||||
is_smoking,
|
||||
health_status,
|
||||
house_address,
|
||||
political_appearance,
|
||||
emergency_contact,
|
||||
emergency_tel,
|
||||
emergency_relationship,
|
||||
hukou_nature,
|
||||
content,
|
||||
id_card_positive,
|
||||
id_card_negative,
|
||||
contract_positive,
|
||||
contract_negative,
|
||||
health_certificate_positive,
|
||||
health_certificate_negative,
|
||||
bank_positive,
|
||||
bank_negative,
|
||||
qualification,
|
||||
no_crime_certificate,
|
||||
regional,
|
||||
service_tag,
|
||||
del_flag,
|
||||
create_by,
|
||||
create_time,
|
||||
update_by,
|
||||
update_time,
|
||||
sys_org_code,
|
||||
open_id,
|
||||
iz_online,
|
||||
iz_freeze,
|
||||
opening_bank,
|
||||
bank_card,
|
||||
iz_invited,
|
||||
modify_status,
|
||||
start_time,
|
||||
end_time,
|
||||
current_address,
|
||||
order_cap
|
||||
select *
|
||||
from nu_biz_employees_info
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="queryPageList" resultType="com.nu.modules.employeesInfo.entity.BizEmployeesInfo">
|
||||
SELECT
|
||||
ei.id AS id,
|
||||
ei.name AS name,
|
||||
ei.sex AS sex,
|
||||
ei.national AS national,
|
||||
ei.head_path AS headPath,
|
||||
ei.id_card AS idCard,
|
||||
ei.tel AS tel,
|
||||
ei.entry_time AS entryTime,
|
||||
ei.post_level AS postLevel,
|
||||
ei.date_of_birth AS dateOfBirth,
|
||||
ei.married_or_not AS marriedOrNot,
|
||||
ei.wages AS wages,
|
||||
ei.height AS height,
|
||||
ei.weight AS weight,
|
||||
ei.address AS address,
|
||||
ei.current_address AS currentAddress,
|
||||
ei.is_smoking AS isSmoking,
|
||||
ei.health_status AS healthStatus,
|
||||
ei.house_address AS houseAddress,
|
||||
ei.political_appearance AS politicalAppearance,
|
||||
ei.emergency_contact AS emergencyContact,
|
||||
ei.emergency_tel AS emergencyTel,
|
||||
ei.emergency_relationship AS emergencyRelationship,
|
||||
ei.hukou_nature AS hukouNature,
|
||||
ei.content AS content,
|
||||
ei.id_card_positive AS idCardPositive,
|
||||
ei.id_card_negative AS idCardNegative,
|
||||
ei.contract_positive AS contractPositive,
|
||||
ei.contract_negative AS contractNegative,
|
||||
ei.health_certificate_positive AS healthCertificatePositive,
|
||||
ei.health_certificate_negative AS healthCertificateNegative,
|
||||
ei.bank_positive AS bankPositive,
|
||||
ei.bank_negative AS bankNegative,
|
||||
ei.qualification AS qualification,
|
||||
ei.no_crime_certificate AS noCrimeCertificate,
|
||||
ei.regional AS regional,
|
||||
ei.service_tag AS serviceTag,
|
||||
ei.del_flag AS delFlag,
|
||||
ei.create_by AS createBy,
|
||||
ei.create_time AS createTime,
|
||||
ei.update_by AS updateBy,
|
||||
ei.update_time AS updateTime,
|
||||
ei.sys_org_code AS sysOrgCode,
|
||||
ei.open_id AS openId,
|
||||
ei.iz_online AS izOnline,
|
||||
ei.iz_freeze AS izFreeze,
|
||||
ei.opening_bank AS openingBank,
|
||||
ei.bank_card AS bankCard,
|
||||
ei.iz_invited AS izInvited,
|
||||
ei.modify_status AS modifyStatus,
|
||||
ei.start_time AS startTime,
|
||||
ei.end_time AS endTime,
|
||||
ei.order_cap AS orderCap,
|
||||
ei.*,
|
||||
usert.status AS userStatus,
|
||||
usert.id AS userId
|
||||
FROM nu_biz_employees_info AS ei
|
||||
|
|
@ -141,9 +37,6 @@
|
|||
<if test="params.postLevel != null and params.postLevel != ''">
|
||||
AND ei.post_level = #{params.postLevel}
|
||||
</if>
|
||||
<if test="params.regional != null and params.regional != ''">
|
||||
AND ei.regional = #{params.regional}
|
||||
</if>
|
||||
<if test="params.izOnline != null and params.izOnline != ''">
|
||||
AND ei.iz_online = #{params.izOnline}
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -115,7 +115,6 @@ public class BizEmployeesInfoServiceImpl extends ServiceImpl<BizEmployeesInfoMap
|
|||
params.put("idCard", bizEmployeesInfo.getIdCard());
|
||||
params.put("tel", bizEmployeesInfo.getTel());
|
||||
params.put("postLevel", bizEmployeesInfo.getPostLevel());
|
||||
params.put("regional", bizEmployeesInfo.getRegional());
|
||||
params.put("izOnline", bizEmployeesInfo.getIzOnline());
|
||||
params.put("izFreeze", bizEmployeesInfo.getIzFreeze());
|
||||
params.put("sysOrgCode", bizEmployeesInfo.getSysOrgCode());
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ import com.nu.modules.employeesInfo.entity.BizEmployeesInfo;
|
|||
import com.nu.modules.employeesInfo.service.IBizEmployeesInfoService;
|
||||
import com.nu.modules.employeesapply.entity.EmployeesApply;
|
||||
import com.nu.modules.employeesapply.service.IEmployeesApplyService;
|
||||
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
|
||||
import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo;
|
||||
|
|
@ -48,8 +46,6 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
|
|||
private IBizEmployeesInfoService bizEmployeesInfoService;
|
||||
@Autowired
|
||||
private IEmployeesApplyService employeesApplyService;
|
||||
@Autowired
|
||||
private IBizEmployeesMediaService employeesMediaService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
|
|
@ -120,17 +116,6 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
|
|||
employeesIds.add(id);
|
||||
}
|
||||
|
||||
//获取员工身份证是否下载标识
|
||||
QueryWrapper<BizEmployeesMedia> qw = new QueryWrapper<>();
|
||||
qw.in("employees_id", employeesIds);
|
||||
List<BizEmployeesMedia> list = employeesMediaService.list(qw);
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
Integer index = idToIndexMap.get(list.get(i).getEmployeesId());
|
||||
if (index != null) {
|
||||
records.get(index).setHasCardZmPath(list.get(i).getCardZmPath());//是否有身份证正面
|
||||
records.get(index).setHasCardFmPath(list.get(i).getCardFmPath());//是否有身份证反面
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
return Result.OK(pageList);
|
||||
|
|
@ -236,12 +221,4 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
|
|||
return super.importExcel(request, response, NuEmployeesAdvisoryInfo.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取身份证资源
|
||||
*/
|
||||
@PostMapping(value = "/acquireIdenCard")
|
||||
public Result<?> acquireIdenCard(@RequestBody NuEmployeesAdvisoryInfo nuEmployeesAdvisoryInfo) {
|
||||
nuEmployeesAdvisoryInfoService.acquireIdenCard(nuEmployeesAdvisoryInfo);
|
||||
return Result.OK("已开始获取!");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,5 +11,4 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||
*/
|
||||
public interface INuEmployeesAdvisoryInfoService extends IService<NuEmployeesAdvisoryInfo> {
|
||||
|
||||
void acquireIdenCard(NuEmployeesAdvisoryInfo nuEmployeesAdvisoryInfo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|||
import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo;
|
||||
import com.nu.modules.employeesadvisiory.mapper.NuEmployeesAdvisoryInfoMapper;
|
||||
import com.nu.modules.employeesadvisiory.service.INuEmployeesAdvisoryInfoService;
|
||||
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
|
||||
import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
|
||||
import com.nu.modules.sysconfig.ISysConfigApi;
|
||||
import com.nu.utils.FileDownloader;
|
||||
import com.nu.utils.SafetyUtil;
|
||||
|
|
@ -32,81 +30,5 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
|
|||
private ISysConfigApi sysConfigApi;
|
||||
@Value("${jeecg.path.upload}")
|
||||
private String upLoadPath;
|
||||
@Autowired
|
||||
private IBizEmployeesMediaService employeesMediaService;
|
||||
|
||||
@Override
|
||||
public void acquireIdenCard(NuEmployeesAdvisoryInfo nuEmployeesAdvisoryInfo) {
|
||||
String idCardPositive = nuEmployeesAdvisoryInfo.getCardZmPath();
|
||||
String idCardNegative = nuEmployeesAdvisoryInfo.getCardFmPath();
|
||||
|
||||
BizEmployeesMedia data = new BizEmployeesMedia();
|
||||
data.setEmployeesId(nuEmployeesAdvisoryInfo.getId());
|
||||
data.setCardZmPath(StringUtils.isBlank(idCardPositive) ? "0" : "2");
|
||||
data.setCardFmPath(StringUtils.isBlank(idCardNegative) ? "0" : "2");
|
||||
employeesMediaService.save(data);
|
||||
new Thread(() -> {
|
||||
|
||||
try {
|
||||
JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
|
||||
String baseUrl = opeOpenUrl.getString("configValue");
|
||||
if (baseUrl.endsWith("/")) {
|
||||
baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
|
||||
}
|
||||
//身份证正面
|
||||
{
|
||||
if (StringUtils.isNotBlank(idCardPositive)) {
|
||||
if (StringUtils.isNotBlank(idCardPositive)) {
|
||||
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
|
||||
if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
|
||||
upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
|
||||
}
|
||||
String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/"));
|
||||
String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1);
|
||||
if (filePath.startsWith("/") || filePath.startsWith("\\")) {
|
||||
filePath = filePath.substring(1);
|
||||
}
|
||||
try {
|
||||
FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
|
||||
data.setCardZmPath("1");
|
||||
} catch (Exception e) {
|
||||
data.setCardZmPath(null);
|
||||
e.printStackTrace();
|
||||
throw new RuntimeException("员工申请加入机构-身份证正面文件拉取错误,员工id" + nuEmployeesAdvisoryInfo.getIdCard());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//身份证反面
|
||||
{
|
||||
if (StringUtils.isNotBlank(idCardNegative)) {
|
||||
if (StringUtils.isNotBlank(idCardNegative)) {
|
||||
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
|
||||
if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
|
||||
upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
|
||||
}
|
||||
String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/"));
|
||||
String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1);
|
||||
if (filePath.startsWith("/") || filePath.startsWith("\\")) {
|
||||
filePath = filePath.substring(1);
|
||||
}
|
||||
try {
|
||||
FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
|
||||
data.setCardFmPath("1");
|
||||
} catch (Exception e) {
|
||||
data.setCardFmPath(null);
|
||||
e.printStackTrace();
|
||||
throw new RuntimeException("员工申请加入机构-身份证反面文件拉取错误,员工id" + nuEmployeesAdvisoryInfo.getIdCard());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (RuntimeException e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
employeesMediaService.updateMedia(data);
|
||||
}
|
||||
|
||||
}).start();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -179,11 +179,9 @@ public class EmployeesApplyController extends JeecgController<EmployeesApply, IE
|
|||
mqdto.setContactRelationship(apply.getEmergencyRelationship());
|
||||
mqdto.setHukouType(apply.getHukouNature());
|
||||
mqdto.setBankZmPath(apply.getBankPositive());
|
||||
mqdto.setBankFmPath(apply.getBankNegative());
|
||||
mqdto.setOpeningBank(apply.getOpeningBank());
|
||||
mqdto.setBankCard(apply.getBankCard());
|
||||
mqdto.setHealthZmPath(apply.getHealthCertificatePositive());
|
||||
mqdto.setHealthFmPath(apply.getHealthCertificateNegative());
|
||||
mqdto.setQualificationPath(apply.getQualification());
|
||||
mqdto.setNoCrimeCertificate(apply.getNoCrimeCertificate());
|
||||
mqdto.setCurrentAddress(apply.getCurrentAddress());
|
||||
|
|
|
|||
|
|
@ -82,15 +82,6 @@ public class EmployeesApply implements Serializable {
|
|||
@Excel(name = "体重", width = 15)
|
||||
@ApiModelProperty(value = "体重")
|
||||
private String weight;
|
||||
/**家庭住址*/
|
||||
@Excel(name = "家庭住址", width = 15)
|
||||
@ApiModelProperty(value = "家庭住址")
|
||||
private java.lang.String address;
|
||||
/**是否吸烟*/
|
||||
@Excel(name = "是否吸烟", width = 15)
|
||||
@ApiModelProperty(value = "是否吸烟")
|
||||
// @Dict(dicCode = "is_smoking")
|
||||
private java.lang.String isSmoking;
|
||||
/**健康状况*/
|
||||
@Excel(name = "健康状况", width = 15)
|
||||
@ApiModelProperty(value = "健康状况")
|
||||
|
|
@ -144,18 +135,10 @@ public class EmployeesApply implements Serializable {
|
|||
@Excel(name = "健康证正面", width = 15)
|
||||
@ApiModelProperty(value = "健康证正面")
|
||||
private java.lang.String healthCertificatePositive;
|
||||
/**健康证反面*/
|
||||
@Excel(name = "健康证反面", width = 15)
|
||||
@ApiModelProperty(value = "健康证反面")
|
||||
private java.lang.String healthCertificateNegative;
|
||||
/**银行卡正面*/
|
||||
@Excel(name = "银行卡正面", width = 15)
|
||||
@ApiModelProperty(value = "银行卡正面")
|
||||
private java.lang.String bankPositive;
|
||||
/**银行卡反面*/
|
||||
@Excel(name = "银行卡反面", width = 15)
|
||||
@ApiModelProperty(value = "银行卡反面")
|
||||
private java.lang.String bankNegative;
|
||||
/**开户行*/
|
||||
@Excel(name = "开户行", width = 15)
|
||||
@ApiModelProperty(value = "开户行")
|
||||
|
|
@ -172,10 +155,6 @@ public class EmployeesApply implements Serializable {
|
|||
@Excel(name = "无犯罪证明", width = 15)
|
||||
@ApiModelProperty(value = "无犯罪证明")
|
||||
private java.lang.String noCrimeCertificate;
|
||||
/**区域*/
|
||||
@Excel(name = "区域", width = 15)
|
||||
@ApiModelProperty(value = "区域")
|
||||
private java.lang.String regional;
|
||||
/**是否删除 0未删除 1删除*/
|
||||
@Excel(name = "是否删除 0未删除 1删除", width = 15)
|
||||
@ApiModelProperty(value = "是否删除 0未删除 1删除")
|
||||
|
|
|
|||
|
|
@ -1,163 +0,0 @@
|
|||
package com.nu.modules.employeesmedia.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
|
||||
import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 记录获取过哪些员工的证件
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-12
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="记录获取过哪些员工的证件")
|
||||
@RestController
|
||||
@RequestMapping("/employeesmedia/bizEmployeesMedia")
|
||||
@Slf4j
|
||||
public class BizEmployeesMediaController extends JeecgController<BizEmployeesMedia, IBizEmployeesMediaService> {
|
||||
@Autowired
|
||||
private IBizEmployeesMediaService bizEmployeesMediaService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param bizEmployeesMedia
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "记录获取过哪些员工的证件-分页列表查询")
|
||||
@ApiOperation(value="记录获取过哪些员工的证件-分页列表查询", notes="记录获取过哪些员工的证件-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<BizEmployeesMedia>> queryPageList(BizEmployeesMedia bizEmployeesMedia,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<BizEmployeesMedia> queryWrapper = QueryGenerator.initQueryWrapper(bizEmployeesMedia, req.getParameterMap());
|
||||
Page<BizEmployeesMedia> page = new Page<BizEmployeesMedia>(pageNo, pageSize);
|
||||
IPage<BizEmployeesMedia> pageList = bizEmployeesMediaService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param bizEmployeesMedia
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "记录获取过哪些员工的证件-添加")
|
||||
@ApiOperation(value="记录获取过哪些员工的证件-添加", notes="记录获取过哪些员工的证件-添加")
|
||||
@RequiresPermissions("employeesmedia:nu_biz_employees_media:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody BizEmployeesMedia bizEmployeesMedia) {
|
||||
bizEmployeesMediaService.save(bizEmployeesMedia);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param bizEmployeesMedia
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "记录获取过哪些员工的证件-编辑")
|
||||
@ApiOperation(value="记录获取过哪些员工的证件-编辑", notes="记录获取过哪些员工的证件-编辑")
|
||||
@RequiresPermissions("employeesmedia:nu_biz_employees_media:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody BizEmployeesMedia bizEmployeesMedia) {
|
||||
bizEmployeesMediaService.updateById(bizEmployeesMedia);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "记录获取过哪些员工的证件-通过id删除")
|
||||
@ApiOperation(value="记录获取过哪些员工的证件-通过id删除", notes="记录获取过哪些员工的证件-通过id删除")
|
||||
@RequiresPermissions("employeesmedia:nu_biz_employees_media:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
||||
bizEmployeesMediaService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "记录获取过哪些员工的证件-批量删除")
|
||||
@ApiOperation(value="记录获取过哪些员工的证件-批量删除", notes="记录获取过哪些员工的证件-批量删除")
|
||||
@RequiresPermissions("employeesmedia:nu_biz_employees_media:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.bizEmployeesMediaService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "记录获取过哪些员工的证件-通过id查询")
|
||||
@ApiOperation(value="记录获取过哪些员工的证件-通过id查询", notes="记录获取过哪些员工的证件-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<BizEmployeesMedia> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
BizEmployeesMedia bizEmployeesMedia = bizEmployeesMediaService.getById(id);
|
||||
if(bizEmployeesMedia==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(bizEmployeesMedia);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param bizEmployeesMedia
|
||||
*/
|
||||
@RequiresPermissions("employeesmedia:nu_biz_employees_media:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, BizEmployeesMedia bizEmployeesMedia) {
|
||||
return super.exportXls(request, bizEmployeesMedia, BizEmployeesMedia.class, "记录获取过哪些员工的证件");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequiresPermissions("employeesmedia:nu_biz_employees_media:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, BizEmployeesMedia.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
package com.nu.modules.employeesmedia.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import org.jeecg.common.constant.ProvinceCityArea;
|
||||
import org.jeecg.common.util.SpringContextUtils;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 记录获取过哪些员工的证件
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-12
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("nu_biz_employees_media")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="nu_biz_employees_media对象", description="记录获取过哪些员工的证件")
|
||||
public class BizEmployeesMedia implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**employeesId*/
|
||||
@Excel(name = "employeesId", width = 15)
|
||||
@ApiModelProperty(value = "employeesId")
|
||||
private java.lang.String employeesId;
|
||||
/**身份证正面 0未获取 1已获取*/
|
||||
@Excel(name = "身份证正面 0未获取 1已获取", width = 15)
|
||||
@ApiModelProperty(value = "身份证正面 0未获取 1已获取")
|
||||
private java.lang.String cardZmPath;
|
||||
/**身份证反面 0未获取 1已获取*/
|
||||
@Excel(name = "身份证反面 0未获取 1已获取", width = 15)
|
||||
@ApiModelProperty(value = "身份证反面 0未获取 1已获取")
|
||||
private java.lang.String cardFmPath;
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
package com.nu.modules.employeesmedia.mapper;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 记录获取过哪些员工的证件
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-12
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface BizEmployeesMediaMapper extends BaseMapper<BizEmployeesMedia> {
|
||||
|
||||
void updateCardZmPath(@Param("dto") BizEmployeesMedia dto);
|
||||
|
||||
void updateCardFmPath(@Param("dto") BizEmployeesMedia dto);
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nu.modules.employeesmedia.mapper.BizEmployeesMediaMapper">
|
||||
|
||||
<update id="updateCardZmPath">
|
||||
update nu_biz_employees_media set card_zm_path = null where id = #{dto.id}
|
||||
</update>
|
||||
|
||||
<update id="updateCardFmPath">
|
||||
update nu_biz_employees_media set card_fm_path = null where id = #{dto.id}
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
package com.nu.modules.employeesmedia.service;
|
||||
|
||||
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @Description: 记录获取过哪些员工的证件
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-12
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IBizEmployeesMediaService extends IService<BizEmployeesMedia> {
|
||||
|
||||
void updateMedia(BizEmployeesMedia data);
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
package com.nu.modules.employeesmedia.service.impl;
|
||||
|
||||
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
|
||||
import com.nu.modules.employeesmedia.mapper.BizEmployeesMediaMapper;
|
||||
import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: 记录获取过哪些员工的证件
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-12
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class BizEmployeesMediaServiceImpl extends ServiceImpl<BizEmployeesMediaMapper, BizEmployeesMedia> implements IBizEmployeesMediaService {
|
||||
|
||||
@Override
|
||||
public void updateMedia(BizEmployeesMedia data) {
|
||||
if(StringUtils.isBlank(data.getCardZmPath())){
|
||||
baseMapper.updateCardZmPath(data);
|
||||
}
|
||||
if(StringUtils.isBlank(data.getCardFmPath())){
|
||||
baseMapper.updateCardFmPath(data);
|
||||
}
|
||||
baseMapper.updateById(data);
|
||||
}
|
||||
}
|
||||
|
|
@ -11,8 +11,6 @@ import com.nu.modules.employeesInfo.entity.BizEmployeesInfo;
|
|||
import com.nu.modules.employeesInfo.service.IBizEmployeesInfoService;
|
||||
import com.nu.modules.employeesapply.entity.EmployeesApply;
|
||||
import com.nu.modules.employeesapply.service.IEmployeesApplyService;
|
||||
import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
|
||||
import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
|
||||
import com.nu.utils.RabbitMQUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
|
|
@ -42,8 +40,6 @@ public class EmployeesMQListener {
|
|||
@Autowired
|
||||
private IBizEmployeesInfoService employeesInfoService;
|
||||
@Autowired
|
||||
private IBizEmployeesMediaService employeesMediaService;
|
||||
@Autowired
|
||||
private ISysUserAPI sysUserAPI;
|
||||
@Autowired
|
||||
private ISysBaseAPI sysBaseAPI;
|
||||
|
|
@ -257,27 +253,6 @@ public class EmployeesMQListener {
|
|||
appMediaData.setId(empApply.getId());
|
||||
downMedia = true;
|
||||
}
|
||||
//条件三 如果不满足条件一、二 否则判断是否获取过身份证 - 只更新身份证字段和资源
|
||||
if (!downMedia && empApply != null && "0".equals(empApply.getApplyType())) {
|
||||
QueryWrapper<BizEmployeesMedia> mqw = new QueryWrapper<>();
|
||||
mqw.eq("employees_id", dto.getEmployeeId());
|
||||
List<BizEmployeesMedia> list = employeesMediaService.list(mqw);
|
||||
if (list != null && list.size() > 0) {
|
||||
EmployeesApply employeesApply2 = new EmployeesApply();
|
||||
employeesApply2.setId(empApply.getId());
|
||||
|
||||
BizEmployeesMedia bizEmployeesMedia = new BizEmployeesMedia();
|
||||
bizEmployeesMedia.setCardZmPath("2");
|
||||
bizEmployeesMedia.setCardFmPath("2");
|
||||
employeesMediaService.update(bizEmployeesMedia, mqw);
|
||||
//去管理平台拉取资源
|
||||
{
|
||||
employeesApply2.setIdCardPositive(idCardPositive);
|
||||
employeesApply2.setIdCardNegative(idCardNegative);
|
||||
employeesApplyService.updateById(employeesApply2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue