From 46a9633e89e62b0e01ce24c1f2f168b7aba514d9 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Mon, 1 Apr 2024 23:37:58 +0800
Subject: [PATCH] update code

---
 ruoyi-ui/src/views/project/attendanceWorker/index.vue     | 4 +++-
 .../mapper/project/SurProjectAttendanceUserMapper.xml     | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/project/attendanceWorker/index.vue b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
index 20dbccf5..72f5d033 100644
--- a/ruoyi-ui/src/views/project/attendanceWorker/index.vue
+++ b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
@@ -67,7 +67,9 @@
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="{row}">{{ row.state==1?'已退场':'进场' }}</template>
       </el-table-column>
-      <el-table-column label="分包商名称" align="center" prop="companyName" />      
+      <el-table-column label="分包商名称" align="center" prop="companyName" >
+        <template slot-scope="{row}">{{ row.companyName||row.remark}}</template>
+      </el-table-column>     
       <el-table-column label="所属班组" align="center" prop="groupName" />
       <el-table-column label="岗位/工种" align="center" prop="workTypeName" />
     </el-table>
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
index 0e99abc0..65eaf4eb 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
@@ -62,8 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.degreeName,u.photo,u.recentPhoto,
         u.groupId,u.leader,u.workTypeCode,u.specWorkType,
         u.hatCode,u.state,u.enterDate,u.exitDate,u.companyId,u.vendorId,
-        u.teamId,u.teamName,u.enterType,u.remark,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
-        c.project_id,c.sub_dept_id,u.companyName,u.workTypeName,g.teamname groupName
+        u.teamId,u.teamName,u.enterType,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
+        c.project_id,c.sub_dept_id,u.companyName,u.workTypeName,g.teamname groupName,g.companyName remark
         FROM sur_project_attendance_user u,sur_project_attendance_cfg c,sur_project_attendance_group g
         WHERE u.cfgid=c.id AND g.companyid=u.companyid AND u.vendors_code='jgw'
             <if test="cfgid != null "> and cfgid = #{cfgid}</if>
@@ -513,12 +513,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryWorkerOnDuty" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
 
         SELECT u.id,u.cfgid,u.app_id,u.vendors_code,u.workerId,u.laborWorkerId,u.workerCategory,u.qrCode,u.name,
-        u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.degreeName,u.photo,u.recentPhoto,
+        u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.photo,u.recentPhoto,
         u.groupId,u.leader,u.workTypeCode,u.specWorkType,
         u.hatCode,u.state,u.enterDate,u.exitDate,u.companyId,u.vendorId,
         u.teamId,u.teamName,u.enterType,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
         b.project_id,b.sub_dept_id,u.companyName,u.workTypeName,u.groupName,
-        b.project_id,b.sub_dept_id, g.teamname remark
+        b.project_id,b.sub_dept_id, g.teamname remark,g.companyName degreeName
         FROM   sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g
         WHERE u.cfgid=b.id and u.state=0 and u.companyId=g.companyId