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 dfdc150..0fd4540 100644 --- a/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java +++ b/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java @@ -20,7 +20,4 @@ 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 2bbac41..dff53ff 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_employee_information"); - List jsonObjectList = new ArrayList<>(); + Long formId = ebuilderBaseMapper.getFormIdByTableName(baseParam, "uf_jcl_rzgl"); + for (Map.Entry> entry : fileUploadMap.entrySet()) { String jobNum = entry.getKey(); // 入职记录ID @@ -132,23 +132,12 @@ 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_employee_information"); + Long objId = ebuilderBaseMapper.getObjIdByTableName(baseParam, "uf_jcl_rzgl"); 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 f88b1ab..941daac 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,11 +33,6 @@ 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 6a9d9e5..30d5d07 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,4 +14,7 @@ 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 1e3f2ef..c9ba2bb 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,4 +123,11 @@ 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 0c71b0e..5a21a6f 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,6 +9,7 @@ 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; @@ -33,6 +34,11 @@ 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) { @@ -114,7 +120,17 @@ public class HrbpPortalServiceImpl implements HrbpPortalService { @Override public WeaResult> getTodayOverview(Map params) { - // TODO - return null; + 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); } } diff --git a/src/main/resources/mapper/portal/HrbpPortalMapper.xml b/src/main/resources/mapper/portal/HrbpPortalMapper.xml index 05454bd..fc538ca 100644 --- a/src/main/resources/mapper/portal/HrbpPortalMapper.xml +++ b/src/main/resources/mapper/portal/HrbpPortalMapper.xml @@ -175,4 +175,22 @@ and t.personnel_status = 5 + +