From fb02b1a244a7e7dc0ad53b83cff682c6507c9255 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 31 Mar 2024 23:40:18 +0800 Subject: [PATCH] update code --- .../service/impl/SurProjectAttendanceDataServiceImpl.java | 4 ++-- .../java/com/yanzhu/jh/project/task/AttendanceJgwTask.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index 6b465918..afefebc4 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -219,9 +219,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc } if("jgw".equals(sdata.getVendorsCode())){ //sdata.setWorkTypeName(group.getCompanyCode()); - sdata.setCompanyName(user.getCompanyName()); + //sdata.setCompanyName(user.getCompanyName()); sdata.setWorkTypeName(user.getWorkTypeName()); - //sdata.setCompanyName(group.getCompanyName()); + sdata.setCompanyName(group.getCompanyName()); sdata.setGroupName(group.getTeamName()); } //查询项目部门信息 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java index 05ba36ea..98ba6142 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java @@ -689,6 +689,7 @@ public class AttendanceJgwTask { List groupList=attendanceGroupService.selectSurProjectAttendanceGroupList(groupWhere); for(SurProjectAttendanceGroup g:groupList) { jo.put("leaderTeamId",g.getCompanyId()); + jo.put("companyName",g.getCompanyName()); dosyncWorkerByLeader(jo, 0l, it); } }catch (Exception ex){ @@ -732,6 +733,7 @@ public class AttendanceJgwTask { SurProjectAttendanceUser upUser=userList.get(0); upUser.setCompanyId(json.getString("leaderTeamId")); upUser.setWorkTypeName(json.getString("jobType")); + upUser.setCompanyName(jo.getString("companyName")); attendanceUserService.updateSurProjectAttendanceUser(upUser); } }