From 1f492bc77f7f2d5b05fdfd6878557b41755b2d0c Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sun, 14 Apr 2024 23:25:20 +0800
Subject: [PATCH] update code

---
 ruoyi-ui/src/api/project/attendanceWorker.js              | 8 ++++++++
 ruoyi-ui/src/views/project/attendanceWorker/index.vue     | 4 ++--
 .../jh/project/domain/SurProjectAttendanceGroup.java      | 8 +++++++-
 .../impl/SurProjectAttendanceGroupServiceImpl.java        | 4 ++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/api/project/attendanceWorker.js b/ruoyi-ui/src/api/project/attendanceWorker.js
index db98773b..66c2a977 100644
--- a/ruoyi-ui/src/api/project/attendanceWorker.js
+++ b/ruoyi-ui/src/api/project/attendanceWorker.js
@@ -10,6 +10,14 @@ export function listAttendanceWorker(query) {
   })
 }
 
+// 查询考勤人员基本属性列表
+export function queryAttendanceWorker(query) {
+  return request({
+    url: '/project/attendanceWorker/query',
+    method: 'get',
+    params: query
+  })
+}
 // 查询考勤人员基本属性列表
 export function listJgwAttendanceWorker(query) {
   return request({
diff --git a/ruoyi-ui/src/views/project/attendanceWorker/index.vue b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
index 250c1057..feecbd1d 100644
--- a/ruoyi-ui/src/views/project/attendanceWorker/index.vue
+++ b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
@@ -94,7 +94,7 @@
 </template>
 
 <script>
-import { listAttendanceWorker, listJgwAttendanceWorker, getAttendanceWorker, delAttendanceWorker, addAttendanceWorker, updateAttendanceWorker, queryAttendanceData } from "@/api/project/attendanceWorker";
+import { queryAttendanceWorker, listJgwAttendanceWorker, getAttendanceWorker, delAttendanceWorker, addAttendanceWorker, updateAttendanceWorker, queryAttendanceData } from "@/api/project/attendanceWorker";
 import { listAttendanceConfig } from '@/api/project/attendanceConfig.js'
 export default {
   name: "AttendanceWorker",
@@ -192,7 +192,7 @@ export default {
     getList() {      
       this.loading = true;
       let tmps = this.cfgList.filter(d => d.projectId == this.queryParams.projectId && d.subDeptId == this.queryParams.subDeptId);
-      let ajax = listAttendanceWorker;
+      let ajax = queryAttendanceWorker;
       if (tmps.length > 0 && tmps[0].vendorsCode == 'jgw') {
         ajax = listJgwAttendanceWorker;
       }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceGroup.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceGroup.java
index e4a8c3a9..4779895a 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceGroup.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceGroup.java
@@ -160,7 +160,13 @@ public class SurProjectAttendanceGroup extends BaseEntity
         g.companyCode=json.getString("companyCode");
         g.companyId=""+json.getLongValue("companyId",0);
         g.companyName=json.getString("companyName");
-        g.companyTypeId=json.getString("companyTypeId");
+        String typeId=json.getString("companyTypeId");
+        if("1".equals(typeId)||"8".equals(typeId)||"9".equals(typeId)){
+            typeId=typeId;
+        }else{
+            typeId="2";
+        }
+        g.companyTypeId=typeId;
         g.vendorId=json.getLongValue("vendorId",0);
         g.name=json.getString("name");
         g.leaderName=json.getString("leaderName");
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceGroupServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceGroupServiceImpl.java
index 97f41229..15513d9f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceGroupServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceGroupServiceImpl.java
@@ -134,9 +134,9 @@ public class SurProjectAttendanceGroupServiceImpl implements ISurProjectAttendan
     @Override
     public void add(SurProjectAttendanceGroup group) {
         SurProjectAttendanceGroup where=new SurProjectAttendanceGroup();
-        where.setServerid(group.getCompanyId());
+        where.setServerid(group.getServerid());
         where.setCfgid(group.getCfgid());
-        List<SurProjectAttendanceGroup> list=selectSurProjectAttendanceGroupViewList(where);
+        List<SurProjectAttendanceGroup> list=selectSurProjectAttendanceGroupList(where);
         if(list.size()==0){
             insertSurProjectAttendanceGroup(group);
         }else{