优化修改

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

@@ -516,7 +516,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			}
 		} else {
 			// 标准合同、劳动派遣合同、其他。————社保公积金都派减，自动审核通过
-			this.judgeAuditStatus(tEmployeeContractInfo, user);
+			this.judgeAuditStatus1(tEmployeeContractInfo, user);
 			baseMapper.updateById(tEmployeeContractInfo);
 
 		}
@@ -1306,8 +1306,28 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 							&& Common.isNotNull(insert.getChangeContractAndEmployee())
 							&& CommonConstants.ZERO_STRING.equals(insert.getChangeContractAndEmployee())) {
 						changeStatus(insert, user);
-						baseMapper.updateById(insert);
 					}
+					baseMapper.updateById(insert);
+				}
+			}
+		}
+	}
+
+	private void judgeAuditStatus1(TEmployeeContractInfo insert, YifuUser user) {
+		if (insert.getAuditStatus() == CommonConstants.ONE_INT
+				&& (EmployeeConstants.CONTRACT_NAME[0].equals(insert.getContractName())
+				|| EmployeeConstants.CONTRACT_NAME[1].equals(insert.getContractName())
+				|| EmployeeConstants.CONTRACT_NAME[2].equals(insert.getContractName()))) {
+			TSocialFundInfo sf = new TSocialFundInfo();
+			sf.setEmpIdcard(insert.getEmpIdcard());
+			sf.setSettleDomain(insert.getSettleDomain());
+			if (!("合同未到期重新签订").equals(insert.getSituation())&&!("正常续签").equals(insert.getSituation())
+					&&!("离职再入职").equals(insert.getSituation()) &&!("商务合同更改").equals(insert.getSituation())) {
+				R<Integer> socialFundR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
+						, "/tsocialfundinfo/inner/selectSocialFoundByContract", sf, Integer.class, SecurityConstants.FROM_IN);
+				if (socialFundR != null && socialFundR.getData() != null && socialFundR.getData() > 0) {
+					insert.setAuditStatus(CommonConstants.TWO_INT);
+					insert.setAuditUserName(user.getNickname());
 				}
 			}
 		}