feature-wzb :退休提醒bug修复

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/ArchivesConstants.java

@@ -145,6 +145,14 @@ public class ArchivesConstants {
 	 * 处理状态
 	 */
 	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;
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeRetirementServiceImpl.java

@@ -93,7 +93,14 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 			if (changeHandleFlagAllVo.getHandleFlag() == 0) {
 
 				tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagAllVo.getIds()[i]);
-				tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_TWO);
+			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.setCreateBy(user.getId());
 				tEmployeeRetirementFlagDetail.setCreateName(user.getNickname());
 				tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now());
@@ -103,7 +110,15 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 			if (changeHandleFlagAllVo.getHandleFlag() == 1) {
 
 				tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagAllVo.getIds()[i]);
-				tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_ONE);
+				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.setCreateBy(user.getId());
 				tEmployeeRetirementFlagDetail.setCreateName(user.getNickname());
 				tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now());