revert b315569781

revert hrbp门户今日概况-应出勤人数

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);
 }

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<JSONObject> jsonObjectList = new ArrayList<>();
         for (Map.Entry<String, List<FileUploadLoad>> 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<String, Object> actionMap = new HashMap<>();
         actionMap.put("updateMsg", updateMsg);
         return WeaResult.success(actionMap);

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";
     /**
      * 租户标识
      */

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<Long> departmentIdList;
-    private Long matrixId;
-    private Long matrixValueConfigId;
-    private Long userId;
 }

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);
-
 }

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<Map<String, Object>> getToDo(Map<String, String> params) {
 
@@ -120,17 +114,7 @@ public class HrbpPortalServiceImpl implements HrbpPortalService {
 
     @Override
     public WeaResult<Map<String, Object>> getTodayOverview(Map<String, String> params) {
-        Map<String, Object> resultMap = new HashMap<>();
+        // TODO
-
+        return null;
-        //部门矩阵中，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);
     }
 }

src/main/resources/mapper/portal/HrbpPortalMapper.xml

@@ -175,22 +175,4 @@
         and t.personnel_status = 5
     </select>
 
-    <select id="getKqRequireByBp" resultType="java.lang.Integer">
-        SELECT
-        COUNT(DISTINCT b.ID )
-        FROM
-        ${eteams}.hrm_matrix_value_data a
-        LEFT JOIN ${eteams}.employee b ON b.DEPARTMENT = a.matrix_data_id
-        WHERE
-        <!-- 部门矩阵id -->
-        a.matrix_id = #{matrixId}
-        <!-- 矩阵配置id(hrbp字段id) hrbpId -->
-        AND a.matrix_value_config_id =  #{matrixValueConfigId}
-        <!-- 当前人员id -->
-        AND a.relate_id=#{userId}
-        AND a.delete_type = 0
-        AND b.accounttype = 0
-        AND b.STATUS = 'normal'
-    </select>
-
 </mapper>