Skip to content

Y
yifu-mvp
Commit ac396eed authored by huyuchen's avatar huyuchen
Browse files
Options

huyc 项目档案代码提交

parent 6df3d22d
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 15 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectUpdateVO.java
View file @ ac396eed
...@@ -115,7 +115,7 @@ public class EmployeeProjectUpdateVO extends RowIndex implements Serializable { ...@@ -115,7 +115,7 @@ public class EmployeeProjectUpdateVO extends RowIndex implements Serializable {
/** /**
* 入职日期 * 入职日期
*/ */
@ExcelAttribute(name = "入职日期",maxLength = 4) @ExcelAttribute(name = "入职日期")
@ExcelProperty(value ="入职日期") @ExcelProperty(value ="入职日期")
@Past @Past
@DateTimeFormat("yyyy-MM-dd") @DateTimeFormat("yyyy-MM-dd")
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @ ac396eed
...@@ -660,21 +660,23 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -660,21 +660,23 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (CollUtil.isEmpty(errorMessageList)) { if (CollUtil.isEmpty(errorMessageList)) {
updateExcelProj(excel, updateList, tEmployeeProject); updateExcelProj(excel, updateList, tEmployeeProject);
if (!excel.getEmpNatrue().equals(tEmployeeProject.getEmpNatrue())) { if (Common.isNotNull(excel.getEmpNatrue())) {
TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda() if (!excel.getEmpNatrue().equals(tEmployeeProject.getEmpNatrue())) {
.eq(TEmployeeInfo::getEmpIdcard, excel.getEmpIdcard()) TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
.eq(TEmployeeInfo::getFileStatus, CommonConstants.ZERO_INT) .eq(TEmployeeInfo::getEmpIdcard, excel.getEmpIdcard())
.eq(TEmployeeInfo::getDeleteFlag, CommonConstants.STATUS_NORMAL)); .eq(TEmployeeInfo::getFileStatus, CommonConstants.ZERO_INT)
if (Common.isNotNull(tEmployeeInfo)) { .eq(TEmployeeInfo::getDeleteFlag, CommonConstants.STATUS_NORMAL));
TEmployeeInfo tEmployeeInfoCof = tEmployeeInfoMapper.selectById(tEmployeeInfo.getId()); if (Common.isNotNull(tEmployeeInfo)) {
String empNature = tEmployeeInfo.getEmpNatrue(); TEmployeeInfo tEmployeeInfoCof = tEmployeeInfoMapper.selectById(tEmployeeInfo.getId());
if (CommonConstants.ZERO_STRING.equals(excel.getEmpNatrue())) { String empNature = tEmployeeInfo.getEmpNatrue();
tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING); if (CommonConstants.ZERO_STRING.equals(excel.getEmpNatrue())) {
} else if (CommonConstants.ONE_STRING.equals(excel.getEmpNatrue()) && !CommonConstants.ZERO_STRING.equals(empNature)) { tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING); } else if (CommonConstants.ONE_STRING.equals(excel.getEmpNatrue()) && !CommonConstants.ZERO_STRING.equals(empNature)) {
tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
}
tEmployeeInfoMapper.updateById(tEmployeeInfo);
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(), "", tEmployeeInfoCof, tEmployeeInfo);
} }
tEmployeeInfoMapper.updateById(tEmployeeInfo);
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(), "", tEmployeeInfoCof, tEmployeeInfo);
} }
} }
} }
......
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