From fc457ea43974cd7d1b7eb60354bbff2eaa7f353b Mon Sep 17 00:00:00 2001 From: Lee <1436995815@qq.com> Date: Mon, 18 Aug 2025 15:23:49 +0800 Subject: [PATCH] revert b3155697813f4663ac7e6e0afb6c9b0de59b1d5d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert hrbp门户今日概况-应出勤人数 --- .../entry/mapper/EntryManageMapper.java | 3 +++ .../service/impl/EntryManageServiceImpl.java | 17 +++++++++++++--- .../portal/entity/param/BaseParam.java | 5 +++++ .../portal/entity/param/HrbpParam.java | 3 --- .../mapper/portal/HrbpPortalMapper.java | 7 ------- .../service/impl/HrbpPortalServiceImpl.java | 20 ++----------------- .../mapper/portal/HrbpPortalMapper.xml | 18 ----------------- 7 files changed, 24 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java b/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java index 0fd4540..dfdc150 100644 --- a/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java +++ b/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java @@ -20,4 +20,7 @@ public interface EntryManageMapper { * @return */ Long getEntryRecordIdByJobNum(@Param("param") BaseParam param, @Param("jobNum") String jobNum); + + + Long updateFilesInfo(@Param("param") BaseParam param, @Param("employeeId") Long employeeId); } diff --git a/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java b/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java index dff53ff..2bbac41 100644 --- a/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java @@ -105,8 +105,8 @@ public class EntryManageServiceImpl implements EntryManageService { JSONArray datas = new JSONArray(); - Long formId = ebuilderBaseMapper.getFormIdByTableName(baseParam, "uf_jcl_rzgl"); - + Long formId = ebuilderBaseMapper.getFormIdByTableName(baseParam, "uf_jcl_employee_information"); + List jsonObjectList = new ArrayList<>(); for (Map.Entry> entry : fileUploadMap.entrySet()) { String jobNum = entry.getKey(); // 入职记录ID @@ -132,12 +132,23 @@ public class EntryManageServiceImpl implements EntryManageService { dataObj.put("mainTable", mainDataObj); log.error("dataObj===" + dataObj); datas.add(dataObj); + + jsonObjectList.add(mainDataObj); } - Long objId = ebuilderBaseMapper.getObjIdByTableName(baseParam, "uf_jcl_rzgl"); + Long objId = ebuilderBaseMapper.getObjIdByTableName(baseParam, "uf_jcl_employee_information"); Long userId = UserContext.getCurrentUser().getEmployeeId(); String updateMsg = updateEbTable(datas, String.valueOf(objId), String.valueOf(userId)); + + // 更新系统人员表数据 + for (JSONObject jsonObject : jsonObjectList) { + Long id = jsonObject.getLong("id"); + entryManageMapper.updateFilesInfo(baseParam, id); + + } + + Map actionMap = new HashMap<>(); actionMap.put("updateMsg", updateMsg); return WeaResult.success(actionMap); 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 941daac..f88b1ab 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 @@ -33,6 +33,11 @@ public class BaseParam { // * 员工自定义表 // */ //private String table_emp_cus = "ft_1152026012537184302"; + + /** + * 人事档案-个人信息表 + */ + private String table_hr_cus = "ft_1152116439014449153"; /** * 租户标识 */ diff --git a/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java b/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java index 30d5d07..6a9d9e5 100644 --- a/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java +++ b/src/main/java/com/weaver/seconddev/portal/entity/param/HrbpParam.java @@ -14,7 +14,4 @@ import java.util.Set; @EqualsAndHashCode(callSuper = false) public class HrbpParam extends BaseParam{ private Set departmentIdList; - private Long matrixId; - private Long matrixValueConfigId; - private Long userId; } diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java index c9ba2bb..1e3f2ef 100644 --- a/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java +++ b/src/main/java/com/weaver/seconddev/portal/mapper/portal/HrbpPortalMapper.java @@ -123,11 +123,4 @@ public interface HrbpPortalMapper { */ int getLeaveCount(HrbpParam param); - /** - * hrbp可查看的应出勤人数 - * @param param - * @return - */ - int getKqRequireByBp(HrbpParam param); - } 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 5a21a6f..0c71b0e 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 @@ -9,7 +9,6 @@ import com.weaver.seconddev.portal.service.HrbpPortalService; import com.weaver.teams.security.context.UserContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -34,11 +33,6 @@ public class HrbpPortalServiceImpl implements HrbpPortalService { @Autowired PortalMapper portalMapper; - @Value("#{'${portal.dept.matrixId}'}") - private String matrixId; - @Value("#{'${portal.dept.matrixValueConfigId}'}") - private String matrixValueConfigId; - @Override public WeaResult> getToDo(Map params) { @@ -120,17 +114,7 @@ public class HrbpPortalServiceImpl implements HrbpPortalService { @Override public WeaResult> getTodayOverview(Map params) { - Map resultMap = new HashMap<>(); - - //部门矩阵中，hrbp负责的部门 - //应出勤人数，部门在职人数 - HrbpParam hrbpParam = new HrbpParam(); - hrbpParam.setTenantKey(UserContext.getCurrentUser().getTenantKey()); - hrbpParam.setMatrixId(Long.valueOf(matrixId)); - hrbpParam.setMatrixValueConfigId(Long.valueOf(matrixValueConfigId)); - hrbpParam.setUserId(UserContext.getCurrentUser().getUserId()); - int totalRequire = hrbpPortalMapper.getKqRequireByBp(hrbpParam); - resultMap.put("totalRequire", totalRequire); - return WeaResult.success(resultMap); + // TODO + return null; } } diff --git a/src/main/resources/mapper/portal/HrbpPortalMapper.xml b/src/main/resources/mapper/portal/HrbpPortalMapper.xml index fc538ca..05454bd 100644 --- a/src/main/resources/mapper/portal/HrbpPortalMapper.xml +++ b/src/main/resources/mapper/portal/HrbpPortalMapper.xml @@ -175,22 +175,4 @@ and t.personnel_status = 5 - -