diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java index b4923c77..1628fddb 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java @@ -18,6 +18,163 @@ public class SurProjectAttendanceData extends BaseEntity { private static final long serialVersionUID = 1L; + private int year; + + public int getYear() { + return year; + } + + public void setYear(int year) { + this.year = year; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getWorkerName() { + return workerName; + } + + public void setWorkerName(String workerName) { + this.workerName = workerName; + } + + public String getWorkerPhoto() { + return workerPhoto; + } + + public void setWorkerPhoto(String workerPhoto) { + this.workerPhoto = workerPhoto; + } + + public Integer getWorkerGender() { + return workerGender; + } + + public void setWorkerGender(Integer workerGender) { + this.workerGender = workerGender; + } + + public Long getBirthDate() { + return birthDate; + } + + public void setBirthDate(Long birthDate) { + this.birthDate = birthDate; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public String getWorkTypeName() { + return workTypeName; + } + + public void setWorkTypeName(String workTypeName) { + this.workTypeName = workTypeName; + } + + public String getEthnic() { + return ethnic; + } + + public void setEthnic(String ethnic) { + this.ethnic = ethnic; + } + + public String getNativePlace() { + return nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Integer getSpecWorkType() { + return specWorkType; + } + + public void setSpecWorkType(Integer specWorkType) { + this.specWorkType = specWorkType; + } + + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public String getAttendanceOutTime() { + return attendanceOutTime; + } + + public void setAttendanceOutTime(String attendanceOutTime) { + this.attendanceOutTime = attendanceOutTime; + } + + @Excel(name = "项目ID") + private Long projectId; + @Excel(name = "项目名称") + private String projectName; + @Excel(name = "部门ID") + private Long deptId; + @Excel(name = "部门名称") + private String deptName; + @Excel(name = "姓名") + private String workerName; + @Excel(name = "照片") + private String workerPhoto; + @Excel(name = "性别0:男 1:女") + private Integer workerGender; + @Excel(name = "出生日期时间戳") + private Long birthDate; + @Excel(name = "所属班组") + private String groupName; + @Excel(name = "工种") + private String workTypeName; + @Excel(name = "民族") + private String ethnic; + @Excel(name = "籍贯") + private String nativePlace; + + @Excel(name = "联系电话") + private String phone; + @Excel(name = "是否特殊工种") + private Integer specWorkType; + @Excel(name = "分包商类型") + private String companyTypeId; + @Excel(name = "分包商名称") + private String companyName; + @Excel(name = "考勤时间(离开)yyyy-MM-dd HH:mm:ss") + private String attendanceOutTime; /** */ private Long id; @@ -41,9 +198,6 @@ public class SurProjectAttendanceData extends BaseEntity @Excel(name = "工人Id") private String workerId; - /** 进门还是出门E进，L出 */ - @Excel(name = "进门还是出门E进，L出") - private String attendanceType; /** 考勤时间yyyy-MM-dd HH:mm:ss */ @Excel(name = "考勤时间yyyy-MM-dd HH:mm:ss") @@ -69,35 +223,22 @@ public class SurProjectAttendanceData extends BaseEntity @Excel(name = "平台对应分包商ID") private Long vendorId; - /** 新旧系统项目标识0：新系统项目； 1：旧系统项目 */ - @Excel(name = "新旧系统项目标识0：新系统项目； 1：旧系统项目") - private Long projectType; /** 设备编号 */ @Excel(name = "设备编号") private String deviceCode; - /** 作业面Id */ - @Excel(name = "作业面Id") - private String workPointId; /** 照片 */ @Excel(name = "照片") private String scanPhoto; - /** 服务返回的JSON */ - @Excel(name = "服务返回的JSON") - private String other; - - /** */ - @Excel(name = "数据状态") - private Long state; /** */ @Excel(name = "数据是否有效") private Long isDel; - private Long projectId; + private Long subDeptId; public static SurProjectAttendanceData createFromHuazhu(JSONObject j) { @@ -105,7 +246,6 @@ public class SurProjectAttendanceData extends BaseEntity d.vendorsCode="huazhu"; d.serverid=j.getString("id"); d.workerId=j.getString("labourWorkerId"); - d.attendanceType=j.getLongValue("inOrOut",1l)==1l?"E":"L"; long recordTime=j.getLongValue("recordTime",0); if(recordTime>0){ d.attendanceTime= DateUtil.format(DateUtil.date(recordTime),"yyyy-MM-dd HH:mm:ss"); @@ -123,7 +263,6 @@ public class SurProjectAttendanceData extends BaseEntity d.vendorsCode="jgw"; d.serverid=j.getString("id"); d.workerId=j.getString("workerId"); - d.attendanceType = j.getLongValue("signType", 1l) == 2l ? "E" : "L"; d.attendanceTime = j.getString("checkinTime"); d.identification=""; d.teamId=0l; @@ -142,8 +281,6 @@ public class SurProjectAttendanceData extends BaseEntity this.deptId = deptId; } - private Long deptId; - private String companyTypeId; public Long getProjectId() { return projectId; @@ -172,7 +309,6 @@ public class SurProjectAttendanceData extends BaseEntity public static SurProjectAttendanceData create(JSONObject json) { SurProjectAttendanceData d=new SurProjectAttendanceData(); d.attendanceTime=json.getString("time"); - d.attendanceType=json.getString("type"); d.serverid=json.getString("id"); d.workerId=json.getString("workerId"); d.identification=json.getString("identification"); @@ -180,12 +316,8 @@ public class SurProjectAttendanceData extends BaseEntity d.workTypeCode=json.getString("workerTypeId"); d.companyId=json.getString("companyId"); d.vendorId=json.getLong("vendorId"); - d.projectType=json.getLong("projectType"); d.deviceCode=json.getString("deviceCode"); - d.workPointId=json.getString("workPointId"); d.scanPhoto=json.getString("scanPhoto"); - //d.other=json.toJSONString(); - d.state=0l; d.isDel=0l; return d; } @@ -235,15 +367,7 @@ public class SurProjectAttendanceData extends BaseEntity { return workerId; } - public void setAttendanceType(String attendanceType) - { - this.attendanceType = attendanceType; - } - public String getAttendanceType() - { - return attendanceType; - } public void setAttendanceTime(String attendanceTime) { this.attendanceTime = attendanceTime; @@ -298,15 +422,7 @@ public class SurProjectAttendanceData extends BaseEntity { return vendorId; } - public void setProjectType(Long projectType) - { - this.projectType = projectType; - } - public Long getProjectType() - { - return projectType; - } public void setDeviceCode(String deviceCode) { this.deviceCode = deviceCode; @@ -316,15 +432,8 @@ public class SurProjectAttendanceData extends BaseEntity { return deviceCode; } - public void setWorkPointId(String workPointId) - { - this.workPointId = workPointId; - } - public String getWorkPointId() - { - return workPointId; - } + public void setScanPhoto(String scanPhoto) { this.scanPhoto = scanPhoto; @@ -334,24 +443,7 @@ public class SurProjectAttendanceData extends BaseEntity { return scanPhoto; } - public void setOther(String other) - { - this.other = other; - } - public String getOther() - { - return other; - } - public void setState(Long state) - { - this.state = state; - } - - public Long getState() - { - return state; - } public void setIsDel(Long isDel) { this.isDel = isDel; @@ -378,19 +470,14 @@ public class SurProjectAttendanceData extends BaseEntity .append("vendorsCode", getVendorsCode()) .append("serverid", getServerid()) .append("workerId", getWorkerId()) - .append("attendanceType", getAttendanceType()) .append("attendanceTime", getAttendanceTime()) .append("identification", getIdentification()) .append("teamId", getTeamId()) .append("workTypeCode", getWorkTypeCode()) .append("companyId", getCompanyId()) .append("vendorId", getVendorId()) - .append("projectType", getProjectType()) .append("deviceCode", getDeviceCode()) - .append("workPointId", getWorkPointId()) .append("scanPhoto", getScanPhoto()) - .append("other", getOther()) - .append("state", getState()) .append("remark", getRemark()) .append("isDel", getIsDel()) .append("createBy", getCreateBy()) 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 b8bc4169..83bd21ad 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 @@ -88,8 +88,8 @@ public class AttendanceJgwTask { } System.out.println(token); System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd")); - //findAddWorkerByProject(appid,token,prjId,0); - findAttendanceByProject(appid,token,prjId); + findAddWorkerByProject(appid,token,prjId,0); + //findAttendanceByProject(appid,token,prjId); //findTeamByProjectId(appid,token,prjId); //findProContractorByProjectId(appid,token,prjId); } @@ -262,7 +262,7 @@ public class AttendanceJgwTask { if("02".equals(workerStatus)){ cnt++; } - // SurProjectAttendanceUser user=SurProjectAttendanceUser.createFromJgw(json); + SurProjectAttendanceUser user=SurProjectAttendanceUser.createFromJgw(json); } System.out.println("cnt:"+cnt+","+arr.size()); //findAddWorkerByProject(appId, token, projectId, endId); diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index af37f108..1d94ce7d 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -238,6 +238,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId and u.workerid in( SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE() + and cfgid in (select id from sur_project_attendance_cfg + + + and project_id=#{projectId} + + + and project_id in (SELECT id FROM sur_project WHERE deptid=#{subDeptId}) + + + and project_id in + + #{item} + + + + ) ) and g.companyTypeId in (1,2,3,4,5,6,8)