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-04-25 22:22:30 +08:00
parent 808bd00b14 0caa21dc18
commit 08d0cc59b8
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceGroup.java
View File

@ -128,6 +128,7 @@ public class SurProjectAttendanceGroup extends BaseEntity
g.serverid=j.getString("id");
if(isDirectlyUnder) {
g.companyId = j.getString("leaderTeamId");
g.leaderName=j.getString("subcontractorId");
g.leaderPhone="directly";
}else{
g.companyId=j.getString("subcontractorId");

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

@ -218,7 +218,7 @@ public class AttendanceJgwTask {
//findWorkerByLeader(appid,token,leaderTeamId);
//findDirectlyUnderTeam(appid,token,prjId,subcontractorId,0);
findDirectlyUnderTeam(appid,token,prjId,subcontractorId,0);
//queryProject(appid,token,phone,0);;
//findAddWorkerByProject(appid,token,prjId,0);
//findUpdateWorkerByProject(appid,token,prjId,0);
@ -771,9 +771,12 @@ public class AttendanceJgwTask {
groupWhere.setLeaderPhone("directly");
List<SurProjectAttendanceGroup> groupList=attendanceGroupService.selectSurProjectAttendanceGroupList(groupWhere);
for(SurProjectAttendanceGroup g:groupList) {
jo.put("leaderTeamId",g.getCompanyId());
jo.put("companyName",g.getCompanyName());
dosyncWorkerByLeader(jo, 0l, it);
if(StrUtil.isNotEmpty(g.getLeaderName()) && StrUtil.isNotEmpty(g.getCompanyId())) {
jo.put("subcontractorId", g.getLeaderName());
jo.put("leaderTeamId", g.getCompanyId());
jo.put("companyName", g.getCompanyName());
dosyncWorkerByLeader(jo, 0l, it);
}
}
}catch (Exception ex){
ex.printStackTrace();
@ -796,6 +799,7 @@ public class AttendanceJgwTask {
params.put("timestamp",time);
params.put("tokenSign",tokenSign);
params.put("leaderTeamId",leaderTeamId);
params.put("subcontractorId",jo.getString("subcontractorId"));
Request request = new Request.Builder()
.url(host+path)
.post(toFormBody(params))
@ -892,7 +896,7 @@ public class AttendanceJgwTask {
jo.put("secret",secret);
String token= getToken(appId,secret);
jo.put("token",token);
doSyncGroup(jo,0l,it);
//doSyncGroup(jo,0l,it);
doSyncDirectlyUnderGroup(jo,0l,it);
doSyncProContractor(jo,0l,it);
}catch (Exception ex){
@ -1007,10 +1011,13 @@ public class AttendanceJgwTask {
List<SurProjectAttendanceGroup> list=attendanceGroupService.selectSurProjectAttendanceGroupList(where);
if(list.size()==0){
attendanceGroupService.add(group);
}else{
group.setId(list.get(0).getId());
attendanceGroupService.updateSurProjectAttendanceGroup(group);
}
}
if(rowId>0){
doSyncGroup(jo,rowId+1,it);
doSyncDirectlyUnderGroup(jo,rowId+1,it);
}
}
}