员工入职信息保存到日志表中
This commit is contained in:
parent
35c62b69b8
commit
f2e2e17803
|
|
@ -2,6 +2,7 @@ package com.nu.modules.EmployeesInfo.api;
|
|||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import com.nu.entity.EmployeesAdvisoryInfoEntity;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -20,4 +21,7 @@ public interface IEmployeesAdvisioryInfoApi {
|
|||
JSONObject getEmployeeInfo(String tel);
|
||||
|
||||
boolean validateChanged(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity);
|
||||
|
||||
EmployeesAdvisoryInfoEntity queryEmployeeInfoById(String id);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,5 +105,71 @@ public class EmployeesOrg implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String departName;
|
||||
|
||||
/**联系电话*/
|
||||
private String tel;
|
||||
/**咨询人姓名*/
|
||||
private String name;
|
||||
/**性别*/
|
||||
private String sex;
|
||||
/**民族*/
|
||||
private String national;
|
||||
/**出生日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日")
|
||||
@DateTimeFormat(pattern="yyyy年MM月dd日")
|
||||
private Date birthDate;
|
||||
/**住址(身份证上)*/
|
||||
private String idCardAddress;
|
||||
/**身份证号*/
|
||||
private String idCard;
|
||||
/**签发机关*/
|
||||
private String issuingAuthority;
|
||||
/**有效开始日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
|
||||
@DateTimeFormat(pattern="yyyy.MM.dd")
|
||||
private Date startTime;
|
||||
/**有效结束日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
|
||||
@DateTimeFormat(pattern="yyyy.MM.dd")
|
||||
private Date endTime;
|
||||
/**身份证正面*/
|
||||
private String cardZmPath;
|
||||
/**身份证反面*/
|
||||
private String cardFmPath;
|
||||
/**婚否(0未婚 1已婚)*/
|
||||
private String maritalStatus;
|
||||
/**身高*/
|
||||
private String height;
|
||||
/**体重*/
|
||||
private String weight;
|
||||
/**健康状况(0健康 1患病)*/
|
||||
private String healthStatus;
|
||||
/**政治面貌(0共产党员 1民主党 2国民党 3无党派)*/
|
||||
private String politicalAppearance;
|
||||
/**紧急联系人姓名*/
|
||||
private String contactName;
|
||||
/**紧急联系人电话*/
|
||||
private String contactTel;
|
||||
/**紧急联系人与本人关系*/
|
||||
private String contactRelationship;
|
||||
/**户口性质(0农业 1非农业)*/
|
||||
private String hukouType;
|
||||
/**银行卡正面*/
|
||||
private String bankZmPath;
|
||||
/**银行卡反面*/
|
||||
private String bankFmPath;
|
||||
/**开户行*/
|
||||
private String openingBank;
|
||||
/**银行卡号*/
|
||||
private String bankCard;
|
||||
/**健康证正面*/
|
||||
private String healthZmPath;
|
||||
/**健康证反面*/
|
||||
private String healthFmPath;
|
||||
/**资质证(可多张)*/
|
||||
private String qualificationPath;
|
||||
/**无犯罪正面*/
|
||||
private String noCrimeCertificate;
|
||||
/**现住址*/
|
||||
private String currentAddress;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -288,6 +288,12 @@ public class NuEmployeesAdvisoryInfo implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String auditContent;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "变更申请日期")
|
||||
@TableField(exist = false)
|
||||
private java.util.Date auditTime;
|
||||
|
||||
private String lastLoginOrg;//最近一次登录机构编码
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
|
|
|
|||
|
|
@ -22,4 +22,6 @@ public interface NuEmployeesAdvisoryInfoMapper extends BaseMapper<NuEmployeesAdv
|
|||
List<NuEmployeesAdvisoryInfo> queryEmployeeInfo(@Param("openId") String openId, @Param("orgCode") String orgCode);
|
||||
|
||||
NuEmployeesAdvisoryInfo getEmployeeInfoByTel(@Param("tel") String tel);
|
||||
|
||||
NuEmployeesAdvisoryInfo queryEmployeeInfoById(@Param("id") String id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,4 +67,43 @@
|
|||
WHERE adinfo.tel = #{tel}
|
||||
</select>
|
||||
|
||||
<select id="queryEmployeeInfoById" resultType="com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo">
|
||||
SELECT
|
||||
id,
|
||||
tel,
|
||||
name,
|
||||
sex,
|
||||
national,
|
||||
birth_date,
|
||||
id_card_address,
|
||||
id_card,
|
||||
issuing_authority,
|
||||
start_time,
|
||||
end_time,
|
||||
card_zm_path,
|
||||
card_fm_path,
|
||||
marital_status,
|
||||
height,
|
||||
weight,
|
||||
health_status,
|
||||
political_appearance,
|
||||
contact_name,
|
||||
contact_tel,
|
||||
contact_relationship,
|
||||
hukou_type,
|
||||
bank_zm_path,
|
||||
bank_fm_path,
|
||||
opening_bank,
|
||||
bank_card,
|
||||
health_zm_path,
|
||||
health_fm_path,
|
||||
qualification_path,
|
||||
no_crime_certificate,
|
||||
current_address,
|
||||
(case when apply_type = '2' then modify_status else status end) AS applyStatus,
|
||||
audit_content AS auditContent
|
||||
FROM nu_biz_employees_org
|
||||
WHERE id = #{id}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -49,6 +49,37 @@ public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, Emp
|
|||
employeesOrg.setIzOnline("N");
|
||||
employeesOrg.setIzFreeze("N");
|
||||
employeesOrg.setApplyType("1");
|
||||
employeesOrg.setTel(dto.getTel());
|
||||
employeesOrg.setName(dto.getName());
|
||||
employeesOrg.setSex(dto.getSex());
|
||||
employeesOrg.setNational(dto.getNational());
|
||||
employeesOrg.setBirthDate(dto.getDateOfBirth());
|
||||
employeesOrg.setIdCardAddress(dto.getHouseAddress());
|
||||
employeesOrg.setIdCard(dto.getIdCard());
|
||||
employeesOrg.setIssuingAuthority(dto.getIssuingAuthority());
|
||||
employeesOrg.setStartTime(dto.getStartTime());
|
||||
employeesOrg.setEndTime(dto.getEndTime());
|
||||
employeesOrg.setCardZmPath(dto.getIdCardPositive());
|
||||
employeesOrg.setCardFmPath(dto.getIdCardNegative());
|
||||
employeesOrg.setMaritalStatus(dto.getMarriedOrNot());
|
||||
employeesOrg.setHeight(dto.getHeight());
|
||||
employeesOrg.setWeight(dto.getWeight());
|
||||
employeesOrg.setHealthStatus(dto.getHealthStatus());
|
||||
employeesOrg.setPoliticalAppearance(dto.getPoliticalAppearance());
|
||||
employeesOrg.setContactName(dto.getEmergencyContact());
|
||||
employeesOrg.setContactTel(dto.getEmergencyTel());
|
||||
employeesOrg.setContactRelationship(dto.getEmergencyRelationship());
|
||||
employeesOrg.setHukouType(dto.getHukouNature());
|
||||
employeesOrg.setBankZmPath(dto.getBankPositive());
|
||||
employeesOrg.setBankFmPath(dto.getBankNegative());
|
||||
employeesOrg.setOpeningBank(dto.getOpeningBank());
|
||||
employeesOrg.setBankCard(dto.getBankCard());
|
||||
employeesOrg.setHealthZmPath(dto.getHealthCertificatePositive());
|
||||
employeesOrg.setHealthFmPath(dto.getHealthCertificateNegative());
|
||||
employeesOrg.setQualificationPath(dto.getQualification());
|
||||
employeesOrg.setNoCrimeCertificate(dto.getNoCrimeCertificate());
|
||||
employeesOrg.setCurrentAddress(dto.getCurrentAddress());
|
||||
|
||||
baseMapper.insert(employeesOrg);
|
||||
return employeesOrg.getId();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ import com.nu.modules.weixin.utils.WechatMiniProgramUtils;
|
|||
import com.nu.utils.RabbitMQUtil;
|
||||
import org.apache.commons.compress.utils.Lists;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.jeecg.common.system.api.ISysBaseAPI;
|
||||
import org.jeecg.common.util.DateUtils;
|
||||
|
|
@ -223,6 +224,14 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
|
|||
return resultData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EmployeesAdvisoryInfoEntity queryEmployeeInfoById(String id){
|
||||
NuEmployeesAdvisoryInfo item = baseMapper.queryEmployeeInfoById(id);
|
||||
EmployeesAdvisoryInfoEntity entity = new EmployeesAdvisoryInfoEntity();
|
||||
BeanUtils.copyProperties(item, entity);
|
||||
return entity;
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证是否有变化
|
||||
*
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@
|
|||
|
||||
<select id="getOrgByOpenId" resultType="com.nu.modules.orgapplyinfo.entity.OrgAllInfo">
|
||||
select
|
||||
eo.id as id,
|
||||
d.id as orgId,
|
||||
d.depart_name,
|
||||
d.org_code,
|
||||
|
|
|
|||
|
|
@ -72,4 +72,15 @@ public class EmployeesInfoApi {
|
|||
}
|
||||
return Result.ok(employeesAdvisioryInfoApi.queryAuditInfo(openId, orgCode));
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id获取员工变更信息
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/queryEmployeeInfoById")
|
||||
public Result<EmployeesAdvisoryInfoEntity> queryEmployeeInfoById(@RequestParam("id") String id) {
|
||||
return Result.ok(employeesAdvisioryInfoApi.queryEmployeeInfoById(id));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -131,6 +131,12 @@ public class EmployeesAdvisoryInfoEntity implements Serializable {
|
|||
private String applyStatus;
|
||||
|
||||
private String auditContent;
|
||||
|
||||
/**变更申请日期*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date auditTime;
|
||||
|
||||
/**
|
||||
* 现住址
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -67,6 +67,8 @@ public class EmployeesApplyEntity implements Serializable {
|
|||
private String idCardPositive;
|
||||
/**身份证反面*/
|
||||
private String idCardNegative;
|
||||
/**签发机关*/
|
||||
private String issuingAuthority;
|
||||
/**健康证正面*/
|
||||
private String healthCertificatePositive;
|
||||
/**健康证反面*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue