优化修改

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

@@ -446,8 +446,8 @@ public class EmployeeProjectExportVO {
 	 */
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="项目档案状态")
-	@ExcelAttribute(name = "项目档案状态", isDataId = true,readConverterExp = "0=正常,1=已减项")
-	private Integer projectStatus;
+	@ExcelAttribute(name = "项目档案状态")
+	private String projectStatus;
 
 	 /**
 	 * 项目档案创建人

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

@@ -151,12 +151,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 		if (null == tEmployeeInfo || tEmployeeProject == null) {
 			return R.failed(EMPINFO_IS_NOT_EXITS_BYID);
 		}
-		TSettleDomain settleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda()
-				.eq(TSettleDomain::getDepartNo, tEmployeeContractInfo.getDeptNo())
-				.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
-				.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING));
-		if (Common.isEmpty(settleDomain)) {
-			return R.failed(EmployeeConstants.EMP_DISPATCH_SETTLEDOMAIN_STOP);
+
+		if (!(ArchivesConstants.contractSituation[0].equals(tEmployeeContractInfo.getSituation()) ||
+				ArchivesConstants.contractSituation[6].equals(tEmployeeContractInfo.getSituation()))) {
+			TSettleDomain settleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda()
+					.eq(TSettleDomain::getDepartNo, tEmployeeContractInfo.getDeptNo())
+					.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
+					.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING));
+			if (Common.isEmpty(settleDomain)) {
+				return R.failed(EmployeeConstants.EMP_DISPATCH_SETTLEDOMAIN_STOP);
+			}
 		}
 		YifuUser user = SecurityUtils.getUser();
 		if (user == null || Common.isEmpty(user.getId())) {
@@ -963,6 +967,14 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						insert.setContractEnd(contractInfo.getContractEnd());
 					}
 				} else {
+					TSettleDomain settleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda()
+							.eq(TSettleDomain::getDepartNo, insert.getDeptNo())
+							.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
+							.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING));
+					if (Common.isEmpty(settleDomain)) {
+						errorMessageList.add(new ErrorMessage(excel.getRowIndex(), EmployeeConstants.EMP_DISPATCH_SETTLEDOMAIN_STOP));
+						return;
+					}
 					// 2022-9-28 16:59:57 徐梅说产品在验收时，业务说已完成一定任务的也不必填
 					if (EmployeeConstants.CONTRACT_TYPE_ONE.equals(insert.getContractType())
 							&& Common.isEmpty(insert.getContractEnd())) {

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

@@ -60,6 +60,7 @@
 
 	<resultMap id="tEmployeeProjectExportMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO">
 		<result property="empCode" column="EMP_CODE"/>
+		<result property="projectStatus" column="PROJECT_STATUS"/>
 		<result property="proEmpNatrue" column="PROEMP_NATRUE"/>
 		<result property="empNatrue" column="EMP_NATRUE"/>
 		<result property="empName" column="EMP_NAME"/>
@@ -223,7 +224,7 @@
 				  b.ADMISSION_DATE,
 				  b.GRADUTION_DATE,
 				  b.REMARK,
-				  if(a.STATUS=0,'草稿','已审核') STATUS,
+				  if(a.PROJECT_STATUS=0,'正常','已减项') PROJECT_STATUS,
 				  a.CREATE_NAME,
 				  a.CREATE_TIME,
 				  b.EMP_EMAIL,