diff --git a/src/main/java/cn/timer/api/controller/crm/CrmController.java b/src/main/java/cn/timer/api/controller/crm/CrmController.java index 2fe5852..a991bfa 100644 --- a/src/main/java/cn/timer/api/controller/crm/CrmController.java +++ b/src/main/java/cn/timer/api/controller/crm/CrmController.java @@ -262,11 +262,17 @@ public class CrmController { List<Map<String, Object>> members = new ArrayList<Map<String, Object>>(); for (CrmBusinessGroupMember crmBusinessGroupManager : crmBusinessGroupMembers) { Integer empNum = crmBusinessGroupManager.getEmpNum(); - String name = getEmpName(orgCode, empNum); - Map<String, Object> map = new HashMap<String, Object>(); - map.put("name", name); - map.put("empNum", empNum); - members.add(map); + + YgglMainEmp emps = YgglMainEmp.builder().build() + .selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, empNum) + .eq(YgglMainEmp::getOrgCode, orgCode).select(YgglMainEmp::getName, YgglMainEmp::getHeadUrl)); + if(emps != null) { + String name = getEmpName(orgCode, empNum); + Map<String, Object> map = new HashMap<String, Object>(); + map.put("name", name); + map.put("empNum", empNum); + members.add(map); + } } crmBusinessGroup.setMembers(members); @@ -1154,9 +1160,15 @@ public class CrmController { String name = "未知"; if (belonger == 0) name = "公海客户"; - else if (belonger > 0) - name = getEmpName(orgCode, belonger); - + else if (belonger > 0) { + YgglMainEmp emps = YgglMainEmp.builder().build() + .selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, belonger) + .eq(YgglMainEmp::getOrgCode, orgCode).select(YgglMainEmp::getName, YgglMainEmp::getHeadUrl)); + if(emps != null) { + name = getEmpName(orgCode, belonger); + } + + } map.put("name", name); map.put("num", num); return map; diff --git a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java index 224fb36..6c40997 100644 --- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java +++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java @@ -795,9 +795,12 @@ public class AttendanceTaskTiming{ if(summaryid > 0) { summary.setId(summaryid); + summary.updateById(); + }else { + summary.insert(); } - summary.insertOrUpdate(); +// summary.insertOrUpdate(); } } diff --git a/src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java b/src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java index d149770..75f8ec1 100644 --- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java +++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java @@ -115,7 +115,7 @@ public class RealTimeUpdate{ List<AdditionalDto> userlist = null; if(typeid == 1) {//考勤组 userlist = kqglassoleavebalancemapper.RealTimeUpdate(org_code,numcode); - }else if(typeid == 2) {//添加员工 + }else if(typeid == 2) {//添加员工 离职员工 userlist = kqglassoleavebalancemapper.selectAdditionalByempnum(org_code,numcode); }else if(typeid == 3) { userlist = userlist_; diff --git a/src/main/java/cn/timer/api/controller/yggl/YgglController.java b/src/main/java/cn/timer/api/controller/yggl/YgglController.java index f6f1104..5e14c79 100644 --- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java +++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java @@ -65,6 +65,7 @@ import cn.timer.api.bean.clazz.SysRegion; import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance; import cn.timer.api.bean.kqmk.KqglAssoLeaveEmployeeBalance; import cn.timer.api.bean.kqmk.KqglAssoLeaveRules; +import cn.timer.api.bean.kqmk.KqglAssoYhkqz; import cn.timer.api.bean.qyzx.QyzxEmpEntAsso; import cn.timer.api.bean.qyzx.QyzxEmpLogin; import cn.timer.api.bean.yggl.YgglAttaClfjb; @@ -1370,7 +1371,17 @@ public class YgglController { if (listEEA != null && listEEA.size() > 0) { QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById(); } - + + + KqglAssoYhkqz.builder().build().delete(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, empNum).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode())); + + try { + realtimeupdate.AttendanceTask(userBean.getOrgCode(), empNum, 2,null); + + } catch (ParseException e) { + e.printStackTrace(); + } + return ResultUtil.success("确认离职员工成功"); }