diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java
index c2e2081a..a7990337 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java
@@ -433,7 +433,7 @@ public class LabourApiController extends BaseController {
                         //这里不能修改出勤时间
                         surProjectAttendanceData.setAttendanceTime(null);
                         surProjectAttendanceData.setAttendanceOutTime(labourDataVo.getAttendanceTime());
-                        surProjectAttendanceData.setUpdateBy(sysApplyConfig.getAppId()+"Api推送入场");
+                        surProjectAttendanceData.setUpdateBy(sysApplyConfig.getAppId()+"Api推送离场");
                         surProjectAttendanceData.setUpdateTime(new Date());
                         surProjectAttendanceDataService.updateSurProjectAttendanceData(surProjectAttendanceData);
                     }else{
@@ -452,9 +452,25 @@ public class LabourApiController extends BaseController {
                         }
                         surProjectAttendanceData.setAppId(sysApplyConfig.getAppId());
                         surProjectAttendanceData.setCfgid(sysApplyConfig.getCfgId());
-                        surProjectAttendanceData.setCreateBy(sysApplyConfig.getAppId()+"Api推送离场");
+                        surProjectAttendanceData.setCompanyId(surProjectAttendanceUser.getCompanyId());
+                        surProjectAttendanceData.setCompanyName(surProjectAttendanceUser.getCompanyName());
+                        surProjectAttendanceData.setWorkerName(surProjectAttendanceUser.getName());
+                        surProjectAttendanceData.setWorkerPhoto(surProjectAttendanceUser.getRecentPhoto());
+                        surProjectAttendanceData.setWorkerGender(surProjectAttendanceUser.getGender());
+                        surProjectAttendanceData.setBirthDate(surProjectAttendanceUser.getBirthDate());
+                        surProjectAttendanceData.setEthnic(surProjectAttendanceUser.getEthnic());
+                        surProjectAttendanceData.setNativePlace(surProjectAttendanceUser.getNativePlace());
+                        surProjectAttendanceData.setPhone(surProjectAttendanceUser.getPhone());
+                        surProjectAttendanceData.setWorkTypeName(surProjectAttendanceUser.getWorkTypeName());
+                        surProjectAttendanceData.setSpecWorkType(surProjectAttendanceUser.getSpecWorkType());
+                        surProjectAttendanceData.setGroupName(surProjectAttendanceUser.getGroupName());
+                        surProjectAttendanceData.setCompanyTypeId(surProjectAttendanceUser.getCompanyTypeId());
+                        surProjectAttendanceData.setWorkTypeCode(surProjectAttendanceUser.getWorkTypeCode());
+                        surProjectAttendanceData.setCreateBy(sysApplyConfig.getAppId()+"Api推送入场");
                         surProjectAttendanceData.setCreateTime(new Date());
-                        surProjectAttendanceDataService.insertSurProjectAttendanceData(surProjectAttendanceData);
+                        List<SurProjectAttendanceData> list = new ArrayList<>();
+                        list.add(surProjectAttendanceData);
+                        surProjectAttendanceDataService.batchSurProjectAttendanceData(list);
                     }
                 }else{
                     String messages = validateSet.stream()
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
index ef3f3f9d..732748fb 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
@@ -162,7 +162,7 @@ public class SurProjectAttendanceUser extends BaseEntity
 
     /** 人员部门类型 */
     @Excel(name = "人员部门类型")
-    private Integer companyTypeId;
+    private String companyTypeId;
 
     private Date inTime;
     private Date outTime;
@@ -658,11 +658,11 @@ public class SurProjectAttendanceUser extends BaseEntity
         this.appId = appId;
     }
 
-    public Integer getCompanyTypeId() {
+    public String getCompanyTypeId() {
         return companyTypeId;
     }
 
-    public void setCompanyTypeId(Integer companyTypeId) {
+    public void setCompanyTypeId(String companyTypeId) {
         this.companyTypeId = companyTypeId;
     }