Commit 4016e023 authored by fangxinjiang's avatar fangxinjiang

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

parents fe61168e c0c54e02
......@@ -112,18 +112,18 @@ public class TEmployeeContractInfo extends BaseEntity {
@Schema(description = "合同到期时间", name = "contractEnd")
private LocalDate contractEnd;
/**
* 合同主体部门
* 项目名称
*/
@Length(max = 128, message = "合同主体部门不能超过128个字符")
@ExcelAttribute(name = "合同主体部门", maxLength = 128)
@Schema(description = "合同主体部门deptName", name = "subjectDepart")
@Length(max = 128, message = "项目名称不能超过128个字符")
@ExcelAttribute(name = "项目名称", maxLength = 128)
@Schema(description = "项目名称", name = "subjectDepart")
private String subjectDepart;
/**
* 合同主体单位
* 客户名称
*/
@Length(max = 128, message = "合同主体单位不能超过128个字符")
@ExcelAttribute(name = "合同主体单位", maxLength = 128)
@Schema(description = "合同主体单位unitName", name = "subjectUnit")
@Length(max = 128, message = "客户名称不能超过128个字符")
@ExcelAttribute(name = "客户名称", maxLength = 128)
@Schema(description = "客户名称", name = "subjectUnit")
private String subjectUnit;
/**
* 签订情况
......
......@@ -562,7 +562,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
// 性别
if (idCard.length() > 17) {
if (Integer.parseInt(idCard.substring(16, 1)) % 2 == 1) {
if (Integer.parseInt(idCard.substring(16, 17)) % 2 == 1) {
employeeInfo.setEmpSex(CommonConstants.SEX_MAN);
} else {
employeeInfo.setEmpSex(CommonConstants.SEX_WONMAN);
......@@ -784,7 +784,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
checkPhone.setEmpPhone(excel.getEmpPhone());
phoneEmpList = baseMapper.getList(checkPhone);
if (phoneEmpList != null && !phoneEmpList.isEmpty()) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_PHONE_EXIST_ERROR, existEmp.getEmpIdcard()));
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_PHONE_EXIST_ERROR, excel.getEmpIdcard()));
}
existEmp = existPhoneMap.get(excel.getEmpPhone());
......
......@@ -123,10 +123,7 @@
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME,
a.UNIT_ID,
a.UNIT_NAME,
a.UNIT_NO,
a.DEPT_NAME,
a.DEPT_NO,
a.AUDIT_STATUS,
a.APPLY_NO,
......@@ -273,18 +270,11 @@
AND a.UPDATE_TIME = #{tEmployeeContractInfo.updateTime}
</if>
<if test="tEmployeeContractInfo.unitId != null and tEmployeeContractInfo.unitId.trim() != ''">
AND a.UNIT_ID = #{tEmployeeContractInfo.unitId}
</if>
<if test="tEmployeeContractInfo.unitName != null and tEmployeeContractInfo.unitName.trim() != ''">
AND a.UNIT_NAME like concat('%',#{tEmployeeContractInfo.unitName},'%')
</if>
<if test="tEmployeeContractInfo.unitNo != null and tEmployeeContractInfo.unitNo.trim() != ''">
AND a.UNIT_NO = #{tEmployeeContractInfo.unitNo}
</if>
<if test="tEmployeeContractInfo.deptName != null and tEmployeeContractInfo.deptName.trim() != ''">
AND a.DEPT_NAME like concat('%',#{tEmployeeContractInfo.deptName},'%')
</if>
<if test="tEmployeeContractInfo.deptNo != null and tEmployeeContractInfo.deptNo.trim() != ''">
AND a.DEPT_NO = #{tEmployeeContractInfo.deptNo}
</if>
......
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