feature-wzb:退休人员bug修复

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeRetirementExportVo.java

@@ -168,9 +168,9 @@ public class TEmployeeRetirementExportVo{
 	 * 项目编码
 	 */
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("客户编码")
-	@ExcelAttribute(name = "客户编码")
-	@Schema(description = "客户编码")
+	@ExcelProperty("项目编码")
+	@ExcelAttribute(name = "项目编码")
+	@Schema(description = "项目编码")
 	private String deptNo;
 
 	/**

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

@@ -93,7 +93,7 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 			if (changeHandleFlagAllVo.getHandleFlag() == 0) {
 
 				tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagAllVo.getIds()[i]);
-				tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_ONE);
+				tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_TWO);
 				tEmployeeRetirementFlagDetail.setCreateBy(user.getId());
 				tEmployeeRetirementFlagDetail.setCreateName(user.getNickname());
 				tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now());
@@ -103,7 +103,7 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 			if (changeHandleFlagAllVo.getHandleFlag() == 1) {
 
 				tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagAllVo.getIds()[i]);
-				tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_TWO);
+				tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_ONE);
 				tEmployeeRetirementFlagDetail.setCreateBy(user.getId());
 				tEmployeeRetirementFlagDetail.setCreateName(user.getNickname());
 				tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now());
@@ -122,7 +122,7 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 		TEmployeeRetirementFlagDetail tEmployeeRetirementFlagDetail = new TEmployeeRetirementFlagDetail();
 		if(changeHandleFlagVo.getHandleFlag()==0){
 			tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagVo.getId());
-			tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_ONE);
+			tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_TWO);
 			tEmployeeRetirementFlagDetail.setCreateBy(user.getId());
 			tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now());
 			tEmployeeRetirementFlagDetail.setCreateName(user.getNickname());
@@ -130,7 +130,7 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 		}
 		if(changeHandleFlagVo.getHandleFlag()==1){
 			tEmployeeRetirementFlagDetail.setDatailId(changeHandleFlagVo.getId());
-			tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_TWO);
+			tEmployeeRetirementFlagDetail.setContext(ArchivesConstants.HANDLE_FLAG_ONE);
 			tEmployeeRetirementFlagDetail.setCreateBy(user.getId());
 			tEmployeeRetirementFlagDetail.setCreateTime(DateTime.now());
 			tEmployeeRetirementFlagDetail.setCreateName(user.getNickname());

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementFlagDetailMapper.xml

@@ -25,5 +25,6 @@
        SELECT a.ID,a.DATAIL_ID,a.CREATE_NAME,a.CREATE_BY,a.CREATE_TIME,a.CONTEXT
        FROM t_employee_retirement_flag_detail a
        where a.DATAIL_ID=#{id}
+	   ORDER BY a.CREATE_TIME DESC
 	</select>
 </mapper>