diff --git a/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java b/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java
index fa7bbeb..cd4d192 100644
--- a/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java
+++ b/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java
@@ -1,6 +1,7 @@
package com.weaver.seconddev.portal.entity.param;
import lombok.Data;
+import org.apache.commons.lang.StringUtils;
/**
* @author:dxfeng
@@ -17,4 +18,12 @@ public class BaseParam {
private String table_dept_cus = "ft_1154218872715993098";
private String tenantKey;
+
+ public String getTenantKey() {
+ if (StringUtils.isBlank(tenantKey)) {
+ // 租户默认值
+ return "t024j0gfn0";
+ }
+ return tenantKey;
+ }
}
diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/EteamsBaseMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/EteamsBaseMapper.java
new file mode 100644
index 0000000..27ef9c7
--- /dev/null
+++ b/src/main/java/com/weaver/seconddev/portal/mapper/EteamsBaseMapper.java
@@ -0,0 +1,33 @@
+package com.weaver.seconddev.portal.mapper;
+
+import com.weaver.common.form.metadata.field.FormField;
+import com.weaver.seconddev.portal.entity.param.BaseParam;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2025/07/18
+ * @version: 1.0
+ */
+@Mapper
+public interface EteamsBaseMapper {
+ /**
+ * 根据表名获取表ID
+ *
+ * @param param
+ * @param tableName
+ * @return
+ */
+ long getFormIdByTableName(@Param("param") BaseParam param, @Param("tableName") String tableName);
+
+ /**
+ * 根据表ID和字段名获取字段信息
+ *
+ * @param param
+ * @param formId
+ * @param fieldName
+ * @return
+ */
+ FormField getFormFieldByFieldName(@Param("param") BaseParam param, @Param("formId") long formId, @Param("fieldName") String fieldName);
+}
diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java
index 8ca0cdf..8be6b6c 100644
--- a/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java
+++ b/src/main/java/com/weaver/seconddev/portal/service/impl/HrbpPortalServiceImpl.java
@@ -60,10 +60,10 @@ public class HrbpPortalServiceImpl implements HrbpPortalService {
// 待离职
map.put("leave", toLeaveCount);
map.put("leaveUrl", urlMap.get("leave"));
- //TODO 待签订
+ // 待签订
map.put("sign", toSignCount);
map.put("signUrl", urlMap.get("sign"));
- //TODO 代理期转正
+ // 代理期转正
map.put("proxy", toProxyCount);
map.put("proxyUrl", urlMap.get("proxy"));
return WeaResult.success(map);
diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/SscPortalServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/SscPortalServiceImpl.java
index 4a3d8e5..8cfe7b9 100644
--- a/src/main/java/com/weaver/seconddev/portal/service/impl/SscPortalServiceImpl.java
+++ b/src/main/java/com/weaver/seconddev/portal/service/impl/SscPortalServiceImpl.java
@@ -47,7 +47,7 @@ public class SscPortalServiceImpl implements SscPortalService {
expirationReminderPo.setHealthCertificateExpiration(sscPortalMapper.getHealthCertificateExpirationCount(sscParam));
expirationReminderPo.setEmploymentAnniversary(sscPortalMapper.getEmploymentAnniversaryCount(sscParam));
// TODO
- expirationReminderPo.setBirthdayNum(-1);
+ expirationReminderPo.setBirthdayNum(0);
// 设置穿透地址
diff --git a/src/main/resources/mapper/EteamsBaseMapper.xml b/src/main/resources/mapper/EteamsBaseMapper.xml
new file mode 100644
index 0000000..9d19c80
--- /dev/null
+++ b/src/main/resources/mapper/EteamsBaseMapper.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/mapper/HrbpPortalMapper.xml b/src/main/resources/mapper/HrbpPortalMapper.xml
index 9228821..ea9e470 100644
--- a/src/main/resources/mapper/HrbpPortalMapper.xml
+++ b/src/main/resources/mapper/HrbpPortalMapper.xml
@@ -30,29 +30,61 @@
@@ -60,6 +92,12 @@
@@ -67,6 +105,12 @@
@@ -74,6 +118,12 @@
@@ -81,23 +131,47 @@