From e2524e4bdf507169f7fd51b40638fa968c1f4ea4 Mon Sep 17 00:00:00 2001 From: haha Date: Tue, 26 Mar 2024 01:44:19 +0800 Subject: [PATCH] update code --- .../service/impl/SurProjectAttendanceDataServiceImpl.java | 4 +++- .../java/com/yanzhu/jh/project/task/AttendanceJgwTask.java | 6 +++--- 2 files changed, 6 insertions(+), 4 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 8f0cb368..c3744c98 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 @@ -213,7 +213,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型 } if("jgw".equals(sdata.getVendorsCode())){ - sdata.setWorkTypeName(group.getCompanyCode()); + //sdata.setWorkTypeName(group.getCompanyCode()); + sdata.setCompanyName(user.getCompanyName()); sdata.setGroupName(group.getTeamName()); } //查询项目部门信息 @@ -237,6 +238,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc SurProjectAttendanceData upData=list.get(0); upData.setAttendanceOutTime(sdata.getAttendanceTime()); upData.setGroupName(sdata.getGroupName()); + upData.setCompanyName(sdata.getCompanyName());; upData.setWorkTypeName(sdata.getWorkTypeName()); updateSurProjectAttendanceData(upData); } 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 25626106..ee54758e 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 @@ -117,9 +117,9 @@ public class AttendanceJgwTask { } System.out.println(token); System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd")); - //findAddWorkerByProject(appid,token,prjId,0); + findAddWorkerByProject(appid,token,prjId,0); //findAttendanceByProject(appid,token,prjId); - findTeamByProjectId(appid,token,prjId); + //findTeamByProjectId(appid,token,prjId); //findProContractorByProjectId(appid,token,prjId); //getJobTypeData(appid,token,"0"); } @@ -322,7 +322,7 @@ public class AttendanceJgwTask { cnt++; } SurProjectAttendanceUser user=SurProjectAttendanceUser.createFromJgw(json); - if(user.getWorkerId().equals("e878b1b9c6ac461ebc4109843974f4c3")){ + if(user.getWorkerId().equals("5bdc967decea43a3a894c0a15fde8d46")){ String k=user.getName(); JSONArray arr2= json.getJSONArray("corpName"); Object o=arr2.get(0);