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

k8s-bash-test/yifu-archives-deployment.yaml

@@ -33,7 +33,7 @@ spec:                 # 资源规范字段
         #dapr.io/sidecar-memory-limit: "800Mi"	     #Dapr sidecar可以使用的最大内存量。默认情况下未设置 请参阅 https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/ 的有效值。
         #dapr.io/sidecar-cpu-request: 1	     #Dapr sidecar要求的 CPU 数量
         #dapr.io/sidecar-memory-request	     #Dapr sidecar 请求的内存数量
-        #dapr.io/http-max-request-size: "8MB"	     #增加http和grpc服务器请求正文参数的最大大小，单位为MB，以处理大文件的上传。 默认值为 4 MB
+        dapr.io/http-max-request-size: "100MB"	     #增加http和grpc服务器请求正文参数的最大大小，单位为MB，以处理大文件的上传。 默认值为 4 MB
         dapr.io/sidecar-listen-addresses: "0.0.0.0"
         # 更多dapr配置请参考 https://www.bookstack.cn/read/dapr-1.5-zh/cc77b74e2cc2f4d4.md
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java

@@ -40,7 +40,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -121,7 +120,7 @@ public class TEmployeeProjectController {
     @PutMapping
     @PreAuthorize("@pms.hasPermission('archives_temployeeproject_edit')" )
     public R updateById(@RequestBody TEmployeeProject tEmployeeProject) {
-        return R.ok(tEmployeeProjectService.updateById(tEmployeeProject));
+        return R.ok(tEmployeeProjectService.updateProject(tEmployeeProject));
     }
 
     /**

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

@@ -48,6 +48,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 
 	R saveEmp(TEmployeeProject tEmployeeProject);
 
+	R updateProject(TEmployeeProject tEmployeeProject);
+
 	/**
 	 * @param tEmployeeProject
 	 * @Description: 减项
@@ -97,8 +99,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 	List<TEmployeeProject> getListByEmpIdAndDeptNo(String empId, String deptNo);
 
 	/**
-	 * @param excelVOList
-	 * @param bindingResult
+	 * @param inputStream
 	 * @Description: 批量更新项目档案
 	 * @Author: huyc
 	 * @Date: 2022/6/21 10:30

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

@@ -108,7 +108,7 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
 		if (Common.isEmpty(emp)){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_NOT_EXIST));
 		}
-		if (CommonConstants.ONE_STRING.equals(emp.getFileStatus())){
+		if (CommonConstants.ONE_STRING.equals(Integer.toString(emp.getFileStatus()))){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 		}
 		// 检查添加是否已经存在

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

@@ -213,7 +213,8 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
 		if (Common.isEmpty(emp)){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_NOT_EXIST));
 		}
-		if (Common.isNotNull(emp.getFileStatus()) && CommonConstants.ONE_STRING.equals(emp.getFileStatus())){
+		if (Common.isNotNull(emp.getFileStatus())
+				&& CommonConstants.ONE_STRING.equals(Integer.toString(emp.getFileStatus()))){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 		}
 		// 检查添加是否已经存在
@@ -235,6 +236,7 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
 			}else {
 				updateVo.setIsCollege(CommonConstants.ONE_INT);
 			}
+			updateVo.setHighIdentification(updateVo.getEducationName());
 			employeeInfoMapper.updateEducationOfEmp(updateVo);
 			// 所有学历更新为非最高学历
 			baseMapper.updateHighIdentification(education.getEmpIdcard());

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

@@ -111,7 +111,7 @@ public class TEmpFamilyServiceImpl extends ServiceImpl<TEmpFamilyMapper, TEmpFam
 		if (Common.isEmpty(emp)){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_NOT_EXIST));
 		}
-		if (CommonConstants.ONE_STRING.equals(emp.getFileStatus())){
+		if (CommonConstants.ONE_STRING.equals(Integer.toString(emp.getFileStatus()))){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 
 		}

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

@@ -146,7 +146,7 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
 		if (Common.isEmpty(emp)){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_NOT_EXIST));
 		}
-		if (CommonConstants.ONE_STRING.equals(emp.getFileStatus())){
+		if (CommonConstants.ONE_STRING.equals(Integer.toString(emp.getFileStatus()))){
 			return new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 		}
 		// 检查添加是否已经存在

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

@@ -149,7 +149,7 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
 		if (Common.isEmpty(emp)){
 			return new com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_NOT_EXIST));
 		}
-		if (CommonConstants.ONE_STRING.equals(emp.getFileStatus())){
+		if (CommonConstants.ONE_STRING.equals(Integer.toString(emp.getFileStatus()))){
 			return new com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_REDUCED));
 		}
 		// 检查添加是否已经存在

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

@@ -109,6 +109,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 					return R.failed("姓名和身份证不一致，请确认后再次新增");
 				}
 			}
+			//项目编码校验
+			TSettleDomain tSettleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda()
+					.eq(TSettleDomain::getDepartNo,tEmployeeProject.getDeptNo())
+					.eq(TSettleDomain::getStopFlag,CommonConstants.ZERO_STRING)
+					.eq(TSettleDomain::getDeleteFlag,CommonConstants.ZERO_STRING));
+			if (Common.isEmpty(tSettleDomain)) {
+				return R.failed("未找到对应的项目，请核实");
+			}
+
 			//项目状态为已减项
 			if (CommonConstants.dingleDigitIntArray[1] == employeeProject.getProjectStatus()) {
 				if (!Common.isEmpty(tEmployeeInfo)) {
@@ -158,6 +167,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		return R.failed("未在人员档案中查到身份信息");
 	}
 
+	@Override
+	public R updateProject(TEmployeeProject tEmployeeProject) {
+		TEmployeeProject compareProject = this.getById(tEmployeeProject.getId());
+		boolean flag = this.updateById(tEmployeeProject);
+		tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1],"",tEmployeeProject.getId(),compareProject,tEmployeeProject);
+		return R.ok(flag);
+	}
+
 	@Override
 	public R reEmpInfo(JSONObject jsonObject) {
 		if (Common.isNotNull(jsonObject)) {