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

update code

dev_xds
haha 2024-03-26 01:44:19 +08:00
parent 8edb022406
commit e2524e4bdf
2 changed files with 6 additions and 4 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

@ -213,7 +213,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型 sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型
} }
if("jgw".equals(sdata.getVendorsCode())){ if("jgw".equals(sdata.getVendorsCode())){
sdata.setWorkTypeName(group.getCompanyCode()); //sdata.setWorkTypeName(group.getCompanyCode());
sdata.setCompanyName(user.getCompanyName());
sdata.setGroupName(group.getTeamName()); sdata.setGroupName(group.getTeamName());
} }
//查询项目部门信息 //查询项目部门信息
@ -237,6 +238,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
SurProjectAttendanceData upData=list.get(0); SurProjectAttendanceData upData=list.get(0);
upData.setAttendanceOutTime(sdata.getAttendanceTime()); upData.setAttendanceOutTime(sdata.getAttendanceTime());
upData.setGroupName(sdata.getGroupName()); upData.setGroupName(sdata.getGroupName());
upData.setCompanyName(sdata.getCompanyName());;
upData.setWorkTypeName(sdata.getWorkTypeName()); upData.setWorkTypeName(sdata.getWorkTypeName());
updateSurProjectAttendanceData(upData); updateSurProjectAttendanceData(upData);
} }

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

@ -117,9 +117,9 @@ public class AttendanceJgwTask {
} }
System.out.println(token); System.out.println(token);
System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd")); System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd"));
//findAddWorkerByProject(appid,token,prjId,0); findAddWorkerByProject(appid,token,prjId,0);
//findAttendanceByProject(appid,token,prjId); //findAttendanceByProject(appid,token,prjId);
findTeamByProjectId(appid,token,prjId); //findTeamByProjectId(appid,token,prjId);
//findProContractorByProjectId(appid,token,prjId); //findProContractorByProjectId(appid,token,prjId);
//getJobTypeData(appid,token,"0"); //getJobTypeData(appid,token,"0");
} }
@ -322,7 +322,7 @@ public class AttendanceJgwTask {
cnt++; cnt++;
} }
SurProjectAttendanceUser user=SurProjectAttendanceUser.createFromJgw(json); SurProjectAttendanceUser user=SurProjectAttendanceUser.createFromJgw(json);
if(user.getWorkerId().equals("e878b1b9c6ac461ebc4109843974f4c3")){ if(user.getWorkerId().equals("5bdc967decea43a3a894c0a15fde8d46")){
String k=user.getName(); String k=user.getName();
JSONArray arr2= json.getJSONArray("corpName"); JSONArray arr2= json.getJSONArray("corpName");
Object o=arr2.get(0); Object o=arr2.get(0);