Skip to content

Y
yifu-mvp
Commit 0cf18f1a authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 50c4bf3a 0f1f981b
Show whitespace changes
Inline Side-by-side
Showing with 169 additions and 29 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @ 0cf18f1a
......@@ -336,5 +336,11 @@ public class TEmployeeInfo extends BaseEntity {
@Schema(description = "离职备注")
private String leaveRemark;
/**
* 通信地址
*/
@Schema(description = "通信地址")
private String contactAddress;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeLog.java
View file @ 0cf18f1a
......@@ -24,6 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
/**
......@@ -64,28 +65,19 @@ public class TEmployeeLog extends BaseEntity {
private String projectId;
/**
* 创建人id
* 原来的信息
*/
@Schema(description = "创建人id")
private String createBy;
/**
* 创建人姓名
*/
@Schema(description = "创建人姓名")
private String createName;
@Schema(description = "原来的信息")
private String oldInfo;
/**
* 创建时间
* 新的信息
*/
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "新的信息")
private String newInfo;
/**
* 变更内容
* 差异的信息
*/
@Schema(description = "变更内容")
private String content;
@Schema(description = "差异的信息")
private String differenceInfo;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeInfoMapper.java
View file @ 0cf18f1a
......@@ -36,9 +36,9 @@ import java.util.List;
@Mapper
public interface TEmployeeInfoMapper extends BaseMapper<TEmployeeInfo> {
IPage<TEmployeeInfo> getPage(Page<TEmployeeInfo> page, @Param("employeeInfo") TEmployeeInfo employeeInfo, @Param("sql") String sql);
IPage<TEmployeeInfo> getPage(Page<TEmployeeInfo> page, @Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo, @Param("sql") String sql);
List<TEmployeeInfo> getList(@Param("employeeInfo") TEmployeeInfo employeeInfo);
List<TEmployeeInfo> getList(@Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo);
int updateEducationOfEmp(@Param("education") EmpEducationUpdateVo education);
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @ 0cf18f1a
......@@ -72,6 +72,7 @@
<result property="leaveTime" column="LEAVE_TIME"/>
<result property="leaveReason" column="LEAVE_REASON"/>
<result property="leaveRemark" column="LEAVE_REMARK"/>
<result property="contactAddress" column="CONTACT_ADDRESS"/>
</resultMap>
<sql id="baseParam">
......@@ -122,7 +123,8 @@
a.LEAVE_USER,
a.LEAVE_TIME,
a.LEAVE_REASON,
a.LEAVE_REMARK
a.LEAVE_REMARK,
a.CONTACT_ADDRESS
</sql>
<update id="updateEducationOfEmp">
......@@ -139,15 +141,153 @@
</update>
<sql id="employeeInfo_where">
<if test="employeeInfo != null">
<if test="employeeInfo.id != null and employeeInfo.id.trim() != ''">
AND a.id = #{employeeInfo.id}
<if test="tEmployeeInfo != null">
<if test="tEmployeeInfo.id != null and tEmployeeInfo.id.trim() != ''">
AND a.ID = #{tEmployeeInfo.id}
</if>
<if test="employeeInfo.empName != null and employeeInfo.empName.trim() != ''">
AND a.EMP_NAME = #{employeeInfo.empName}
<if test="tEmployeeInfo.empCode != null and tEmployeeInfo.empCode.trim() != ''">
AND a.EMP_CODE = #{tEmployeeInfo.empCode}
</if>
<if test="employeeInfo.empIdcard != null and employeeInfo.empIdcard.trim() != ''">
AND a.EMP_IDCARD = #{employeeInfo.empIdcard}
<if test="tEmployeeInfo.empNatrue != null and tEmployeeInfo.empNatrue.trim() != ''">
AND a.EMP_NATRUE = #{tEmployeeInfo.empNatrue}
</if>
<if test="tEmployeeInfo.empName != null and tEmployeeInfo.empName.trim() != ''">
AND a.EMP_NAME = #{tEmployeeInfo.empName}
</if>
<if test="tEmployeeInfo.empIdcard != null and tEmployeeInfo.empIdcard.trim() != ''">
AND a.EMP_IDCARD = #{tEmployeeInfo.empIdcard}
</if>
<if test="tEmployeeInfo.validityStart != null">
AND a.VALIDITY_START = #{tEmployeeInfo.validityStart}
</if>
<if test="tEmployeeInfo.validityEnd != null">
AND a.VALIDITY_END = #{tEmployeeInfo.validityEnd}
</if>
<if test="tEmployeeInfo.empSex != null and tEmployeeInfo.empSex.trim() != ''">
AND a.EMP_SEX = #{tEmployeeInfo.empSex}
</if>
<if test="tEmployeeInfo.empBirthday != null">
AND a.EMP_BIRTHDAY = #{tEmployeeInfo.empBirthday}
</if>
<if test="tEmployeeInfo.empAge != null">
AND a.EMP_AGE = #{tEmployeeInfo.empAge}
</if>
<if test="tEmployeeInfo.empMarriStatus != null and tEmployeeInfo.empMarriStatus.trim() != ''">
AND a.EMP_MARRI_STATUS = #{tEmployeeInfo.empMarriStatus}
</if>
<if test="tEmployeeInfo.empNational != null and tEmployeeInfo.empNational.trim() != ''">
AND a.EMP_NATIONAL = #{tEmployeeInfo.empNational}
</if>
<if test="tEmployeeInfo.politicalStatus != null and tEmployeeInfo.politicalStatus.trim() != ''">
AND a.POLITICAL_STATUS = #{tEmployeeInfo.politicalStatus}
</if>
<if test="tEmployeeInfo.empEmail != null and tEmployeeInfo.empEmail.trim() != ''">
AND a.EMP_EMAIL = #{tEmployeeInfo.empEmail}
</if>
<if test="tEmployeeInfo.empPhone != null and tEmployeeInfo.empPhone.trim() != ''">
AND a.EMP_PHONE = #{tEmployeeInfo.empPhone}
</if>
<if test="tEmployeeInfo.idProvince != null">
AND a.ID_PROVINCE = #{tEmployeeInfo.idProvince}
</if>
<if test="tEmployeeInfo.idCity != null">
AND a.ID_CITY = #{tEmployeeInfo.idCity}
</if>
<if test="tEmployeeInfo.idTown != null">
AND a.ID_TOWN = #{tEmployeeInfo.idTown}
</if>
<if test="tEmployeeInfo.empRegisType != null and tEmployeeInfo.empRegisType.trim() != ''">
AND a.EMP_REGIS_TYPE = #{tEmployeeInfo.empRegisType}
</if>
<if test="tEmployeeInfo.fileProvince != null">
AND a.FILE_PROVINCE = #{tEmployeeInfo.fileProvince}
</if>
<if test="tEmployeeInfo.fileCity != null">
AND a.FILE_CITY = #{tEmployeeInfo.fileCity}
</if>
<if test="tEmployeeInfo.fileTown != null">
AND a.FILE_TOWN = #{tEmployeeInfo.fileTown}
</if>
<if test="tEmployeeInfo.isCollege != null">
AND a.IS_COLLEGE = #{tEmployeeInfo.isCollege}
</if>
<if test="tEmployeeInfo.hignEducation != null and tEmployeeInfo.hignEducation.trim() != ''">
AND a.HIGN_EDUCATION = #{tEmployeeInfo.hignEducation}
</if>
<if test="tEmployeeInfo.school != null and tEmployeeInfo.school.trim() != ''">
AND a.SCHOOL = #{tEmployeeInfo.school}
</if>
<if test="tEmployeeInfo.major != null and tEmployeeInfo.major.trim() != ''">
AND a.MAJOR = #{tEmployeeInfo.major}
</if>
<if test="tEmployeeInfo.admissionDate != null">
AND a.ADMISSION_DATE = #{tEmployeeInfo.admissionDate}
</if>
<if test="tEmployeeInfo.gradutionDate != null">
AND a.GRADUTION_DATE = #{tEmployeeInfo.gradutionDate}
</if>
<if test="tEmployeeInfo.remark != null and tEmployeeInfo.remark.trim() != ''">
AND a.REMARK = #{tEmployeeInfo.remark}
</if>
<if test="tEmployeeInfo.fileSource != null and tEmployeeInfo.fileSource.trim() != ''">
AND a.FILE_SOURCE = #{tEmployeeInfo.fileSource}
</if>
<if test="tEmployeeInfo.status != null">
AND a.STATUS = #{tEmployeeInfo.status}
</if>
<if test="tEmployeeInfo.fileStatus != null">
AND a.FILE_STATUS = #{tEmployeeInfo.fileStatus}
</if>
<if test="tEmployeeInfo.projectNum != null">
AND a.PROJECT_NUM = #{tEmployeeInfo.projectNum}
</if>
<if test="tEmployeeInfo.contractStatus != null">
AND a.CONTRACT_STATUS = #{tEmployeeInfo.contractStatus}
</if>
<if test="tEmployeeInfo.insuranceStatus != null">
AND a.INSURANCE_STATUS = #{tEmployeeInfo.insuranceStatus}
</if>
<if test="tEmployeeInfo.socialStatus != null">
AND a.SOCIAL_STATUS = #{tEmployeeInfo.socialStatus}
</if>
<if test="tEmployeeInfo.fundStatus != null">
AND a.FUND_STATUS = #{tEmployeeInfo.fundStatus}
</if>
<if test="tEmployeeInfo.salaryStatus != null">
AND a.SALARY_STATUS = #{tEmployeeInfo.salaryStatus}
</if>
<if test="tEmployeeInfo.deleteFlag != null and tEmployeeInfo.deleteFlag.trim() != ''">
AND a.DELETE_FLAG = #{tEmployeeInfo.deleteFlag}
</if>
<if test="tEmployeeInfo.createBy != null and tEmployeeInfo.createBy.trim() != ''">
AND a.CREATE_BY = #{tEmployeeInfo.createBy}
</if>
<if test="tEmployeeInfo.createName != null and tEmployeeInfo.createName.trim() != ''">
AND a.CREATE_NAME = #{tEmployeeInfo.createName}
</if>
<if test="tEmployeeInfo.createTime != null">
AND a.CREATE_TIME = #{tEmployeeInfo.createTime}
</if>
<if test="tEmployeeInfo.updateBy != null and tEmployeeInfo.updateBy.trim() != ''">
AND a.UPDATE_BY = #{tEmployeeInfo.updateBy}
</if>
<if test="tEmployeeInfo.updateTime != null">
AND a.UPDATE_TIME = #{tEmployeeInfo.updateTime}
</if>
<if test="tEmployeeInfo.leaveUser != null and tEmployeeInfo.leaveUser.trim() != ''">
AND a.LEAVE_USER = #{tEmployeeInfo.leaveUser}
</if>
<if test="tEmployeeInfo.leaveTime != null">
AND a.LEAVE_TIME = #{tEmployeeInfo.leaveTime}
</if>
<if test="tEmployeeInfo.leaveReason != null and tEmployeeInfo.leaveReason.trim() != ''">
AND a.LEAVE_REASON = #{tEmployeeInfo.leaveReason}
</if>
<if test="tEmployeeInfo.leaveRemark != null and tEmployeeInfo.leaveRemark.trim() != ''">
AND a.LEAVE_REMARK = #{tEmployeeInfo.leaveRemark}
</if>
<if test="tEmployeeInfo.contactAddress != null and tEmployeeInfo.contactAddress.trim() != ''">
AND a.CONTACT_ADDRESS = #{tEmployeeInfo.contactAddress}
</if>
</if>
</sql>
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeLogMapper.xml
View file @ 0cf18f1a
......@@ -31,6 +31,8 @@
<result property="createBy" column="CREATE_BY"/>
<result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="content" column="CONTENT"/>
<result property="oldInfo" column="OLD_INFO"/>
<result property="newInfo" column="NEW_INFO"/>
<result property="differenceInfo" column="DIFFERENCE_INFO"/>
</resultMap>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment