Commit ed150982 authored by wangzb's avatar wangzb

feature-wzb :退休提醒bug修复

parent e54977a2
...@@ -145,6 +145,14 @@ public class ArchivesConstants { ...@@ -145,6 +145,14 @@ public class ArchivesConstants {
* 处理状态 * 处理状态
*/ */
public static final String HANDLE_FLAG_TWO= "已处理-未处理"; public static final String HANDLE_FLAG_TWO= "已处理-未处理";
/**
* 处理状态
*/
public static final String HANDLE_FLAG_THREE= "未处理-未处理";
/**
* 处理状态
*/
public static final String HANDLE_FLAG_FOUR= "已处理-已处理";
public static final int MYEAR_MONTH=-717; public static final int MYEAR_MONTH=-717;
......
...@@ -93,7 +93,14 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper; ...@@ -93,7 +93,14 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
if (changeHandleFlagAllVo.getHandleFlag() == 0) { if (changeHandleFlagAllVo.getHandleFlag() == 0) {
tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagAllVo.getIds()[i]); tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagAllVo.getIds()[i]);
TEmployeeRetirement tEmployeeRetirement=tEmployeeRetirementMapper.selectById(changeHandleFlagAllVo.getIds()[i]);
if(tEmployeeRetirement.getHandleFlag()==0){
tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_THREE);
}
else {
tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_TWO); tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_TWO);
}
tEmployeeRetirementFlagDetail.setCreateBy(user.getId()); tEmployeeRetirementFlagDetail.setCreateBy(user.getId());
tEmployeeRetirementFlagDetail.setCreateName(user.getNickname()); tEmployeeRetirementFlagDetail.setCreateName(user.getNickname());
tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now()); tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now());
...@@ -103,7 +110,15 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper; ...@@ -103,7 +110,15 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
if (changeHandleFlagAllVo.getHandleFlag() == 1) { if (changeHandleFlagAllVo.getHandleFlag() == 1) {
tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagAllVo.getIds()[i]); tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagAllVo.getIds()[i]);
TEmployeeRetirement tEmployeeRetirement=tEmployeeRetirementMapper.selectById(changeHandleFlagAllVo.getIds()[i]);
if(tEmployeeRetirement.getHandleFlag()==1){
tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_FOUR);
}
else {
tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_ONE); tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_ONE);
}
tEmployeeRetirementFlagDetail.setCreateBy(user.getId()); tEmployeeRetirementFlagDetail.setCreateBy(user.getId());
tEmployeeRetirementFlagDetail.setCreateName(user.getNickname()); tEmployeeRetirementFlagDetail.setCreateName(user.getNickname());
tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now()); tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now());
......
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