From 32b5398830be10ae1c9e16f1424dab0d14e896e8 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sat, 23 Mar 2024 01:27:13 +0800
Subject: [PATCH] update code

---
 .../src/views/project/attendance/index.vue    | 25 +++++++++----------
 .../SurProjectAttendanceDataServiceImpl.java  |  5 ++--
 .../SurProjectAttendanceDataMapper.xml        |  4 +++
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue
index 710c7b0b..b608e114 100644
--- a/ruoyi-ui/src/views/project/attendance/index.vue
+++ b/ruoyi-ui/src/views/project/attendance/index.vue
@@ -52,23 +52,20 @@
       
       <el-table-column label="照片" align="center" prop="id">
         <template slot-scope="{row}">
-          <el-image :src="row.recentPhoto" :preview-src-list="[row.recentPhoto]" style="height:60px"/>
+          <el-image :src="row.workerPhoto||row.scanPhoto" :preview-src-list="[row.workerPhoto||row.scanPhoto]" style="height:60px"/>
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="姓名" align="center" prop="workerName" />
       <el-table-column label="籍贯" align="center" prop="nativePlace" />
       <el-table-column label="性别" align="center" prop="attendanceType" >
-        <template slot-scope="{row}">{{ row.gender==1?'女':'男' }}</template>
+        <template slot-scope="{row}">{{ row.workerGender!=1?'女':'男' }}</template>
       </el-table-column>
       <el-table-column label="进场时间" align="center" prop="inTime">
-        <template slot-scope="{row}">{{ row.inTime|formatTime }}</template>
+        <template slot-scope="{row}">{{ row.attendanceTime|formatTime }}</template>
       </el-table-column>
       <el-table-column label="离场时间" align="center" prop="outTime">
-        <template slot-scope="{row}">{{ row.outTime|formatTime }}</template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="{row}">{{ row.status==1?'退场':'进场' }}</template>
-      </el-table-column>
+        <template slot-scope="{row}">{{ row.attendanceOutTime|formatTime }}</template>
+      </el-table-column>      
       <el-table-column label="分包商名称" align="center" prop="companyName" />      
       <el-table-column label="所属班组" align="center" prop="groupName" />
       <el-table-column label="工种" align="center" prop="workTypeName" />
@@ -223,11 +220,13 @@ export default {
       this.$refs.attDrawer.show();
     },
     /** 查询劳务实名制管理列表 */
-    getList() {
+    getList() {      
       this.loading = true;     
-      let postData={...this.queryParams};
-      postData.attendanceTime=this.$dt(new Date()).format("YYYY-MM-DD");
-      listAttendance(this.queryParams).then(response=>{
+      let postData={};
+      postData.attendanceTime=this.$dt(this.queryParams.attendanceTime).format("YYYY-MM-DD");
+      postData.projectId=this.queryParams.projectId;
+      postData.deptId=this.queryParams.subDeptId;
+      listAttendance(postData).then(response=>{
         this.attendanceList = response.rows;
         this.total = response.total;
         this.loading = false;
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 028fde4d..0bd2734a 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
@@ -160,9 +160,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
         SurProjectAttendanceData where=new SurProjectAttendanceData();
         where.setVendorsCode(sdata.getVendorsCode());
         where.setCfgid(sdata.getCfgid());
-        where.setServerid(sdata.getServerid());
-        where.setServerid(sdata.getWorkerId());
-        where.setAttendanceTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", DateTime.now()));
+        where.setWorkerId(sdata.getWorkerId());
+        where.setAttendanceTime(sdata.getAttendanceTime());
         List<SurProjectAttendanceData> list=selectSurProjectAttendanceDataListEx(where);
         if(list.size()==0){
             //设置考勤其它参数
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
index 528b7dc2..5ab72a14 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
@@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="cfgid != null "> and cfgid = #{cfgid}</if>
             <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="projectId != null "> and projectId = #{projectId}</if>
+            <if test="deptId != null "> and deptId = #{deptId}</if>
             <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>
@@ -73,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="cfgid != null "> and cfgid = #{cfgid}</if>
             <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="projectId != null "> and projectId = #{projectId}</if>
+            <if test="deptId != null "> and deptId = #{deptId}</if>
             <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>