diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue
index 4ab436cb..710c7b0b 100644
--- a/ruoyi-ui/src/views/project/attendance/index.vue
+++ b/ruoyi-ui/src/views/project/attendance/index.vue
@@ -14,7 +14,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="日期" prop="createBy">
-        <el-date-picker v-model="queryParams.createBy" type="date" placeholder="选择日期">
+        <el-date-picker v-model="queryParams.attendanceTime" type="date" placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -162,7 +162,7 @@ export default {
         pageSize: 10,
         projectId:null,
         subDeptId:null,
-        createBy:new Date()
+        attendanceTime:new Date()
       },
       // 表单参数
       form: {},
@@ -225,7 +225,9 @@ export default {
     /** 查询劳务实名制管理列表 */
     getList() {
       this.loading = true;     
-      queryAttendanceData(this.queryParams).then(response=>{
+      let postData={...this.queryParams};
+      postData.attendanceTime=this.$dt(new Date()).format("YYYY-MM-DD");
+      listAttendance(this.queryParams).then(response=>{
         this.attendanceList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 339a4b4c..28036222 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,6 +35,7 @@ module.exports = {
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
         target: `http://127.0.0.1:8090/jhapi`, 
+        //target: `http://192.168.126.20:808/jhapi`, 
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
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 bbe0dfd5..028fde4d 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
@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
 import cn.hutool.core.date.DateTime;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.yanzhu.jh.project.domain.SurProjectAttendanceCfg;
@@ -174,7 +175,11 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
             }
             SurProjectAttendanceUser user=uList.get(0);
             sdata.setWorkerName(user.getName());
-            sdata.setWorkerPhoto(user.getPhoto());
+            String photo=user.getPhoto();
+            if(StrUtil.isEmpty(photo)){
+                photo=user.getRecentPhoto();
+            }
+            sdata.setWorkerPhoto(photo);
             sdata.setWorkerGender(user.getGender());;
             sdata.setGroupName(user.getGroupName());
             sdata.setWorkTypeName(user.getWorkTypeName());
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 77d1ef6b..fef0b3e3 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
@@ -541,8 +541,8 @@ public class AttendanceJgwTask {
         params.put("tokenSign",tokenSign);
         params.put("projectId",projectId);
         params.put("startId",startId);
-        params.put("startTime","2024-03-22");
-        params.put("endTime","2024-03-23");
+        params.put("startTime",startTime);
+        params.put("endTime",endTime);
         Request request = new Request.Builder()
                 .url(host+path)
                 .post(toFormBody(params))
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
index 8a0509b1..e6450dd0 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
@@ -45,12 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSurProjectAttendanceDataVo">
-        select * FROM
-            (
-                select a.*
-                from sur_project_attendance_data_${year} a
-                )
-        sur_project_attendance_data
+        select * from sur_project_attendance_data_${year}
     </sql>
 
     <select id="selectSurProjectAttendanceDataListEx" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
@@ -81,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vendorsCode != null  and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>
             <if test="serverid != null "> and serverid = #{serverid}</if>
             <if test="workerId != null "> and workerId = #{workerId}</if>
-            <if test="attendanceTime != null  and attendanceTime != ''"> and attendance_time = #{attendanceTime}</if>
+            <if test="attendanceTime != null  and attendanceTime != ''"> and date(attendance_time) =date(#{attendanceTime})</if>
             <if test="identification != null  and identification != ''"> and identification = #{identification}</if>
             <if test="teamId != null "> and teamId = #{teamId}</if>
             <if test="workTypeCode != null  and workTypeCode != ''"> and workTypeCode = #{workTypeCode}</if>