sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
姜玉琦 2024-03-31 23:42:08 +08:00
parent ea6ee3af97 fb02b1a244
commit f974e753d1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
View File

@ -219,9 +219,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
} }
if("jgw".equals(sdata.getVendorsCode())){ if("jgw".equals(sdata.getVendorsCode())){
//sdata.setWorkTypeName(group.getCompanyCode()); //sdata.setWorkTypeName(group.getCompanyCode());
sdata.setCompanyName(user.getCompanyName()); //sdata.setCompanyName(user.getCompanyName());
sdata.setWorkTypeName(user.getWorkTypeName()); sdata.setWorkTypeName(user.getWorkTypeName());
//sdata.setCompanyName(group.getCompanyName()); sdata.setCompanyName(group.getCompanyName());
sdata.setGroupName(group.getTeamName()); sdata.setGroupName(group.getTeamName());
} }
//查询项目部门信息 //查询项目部门信息

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
View File

@ -689,6 +689,7 @@ public class AttendanceJgwTask {
List<SurProjectAttendanceGroup> groupList=attendanceGroupService.selectSurProjectAttendanceGroupList(groupWhere); List<SurProjectAttendanceGroup> groupList=attendanceGroupService.selectSurProjectAttendanceGroupList(groupWhere);
for(SurProjectAttendanceGroup g:groupList) { for(SurProjectAttendanceGroup g:groupList) {
jo.put("leaderTeamId",g.getCompanyId()); jo.put("leaderTeamId",g.getCompanyId());
jo.put("companyName",g.getCompanyName());
dosyncWorkerByLeader(jo, 0l, it); dosyncWorkerByLeader(jo, 0l, it);
} }
}catch (Exception ex){ }catch (Exception ex){
@ -732,6 +733,7 @@ public class AttendanceJgwTask {
SurProjectAttendanceUser upUser=userList.get(0); SurProjectAttendanceUser upUser=userList.get(0);
upUser.setCompanyId(json.getString("leaderTeamId")); upUser.setCompanyId(json.getString("leaderTeamId"));
upUser.setWorkTypeName(json.getString("jobType")); upUser.setWorkTypeName(json.getString("jobType"));
upUser.setCompanyName(jo.getString("companyName"));
attendanceUserService.updateSurProjectAttendanceUser(upUser); attendanceUserService.updateSurProjectAttendanceUser(upUser);
} }
} }