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

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

@@ -702,7 +702,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 					.eq(TEmployeeProject::getDeptNo, excel.getDeptNo())
 					.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL));
 			if (Common.isEmpty(tEmployeeProject)) {
-				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.CHECKS_EMP_EXIT_ERROR)));
+				if (tEmployeeProject.getProjectStatus() != CommonConstants.dingleDigitIntArray[0]) {
+					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.CHECKS_EMP_DELETE_ERROR)));
+				} else {
+					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.CHECKS_EMP_EXIT_ERROR)));
+				}
 			}
 
 			// 数据合法情况
@@ -845,17 +849,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		//获取记录
 		list = gettEmpProInfoExportVos(idstr, projectDTO);
 
-		if (Common.isNotNull(list)) {
-			ExcelUtil<EmployeeProjectExportVO> util = new ExcelUtil<>(EmployeeProjectExportVO.class);
-			for (EmployeeProjectExportVO vo : list) {
-				util.convertEntity(vo, null, null, null);
-			}
-		}
-
 		ServletOutputStream out = null;
 		try {
 			if (list.size() > 0) {
 				out = response.getOutputStream();
+				ExcelUtil<EmployeeProjectExportVO> util = new ExcelUtil<>(EmployeeProjectExportVO.class);
+				for (EmployeeProjectExportVO vo : list) {
+					util.convertEntity(vo, null, null, null);
+				}
 				response.setContentType("multipart/form-data");
 				response.setCharacterEncoding("utf-8");
 				response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -225,7 +225,10 @@ public interface ErrorCodes {
 	 * 人员不在该项目，无法更新
 	 */
 	String CHECKS_EMP_EXIT_ERROR = "checks.emp.exit.error";
-
+	/**
+	 * 人员已减项，无法更新
+	 */
+	String CHECKS_EMP_DELETE_ERROR = "checks.emp.delete.error";
 	// 该人员已存在，禁止重复添加
 	String ARCHIVES_IMPORT_EMP_IDCARD_EXISTING = "archives.import.emp.idCard.existing";
 

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -61,6 +61,7 @@ checks.reduce.project.error=\u5B58\u5728\u5DF2\u51CF\u9879\u7684\u9879\u76EE\uFF
 checks.exit.empproject.error=\u8BE5\u4EBA\u5458\u6682\u65E0\u6863\u6848\u4FE1\u606F\uFF0C\u8BF7\u5148\u81F3\u201C\u5728\u6863\u4EBA\u5458\u201D\u5904\u5EFA\u6863
 
 checks.emp.exit.error=\u4EBA\u5458\u4E0D\u5728\u8BE5\u9879\u76EE\uFF0C\u65E0\u6CD5\u66F4\u65B0
+checks.emp.delete.error=\u4EBA\u5458\u5DF2\u51CF\u9879\uFF0C\u65E0\u6CD5\u66F4\u65B0
 checks.project.delete.error=\u9879\u76EE\u6863\u6848\u72B6\u6001\u4E3A\u5DF2\u5BA1\u6838\uFF0C\u7981\u6B62\u5220\u9664
 
 archives.emp.certificate.name.existing=\u8BE5\u5458\u5DE5\u5DF2\u5B58\u5728\u5BF9\u5E94\u8D44\u683C\u7C7B\u578B\u548C\u8D44\u683C\u7B49\u7EA7\u7684\u8BC1\u4E66