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: "100MB"	     #增加http和grpc服务器请求正文参数的最大大小，单位为MB，以处理大文件的上传。 默认值为 4 MB
+        dapr.io/http-max-request-size: "100"	     #增加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-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddContractTemplateFile.java

@@ -32,9 +32,9 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @TableName("fdd_contract_template_file")
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode()
 @Schema(description = "法大大员工合同模板文件表")
-public class FddContractTemplateFile extends BaseEntity {
+public class FddContractTemplateFile {
 
     /**
      * 主键

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

@@ -173,6 +173,19 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	public R updateProject(TEmployeeProject tEmployeeProject) {
 		TEmployeeProject compareProject = this.getById(tEmployeeProject.getId());
 		boolean flag = this.updateById(tEmployeeProject);
+		TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
+				.eq(TEmployeeInfo::getEmpIdcard, tEmployeeProject.getEmpIdcard())
+				.eq(TEmployeeInfo::getDeleteFlag, CommonConstants.STATUS_NORMAL));
+		if (Common.isNotNull(tEmployeeInfo)) {
+			TEmployeeInfo tEmployeeInfoCompare = tEmployeeInfoMapper.selectById(tEmployeeInfo.getId());
+			if (CommonConstants.ZERO_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+				tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
+			} else if (CommonConstants.ONE_STRING.equals(tEmployeeInfo.getEmpNatrue()) && !CommonConstants.ZERO_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+				tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
+			}
+			tEmployeeInfoMapper.updateById(tEmployeeInfo);
+			tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], tEmployeeInfoCompare.getId(), "", tEmployeeInfoCompare, tEmployeeInfo);
+		}
 		tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1],"",tEmployeeProject.getId(),compareProject,tEmployeeProject);
 		return R.ok(flag);
 	}
@@ -215,27 +228,28 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 	@Override
 	public R deleteEmpPro(TEmployeeProject tEmployeeProject) {
-		TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
-		TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
-		if (Common.isNotNull(tEmployeeProject)) {
-			TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
-			if (tEmployeeProject.getIsLeaveEmployee()== CommonConstants.dingleDigitIntArray[1]) {
-				Long count = this.count(Wrappers.<TEmployeeProject>query().lambda()
-						.eq(TEmployeeProject::getEmpId,tEmployeeProject.getEmpId())
-						.eq(TEmployeeProject::getProjectStatus,CommonConstants.dingleDigitIntArray[0]));
-				if (count.compareTo(CommonConstants.DEPT_TREE_ROOT_ID) >0) {
-					return R.failed("人员在该项目下存在进行中/未完结的服务");
+		Long count = this.count(Wrappers.<TEmployeeProject>query().lambda()
+				.eq(TEmployeeProject::getId,tEmployeeProject.getId())
+				.eq(TEmployeeProject::getInsuranceStatus,CommonConstants.dingleDigitIntArray[0])
+				.eq(TEmployeeProject::getSocialStatus,CommonConstants.dingleDigitIntArray[0])
+				.eq(TEmployeeProject::getFundStatus,CommonConstants.dingleDigitIntArray[0]));
+		if (count == CommonConstants.ONE_INT) {
+			TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
+			TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
+			if (Common.isNotNull(tEmployeeProject)) {
+				TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
+				if (tEmployeeProject.getIsLeaveEmployee() == CommonConstants.dingleDigitIntArray[1]) {
+					tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
+					tEmployeeInfoMapper.updateById(tEmployeeInfo);
 				}
-				tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
-				tEmployeeInfoMapper.updateById(tEmployeeInfo);
+				tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]);
+				this.updateById(tEmployeeProject);
+				tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(), "", tEmployeeProjectOld, tEmployeeInfo);
+				tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProject.getId(), tEmployeeInfoOld, tEmployeeProject);
+				return R.ok();
 			}
-			tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]);
-			this.updateById(tEmployeeProject);
-			tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0],tEmployeeInfo.getId(),"",tEmployeeProjectOld,tEmployeeInfo);
-			tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1],"",tEmployeeProject.getId(),tEmployeeInfoOld,tEmployeeProject);
-			return R.ok();
 		}
-		return R.failed("传参为空！");
+		return R.failed("人员在该项目下存在进行中/未完结的服务");
 	}
 
 	@Override