From a88422a96343a2ed3208f3b9e0c67004976f6328 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 26 Mar 2024 01:05:54 +0800
Subject: [PATCH 1/2] update code

---
 .../java/com/yanzhu/jh/project/task/AttendanceJgwTask.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 55ad8914..25626106 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
@@ -251,7 +251,7 @@ public class AttendanceJgwTask {
     public  static  void findTeamByProjectId(String appId,String token,String projectId){
         String path="webapi/project/findTeamByProjectId";
         String time = System.currentTimeMillis() + "";
-        String startId="0";
+        String startId="100";
         String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
 
         String tokenSign = Md5Utils.hash(url);
@@ -322,6 +322,11 @@ public class AttendanceJgwTask {
                     cnt++;
                 }
                SurProjectAttendanceUser user=SurProjectAttendanceUser.createFromJgw(json);
+                if(user.getWorkerId().equals("e878b1b9c6ac461ebc4109843974f4c3")){
+                    String k=user.getName();
+                    JSONArray arr2= json.getJSONArray("corpName");
+                    Object o=arr2.get(0);
+                }
             }
             System.out.println("cnt:"+cnt+","+arr.size());
             //findAddWorkerByProject(appId, token, projectId, endId);

From 1be2c0e05c9221af8f6c760258251935c41e0cb0 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 26 Mar 2024 01:13:02 +0800
Subject: [PATCH 2/2] update code

---
 ruoyi-ui/src/api/project/attendance.js        |  2 +
 ruoyi-ui/src/api/project/attendanceWorker.js  |  8 ++++
 .../views/project/attendanceWorker/index.vue  | 18 +++++--
 .../SurProjectAttendanceUserController.java   |  8 ++++
 .../domain/SurProjectAttendanceUser.java      | 11 ++++-
 .../SurProjectAttendanceUserMapper.java       |  2 +
 .../ISurProjectAttendanceUserService.java     |  7 +++
 .../SurProjectAttendanceUserServiceImpl.java  |  5 ++
 .../SurProjectAttendanceUserMapper.xml        | 47 ++++++++++++++++++-
 9 files changed, 102 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/api/project/attendance.js b/ruoyi-ui/src/api/project/attendance.js
index 7c4ff9a7..05b6d01b 100644
--- a/ruoyi-ui/src/api/project/attendance.js
+++ b/ruoyi-ui/src/api/project/attendance.js
@@ -9,6 +9,8 @@ export function listAttendance(query) {
   })
 }
 
+
+
 // 查询劳务实名制管理详细
 export function getAttendance(id) {
   return request({
diff --git a/ruoyi-ui/src/api/project/attendanceWorker.js b/ruoyi-ui/src/api/project/attendanceWorker.js
index 7b2df96f..db98773b 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 listJgwAttendanceWorker(query) {
+  return request({
+    url: '/project/attendanceWorker/listjgw',
+    method: 'get',
+    params: query
+  })
+}
 // 查询考勤人员基本属性详细
 export function getAttendanceWorker(id) {
   return request({
diff --git a/ruoyi-ui/src/views/project/attendanceWorker/index.vue b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
index 30d0759d..24c2e83a 100644
--- a/ruoyi-ui/src/views/project/attendanceWorker/index.vue
+++ b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
@@ -61,7 +61,7 @@
       <el-table-column label="性别" align="center" prop="attendanceType" >
         <template slot-scope="{row}">{{ row.gender==1?'女':'男' }}</template>
       </el-table-column>
-      <el-table-column label="进场时间" align="center" prop="inTime">
+      <el-table-column label="进场时间" align="center" prop="inTime" v-if="1==2">
         <template slot-scope="{row}">{{ row.enterDate|formatDate }}</template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
@@ -80,8 +80,8 @@
 </template>
 
 <script>
-import { listAttendanceWorker, getAttendanceWorker, delAttendanceWorker, addAttendanceWorker, updateAttendanceWorker,queryAttendanceData } from "@/api/project/attendanceWorker";
-
+import { listAttendanceWorker,listJgwAttendanceWorker, getAttendanceWorker, delAttendanceWorker, addAttendanceWorker, updateAttendanceWorker,queryAttendanceData } from "@/api/project/attendanceWorker";
+import {listAttendanceConfig} from '@/api/project/attendanceConfig.js'
 export default {
   name: "AttendanceWorker",
   data() {
@@ -120,12 +120,16 @@ export default {
       projectOptions: [],
       depts: [],
       prjDisabled:false,
+      cfgList:[],
     };
   },
   created() {
     this.$api.publics.getMyProjectList({}).then((response) => {
       this.projectOptions = response.rows;
     });    
+    listAttendanceConfig({}).then(d=>{
+      this.cfgList=d.rows||[];
+    });
   },
   methods: {
     initMe(prj){
@@ -170,8 +174,14 @@ export default {
     },
     /** 查询考勤人员基本属性列表 */
     getList() {
+      debugger
       this.loading = true;
-      listAttendanceWorker(this.queryParams).then(response => {        
+      let tmps=this.cfgList.filter(d=>d.projectId==this.queryParams.projectId && d.subDeptId==this.queryParams.subDeptId);
+      let ajax=listAttendanceWorker(this.queryParams);
+      if(tmps.length>0 && tmps[0].vendorsCode=='jgw'){
+        ajax=listJgwAttendanceWorker(this.queryParams)
+      }      
+      ajax.then(response => {        
         this.attendanceWorkerList = (response.rows||[]).map(it=>{
           it.enterDate=it.enterDate?new Date(it.enterDate*1):null;
           return it;
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUserController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUserController.java
index 6b85b336..a7f5fef9 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUserController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUserController.java
@@ -48,6 +48,14 @@ public class SurProjectAttendanceUserController extends BaseController
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('project:attendanceWorker:list')")
+    @GetMapping("/listjgw")
+    public TableDataInfo listjgw(SurProjectAttendanceUser surProjectAttendanceUser)
+    {
+        startPage();
+        List<SurProjectAttendanceUser> list = surProjectAttendanceUserService.selectSurProjectAttendanceUserListJgw(surProjectAttendanceUser);
+        return getDataTable(list);
+    }
     /**
      * 导出考勤人员基本属性列表
      */
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 732748fb..a4ff3f06 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
@@ -2,6 +2,7 @@ package com.yanzhu.jh.project.domain;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -221,7 +222,7 @@ public class SurProjectAttendanceUser extends BaseEntity
         u.groupId="";
         u.groupName="";
         u.workTypeCode="";
-        u.workTypeName="";
+        u.workTypeName=j.getString("jobtype");
         u.state="01".equals( j.getString("workerStatus"))?0l:1l;
         String workDate=j.getString("workDate");
         if(!StrUtil.isEmpty(workDate)){
@@ -233,6 +234,14 @@ public class SurProjectAttendanceUser extends BaseEntity
         u.teamName="";
         u.other=j.toJSONString();
         u.isDel=0l;
+        JSONArray ja=j.getJSONArray("corpName");
+        if(ja!=null && ja.size()>0){
+            Object obj=ja.get(0);
+            if(obj!=null){
+                u.companyName=obj.toString();
+            }
+        }
+
         u.leader=j.getInteger("isAdmin")==1?1:0;
         return  u;
     }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java
index 0d279fba..24115a87 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java
@@ -38,6 +38,8 @@ public interface SurProjectAttendanceUserMapper
      */
     public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserList(SurProjectAttendanceUser surProjectAttendanceUser);
 
+
+    public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserListJgw(SurProjectAttendanceUser surProjectAttendanceUser);
     /**
      * 新增考勤人员基本属性
      * 
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java
index 1206ec00..f70f63a8 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java
@@ -95,4 +95,11 @@ public interface ISurProjectAttendanceUserService
     public List<SurProjectAttendanceUser> todayAttendance(SurProjectAttendanceUser where);
 
     public long countAttendance(SurProjectAttendanceUser where);
+
+    /**
+     * 济工网人员查询
+     * @param surProjectAttendanceUser
+     * @return
+     */
+    public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserListJgw(SurProjectAttendanceUser surProjectAttendanceUser);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java
index 23434d65..6b5cf092 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java
@@ -202,6 +202,11 @@ public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanc
         return surProjectAttendanceUserMapper.countAttendance(where);
     }
 
+    @Override
+    public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserListJgw(SurProjectAttendanceUser surProjectAttendanceUser) {
+        return surProjectAttendanceUserMapper.selectSurProjectAttendanceUserListJgw(surProjectAttendanceUser);
+    }
+
     private Date findDate(List<SurProjectAttendanceUser> datas, SurProjectAttendanceUser u, String type) {
         for (SurProjectAttendanceUser user:datas) {
             if(user.getWorkerId().equals(u.getWorkerId()) && user.getName().equals(type)){
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
index cef24185..8a339169 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
@@ -57,7 +57,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                           WHERE a.cfgid=b.id )
         sur_project_attendance_user
     </sql>
-
+    <select id="selectSurProjectAttendanceUserListJgw" 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.groupId,u.groupName,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,g.companyName,g.companyCode workTypeName
+        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>
+            <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="vendorsCode != null  and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>
+            <if test="workerId != null "> and workerId = #{workerId}</if>
+            <if test="laborWorkerId != null "> and laborWorkerId = #{laborWorkerId}</if>
+            <if test="workerCategory != null "> and workerCategory = #{workerCategory}</if>
+            <if test="qrCode != null "> and qrCode = #{qrCode}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="ethnic != null  and ethnic != ''"> and ethnic = #{ethnic}</if>
+            <if test="nativePlace != null  and nativePlace != ''"> and nativePlace = #{nativePlace}</if>
+            <if test="gender != null "> and gender = #{gender}</if>
+            <if test="birthDate != null "> and birthDate = #{birthDate}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="degreeName != null  and degreeName != ''"> and degreeName like concat('%', #{degreeName}, '%')</if>
+            <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
+            <if test="recentPhoto != null  and recentPhoto != ''"> and recentPhoto = #{recentPhoto}</if>
+            <if test="groupId != null "> and groupId = #{groupId}</if>
+            <if test="groupName != null  and groupName != ''"> and groupName like concat('%', #{groupName}, '%')</if>
+            <if test="leader != null "> and leader = #{leader}</if>
+            <if test="workTypeCode != null  and workTypeCode != ''"> and workTypeCode = #{workTypeCode}</if>
+            <if test="workTypeName != null  and workTypeName != ''"> and workTypeName like concat('%', #{workTypeName}, '%')</if>
+            <if test="specWorkType != null "> and specWorkType = #{specWorkType}</if>
+            <if test="hatCode != null  and hatCode != ''"> and hatCode = #{hatCode}</if>
+            <if test="state != null "> and state = #{state}</if>
+            <if test="enterDate != null  and enterDate != ''"> and enterDate = #{enterDate}</if>
+            <if test="exitDate != null  and exitDate != ''"> and exitDate = #{exitDate}</if>
+            <if test="companyId != null "> and companyId = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and companyName like concat('%', #{companyName}, '%')</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="teamId != null "> and teamId = #{teamId}</if>
+            <if test="teamName != null  and teamName != ''"> and teamName like concat('%', #{teamName}, '%')</if>
+            <if test="enterType != null  and enterType != ''"> and enterType = #{enterType}</if>
+            <if test="other != null  and other != ''"> and other = #{other}</if>
+            <if test="projectId != null  and projectId > 0 "> and project_id = #{projectId}</if>
+            <if test="subDeptId != null  and subDeptId >0 "> and sub_dept_id = #{subDeptId}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+    </select>
     <select id="selectSurProjectAttendanceUserList" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
         <include refid="selectSurProjectAttendanceUserVo"/>
         <where>