From 88d671d50b69f41517ba6ca22a91a1dd39272841 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Wed, 27 Sep 2023 00:09:47 +0800
Subject: [PATCH] update code

---
 ruoyi-ui/src/api/project/attendanceWorker.js  |   2 +-
 .../src/api/project/gldAttendanceGroup.js     |  44 ++
 ruoyi-ui/src/views/login.vue                  |   5 +
 .../project/gldAttendanceGroup/index.vue      | 534 ++++++++++++++++++
 .../SurProjectAttendanceGroupController.java  | 104 ++++
 .../domain/SurProjectAttendanceGroup.java     | 367 ++++++++++++
 .../SurProjectAttendanceGroupMapper.java      |  61 ++
 .../ISurProjectAttendanceGroupService.java    |  63 +++
 .../SurProjectAttendanceGroupServiceImpl.java | 111 ++++
 .../impl/SurProjectCheckingServiceImpl.java   |   3 +-
 .../jh/project/task/AttendanceTask.java       |  70 ++-
 .../SurProjectAttendanceGroupMapper.xml       | 181 ++++++
 .../SurProjectAttendanceUserMapper.xml        |   3 +-
 .../trouble/SmzSspProblemmodifyMapper.xml     |   8 +-
 14 files changed, 1542 insertions(+), 14 deletions(-)
 create mode 100644 ruoyi-ui/src/api/project/gldAttendanceGroup.js
 create mode 100644 ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
 create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceGroupController.java
 create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceGroup.java
 create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceGroupMapper.java
 create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceGroupService.java
 create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceGroupServiceImpl.java
 create mode 100644 yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceGroupMapper.xml

diff --git a/ruoyi-ui/src/api/project/attendanceWorker.js b/ruoyi-ui/src/api/project/attendanceWorker.js
index 75b55754..ba8ba6ac 100644
--- a/ruoyi-ui/src/api/project/attendanceWorker.js
+++ b/ruoyi-ui/src/api/project/attendanceWorker.js
@@ -45,7 +45,7 @@ export function delAttendanceWorker(id) {
 
 export function queryAttendanceData(data){
   return request({
-    url: '/project/attendanceWorker/queryAttendanceData',
+    url: `/project/attendanceWorker/queryAttendanceData?pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
     method: 'post',
     data:data
   })
diff --git a/ruoyi-ui/src/api/project/gldAttendanceGroup.js b/ruoyi-ui/src/api/project/gldAttendanceGroup.js
new file mode 100644
index 00000000..22203773
--- /dev/null
+++ b/ruoyi-ui/src/api/project/gldAttendanceGroup.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询广联达班组信息列表
+export function listGldAttendanceGroup(query) {
+  return request({
+    url: '/project/gldAttendanceGroup/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询广联达班组信息详细
+export function getGldAttendanceGroup(id) {
+  return request({
+    url: '/project/gldAttendanceGroup/' + id,
+    method: 'get'
+  })
+}
+
+// 新增广联达班组信息
+export function addGldAttendanceGroup(data) {
+  return request({
+    url: '/project/gldAttendanceGroup',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改广联达班组信息
+export function updateGldAttendanceGroup(data) {
+  return request({
+    url: '/project/gldAttendanceGroup',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除广联达班组信息
+export function delGldAttendanceGroup(id) {
+  return request({
+    url: '/project/gldAttendanceGroup/' + id,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 5c9cd8f5..43a540c4 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -168,6 +168,11 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
+@media only screen and (min-width: 1600px){
+  .login-bg {
+    background-size: 100% 100%;
+  }
+}
 .login-bg {
   background-image: url("/images/bg1.png?v=20230923");
   position: absolute;
diff --git a/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue b/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
new file mode 100644
index 00000000..62dea957
--- /dev/null
+++ b/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
@@ -0,0 +1,534 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="${comment}" prop="cfgid">
+        <el-input
+          v-model="queryParams.cfgid"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="服务器主键id" prop="serverid">
+        <el-input
+          v-model="queryParams.serverid"
+          placeholder="请输入服务器主键id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="营业执照号" prop="bizLicense">
+        <el-input
+          v-model="queryParams.bizLicense"
+          placeholder="请输入营业执照号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分包商统一社会信用代码" prop="companyCode">
+        <el-input
+          v-model="queryParams.companyCode"
+          placeholder="请输入分包商统一社会信用代码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分包商ID" prop="companyId">
+        <el-input
+          v-model="queryParams.companyId"
+          placeholder="请输入分包商ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分包商名称" prop="companyName">
+        <el-input
+          v-model="queryParams.companyName"
+          placeholder="请输入分包商名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分包商类型" prop="companyTypeId">
+        <el-input
+          v-model="queryParams.companyTypeId"
+          placeholder="请输入分包商类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="平台对应分包商ID" prop="vendorId">
+        <el-input
+          v-model="queryParams.vendorId"
+          placeholder="请输入平台对应分包商ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入班组名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组长名称" prop="leaderName">
+        <el-input
+          v-model="queryParams.leaderName"
+          placeholder="请输入班组长名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组长电话" prop="leaderPhone">
+        <el-input
+          v-model="queryParams.leaderPhone"
+          placeholder="请输入班组长电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="队伍Id" prop="teamId">
+        <el-input
+          v-model="queryParams.teamId"
+          placeholder="请输入队伍Id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="队伍名称" prop="teamName">
+        <el-input
+          v-model="queryParams.teamName"
+          placeholder="请输入队伍名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组长对应的工人ID" prop="leaderId">
+        <el-input
+          v-model="queryParams.leaderId"
+          placeholder="请输入班组长对应的工人ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否删除" prop="deleted">
+        <el-input
+          v-model="queryParams.deleted"
+          placeholder="请输入是否删除"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-input
+          v-model="queryParams.createTime"
+          placeholder="请输入创建时间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="基础平台对应班组ID" prop="platformGroupId">
+        <el-input
+          v-model="queryParams.platformGroupId"
+          placeholder="请输入基础平台对应班组ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="基础平台对应队伍ID" prop="platformTeamId">
+        <el-input
+          v-model="queryParams.platformTeamId"
+          placeholder="请输入基础平台对应队伍ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="企业进场日期" prop="enterDate">
+        <el-input
+          v-model="queryParams.enterDate"
+          placeholder="请输入企业进场日期"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="企业退场日期" prop="exitDate">
+        <el-input
+          v-model="queryParams.exitDate"
+          placeholder="请输入企业退场日期"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="${comment}" prop="isDel">
+        <el-input
+          v-model="queryParams.isDel"
+          placeholder="请输入${comment}"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['project:gldAttendanceGroup:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['project:gldAttendanceGroup:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['project:gldAttendanceGroup:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['project:gldAttendanceGroup:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="gldAttendanceGroupList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="${comment}" align="center" prop="cfgid" />
+      <el-table-column label="服务器主键id" align="center" prop="serverid" />
+      <el-table-column label="营业执照号" align="center" prop="bizLicense" />
+      <el-table-column label="分包商统一社会信用代码" align="center" prop="companyCode" />
+      <el-table-column label="分包商ID" align="center" prop="companyId" />
+      <el-table-column label="分包商名称" align="center" prop="companyName" />
+      <el-table-column label="分包商类型" align="center" prop="companyTypeId" />
+      <el-table-column label="平台对应分包商ID" align="center" prop="vendorId" />
+      <el-table-column label="班组名称" align="center" prop="name" />
+      <el-table-column label="班组长名称" align="center" prop="leaderName" />
+      <el-table-column label="班组长电话" align="center" prop="leaderPhone" />
+      <el-table-column label="队伍Id" align="center" prop="teamId" />
+      <el-table-column label="队伍名称" align="center" prop="teamName" />
+      <el-table-column label="班组类型0:建筑工人班组;1:管理人员班组" align="center" prop="type" />
+      <el-table-column label="班组长对应的工人ID" align="center" prop="leaderId" />
+      <el-table-column label="是否删除" align="center" prop="deleted" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="基础平台对应班组ID" align="center" prop="platformGroupId" />
+      <el-table-column label="基础平台对应队伍ID" align="center" prop="platformTeamId" />
+      <el-table-column label="企业进场日期" align="center" prop="enterDate" />
+      <el-table-column label="企业退场日期" align="center" prop="exitDate" />
+      <el-table-column label="${comment}" align="center" prop="remark" />
+      <el-table-column label="${comment}" align="center" prop="isDel" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:gldAttendanceGroup:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['project:gldAttendanceGroup:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改广联达班组信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="${comment}" prop="cfgid">
+          <el-input v-model="form.cfgid" placeholder="请输入${comment}" />
+        </el-form-item>
+        <el-form-item label="服务器主键id" prop="serverid">
+          <el-input v-model="form.serverid" placeholder="请输入服务器主键id" />
+        </el-form-item>
+        <el-form-item label="营业执照号" prop="bizLicense">
+          <el-input v-model="form.bizLicense" placeholder="请输入营业执照号" />
+        </el-form-item>
+        <el-form-item label="分包商统一社会信用代码" prop="companyCode">
+          <el-input v-model="form.companyCode" placeholder="请输入分包商统一社会信用代码" />
+        </el-form-item>
+        <el-form-item label="分包商ID" prop="companyId">
+          <el-input v-model="form.companyId" placeholder="请输入分包商ID" />
+        </el-form-item>
+        <el-form-item label="分包商名称" prop="companyName">
+          <el-input v-model="form.companyName" placeholder="请输入分包商名称" />
+        </el-form-item>
+        <el-form-item label="分包商类型" prop="companyTypeId">
+          <el-input v-model="form.companyTypeId" placeholder="请输入分包商类型" />
+        </el-form-item>
+        <el-form-item label="平台对应分包商ID" prop="vendorId">
+          <el-input v-model="form.vendorId" placeholder="请输入平台对应分包商ID" />
+        </el-form-item>
+        <el-form-item label="班组名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入班组名称" />
+        </el-form-item>
+        <el-form-item label="班组长名称" prop="leaderName">
+          <el-input v-model="form.leaderName" placeholder="请输入班组长名称" />
+        </el-form-item>
+        <el-form-item label="班组长电话" prop="leaderPhone">
+          <el-input v-model="form.leaderPhone" placeholder="请输入班组长电话" />
+        </el-form-item>
+        <el-form-item label="队伍Id" prop="teamId">
+          <el-input v-model="form.teamId" placeholder="请输入队伍Id" />
+        </el-form-item>
+        <el-form-item label="队伍名称" prop="teamName">
+          <el-input v-model="form.teamName" placeholder="请输入队伍名称" />
+        </el-form-item>
+        <el-form-item label="班组长对应的工人ID" prop="leaderId">
+          <el-input v-model="form.leaderId" placeholder="请输入班组长对应的工人ID" />
+        </el-form-item>
+        <el-form-item label="是否删除" prop="deleted">
+          <el-input v-model="form.deleted" placeholder="请输入是否删除" />
+        </el-form-item>
+        <el-form-item label="基础平台对应班组ID" prop="platformGroupId">
+          <el-input v-model="form.platformGroupId" placeholder="请输入基础平台对应班组ID" />
+        </el-form-item>
+        <el-form-item label="基础平台对应队伍ID" prop="platformTeamId">
+          <el-input v-model="form.platformTeamId" placeholder="请输入基础平台对应队伍ID" />
+        </el-form-item>
+        <el-form-item label="企业进场日期" prop="enterDate">
+          <el-input v-model="form.enterDate" placeholder="请输入企业进场日期" />
+        </el-form-item>
+        <el-form-item label="企业退场日期" prop="exitDate">
+          <el-input v-model="form.exitDate" placeholder="请输入企业退场日期" />
+        </el-form-item>
+        <el-form-item label="${comment}" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入${comment}" />
+        </el-form-item>
+        <el-form-item label="${comment}" prop="isDel">
+          <el-input v-model="form.isDel" placeholder="请输入${comment}" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listGldAttendanceGroup, getGldAttendanceGroup, delGldAttendanceGroup, addGldAttendanceGroup, updateGldAttendanceGroup } from "@/api/project/gldAttendanceGroup";
+
+export default {
+  name: "GldAttendanceGroup",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 广联达班组信息表格数据
+      gldAttendanceGroupList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cfgid: null,
+        serverid: null,
+        bizLicense: null,
+        companyCode: null,
+        companyId: null,
+        companyName: null,
+        companyTypeId: null,
+        vendorId: null,
+        name: null,
+        leaderName: null,
+        leaderPhone: null,
+        teamId: null,
+        teamName: null,
+        type: null,
+        leaderId: null,
+        deleted: null,
+        createTime: null,
+        platformGroupId: null,
+        platformTeamId: null,
+        enterDate: null,
+        exitDate: null,
+        isDel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询广联达班组信息列表 */
+    getList() {
+      this.loading = true;
+      listGldAttendanceGroup(this.queryParams).then(response => {
+        this.gldAttendanceGroupList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        cfgid: null,
+        serverid: null,
+        bizLicense: null,
+        companyCode: null,
+        companyId: null,
+        companyName: null,
+        companyTypeId: null,
+        vendorId: null,
+        name: null,
+        leaderName: null,
+        leaderPhone: null,
+        teamId: null,
+        teamName: null,
+        type: null,
+        leaderId: null,
+        deleted: null,
+        createTime: null,
+        platformGroupId: null,
+        platformTeamId: null,
+        enterDate: null,
+        exitDate: null,
+        remark: null,
+        isDel: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加广联达班组信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getGldAttendanceGroup(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改广联达班组信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateGldAttendanceGroup(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGldAttendanceGroup(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除广联达班组信息编号为"' + ids + '"的数据项？').then(function() {
+        return delGldAttendanceGroup(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('project/gldAttendanceGroup/export', {
+        ...this.queryParams
+      }, `gldAttendanceGroup_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceGroupController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceGroupController.java
new file mode 100644
index 00000000..9ec8db18
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceGroupController.java
@@ -0,0 +1,104 @@
+package com.yanzhu.jh.project.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceGroup;
+import com.yanzhu.jh.project.service.ISurProjectAttendanceGroupService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 广联达班组信息Controller
+ * 
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+@RestController
+@RequestMapping("/project/gldAttendanceGroup")
+public class SurProjectAttendanceGroupController extends BaseController
+{
+    @Autowired
+    private ISurProjectAttendanceGroupService surProjectAttendanceGroupService;
+
+    /**
+     * 查询广联达班组信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('project:gldAttendanceGroup:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        startPage();
+        List<SurProjectAttendanceGroup> list = surProjectAttendanceGroupService.selectSurProjectAttendanceGroupList(surProjectAttendanceGroup);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出广联达班组信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('project:gldAttendanceGroup:export')")
+    @Log(title = "广联达班组信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        List<SurProjectAttendanceGroup> list = surProjectAttendanceGroupService.selectSurProjectAttendanceGroupList(surProjectAttendanceGroup);
+        ExcelUtil<SurProjectAttendanceGroup> util = new ExcelUtil<SurProjectAttendanceGroup>(SurProjectAttendanceGroup.class);
+        util.exportExcel(response, list, "广联达班组信息数据");
+    }
+
+    /**
+     * 获取广联达班组信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('project:gldAttendanceGroup:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(surProjectAttendanceGroupService.selectSurProjectAttendanceGroupById(id));
+    }
+
+    /**
+     * 新增广联达班组信息
+     */
+    @PreAuthorize("@ss.hasPermi('project:gldAttendanceGroup:add')")
+    @Log(title = "广联达班组信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        return toAjax(surProjectAttendanceGroupService.insertSurProjectAttendanceGroup(surProjectAttendanceGroup));
+    }
+
+    /**
+     * 修改广联达班组信息
+     */
+    @PreAuthorize("@ss.hasPermi('project:gldAttendanceGroup:edit')")
+    @Log(title = "广联达班组信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        return toAjax(surProjectAttendanceGroupService.updateSurProjectAttendanceGroup(surProjectAttendanceGroup));
+    }
+
+    /**
+     * 删除广联达班组信息
+     */
+    @PreAuthorize("@ss.hasPermi('project:gldAttendanceGroup:remove')")
+    @Log(title = "广联达班组信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(surProjectAttendanceGroupService.deleteSurProjectAttendanceGroupByIds(ids));
+    }
+}
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
new file mode 100644
index 00000000..5a9439d6
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceGroup.java
@@ -0,0 +1,367 @@
+package com.yanzhu.jh.project.domain;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson2.JSONObject;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 广联达班组信息对象 sur_project_attendance_group
+ * 
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+public class SurProjectAttendanceGroup extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long cfgid;
+
+    /** 服务器主键id */
+    @Excel(name = "服务器主键id")
+    private Long serverid;
+
+    /** 营业执照号 */
+    @Excel(name = "营业执照号")
+    private String bizLicense;
+
+    /** 分包商统一社会信用代码 */
+    @Excel(name = "分包商统一社会信用代码")
+    private String companyCode;
+
+    /** 分包商ID */
+    @Excel(name = "分包商ID")
+    private Long companyId;
+
+    /** 分包商名称 */
+    @Excel(name = "分包商名称")
+    private String companyName;
+
+    /** 分包商类型 */
+    @Excel(name = "分包商类型")
+    private String companyTypeId;
+
+    /** 平台对应分包商ID */
+    @Excel(name = "平台对应分包商ID")
+    private Long vendorId;
+
+    /** 班组名称 */
+    @Excel(name = "班组名称")
+    private String name;
+
+    /** 班组长名称 */
+    @Excel(name = "班组长名称")
+    private String leaderName;
+
+    /** 班组长电话 */
+    @Excel(name = "班组长电话")
+    private String leaderPhone;
+
+    /** 队伍Id */
+    @Excel(name = "队伍Id")
+    private Long teamId;
+
+    /** 队伍名称 */
+    @Excel(name = "队伍名称")
+    private String teamName;
+
+    /** 班组类型0:建筑工人班组;1:管理人员班组 */
+    @Excel(name = "班组类型0:建筑工人班组;1:管理人员班组")
+    private Long type;
+
+    /** 班组长对应的工人ID */
+    @Excel(name = "班组长对应的工人ID")
+    private Long leaderId;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private Integer deleted;
+
+    /** 基础平台对应班组ID */
+    @Excel(name = "基础平台对应班组ID")
+    private Long platformGroupId;
+
+    /** 基础平台对应队伍ID */
+    @Excel(name = "基础平台对应队伍ID")
+    private Long platformTeamId;
+
+    /** 企业进场日期 */
+    @Excel(name = "企业进场日期")
+    private Long enterDate;
+
+    /** 企业退场日期 */
+    @Excel(name = "企业退场日期")
+    private Long exitDate;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDel;
+
+    public static SurProjectAttendanceGroup create(JSONObject json) {
+        SurProjectAttendanceGroup g=new SurProjectAttendanceGroup();
+        g.serverid=json.getLong("id");
+        g.bizLicense=json.getString("bizLicense");
+        g.companyCode=json.getString("companyCode");
+        g.companyId=json.getLong("companyId");
+        g.companyName=json.getString("companyName");
+        g.companyTypeId=json.getString("companyTypeId");
+        g.vendorId=json.getLong("vendorId");
+        g.name=json.getString("name");
+        g.leaderName=json.getString("leaderName");
+        g.leaderPhone=json.getString("leaderPhone");
+        g.teamId=json.getLong("teamId");
+        g.teamName=json.getString("teamName");
+        g.type=json.getLong("type");
+        g.leaderId=json.getLong("leaderId");
+        g.deleted=json.get("deleted")==null?0:(json.getBoolean("deleted")?1:0);
+        g.platformGroupId=json.getLong("platformGroupId");
+        g.platformTeamId=json.getLong("platformTeamId");
+        g.enterDate=json.getLong("enterDate");
+        g.exitDate=json.getLong("exitDate");
+        g.isDel=0l;
+        return g;
+
+    }
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCfgid(Long cfgid) 
+    {
+        this.cfgid = cfgid;
+    }
+
+    public Long getCfgid() 
+    {
+        return cfgid;
+    }
+    public void setServerid(Long serverid) 
+    {
+        this.serverid = serverid;
+    }
+
+    public Long getServerid() 
+    {
+        return serverid;
+    }
+    public void setBizLicense(String bizLicense) 
+    {
+        this.bizLicense = bizLicense;
+    }
+
+    public String getBizLicense() 
+    {
+        return bizLicense;
+    }
+    public void setCompanyCode(String companyCode) 
+    {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyCode() 
+    {
+        return companyCode;
+    }
+    public void setCompanyId(Long companyId) 
+    {
+        this.companyId = companyId;
+    }
+
+    public Long getCompanyId() 
+    {
+        return companyId;
+    }
+    public void setCompanyName(String companyName) 
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName() 
+    {
+        return companyName;
+    }
+    public void setCompanyTypeId(String companyTypeId) 
+    {
+        this.companyTypeId = companyTypeId;
+    }
+
+    public String getCompanyTypeId() 
+    {
+        return companyTypeId;
+    }
+    public void setVendorId(Long vendorId) 
+    {
+        this.vendorId = vendorId;
+    }
+
+    public Long getVendorId() 
+    {
+        return vendorId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setLeaderName(String leaderName) 
+    {
+        this.leaderName = leaderName;
+    }
+
+    public String getLeaderName() 
+    {
+        return leaderName;
+    }
+    public void setLeaderPhone(String leaderPhone) 
+    {
+        this.leaderPhone = leaderPhone;
+    }
+
+    public String getLeaderPhone() 
+    {
+        return leaderPhone;
+    }
+    public void setTeamId(Long teamId) 
+    {
+        this.teamId = teamId;
+    }
+
+    public Long getTeamId() 
+    {
+        return teamId;
+    }
+    public void setTeamName(String teamName) 
+    {
+        this.teamName = teamName;
+    }
+
+    public String getTeamName() 
+    {
+        return teamName;
+    }
+    public void setType(Long type) 
+    {
+        this.type = type;
+    }
+
+    public Long getType() 
+    {
+        return type;
+    }
+    public void setLeaderId(Long leaderId) 
+    {
+        this.leaderId = leaderId;
+    }
+
+    public Long getLeaderId() 
+    {
+        return leaderId;
+    }
+    public void setDeleted(Integer deleted) 
+    {
+        this.deleted = deleted;
+    }
+
+    public Integer getDeleted() 
+    {
+        return deleted;
+    }
+    public void setPlatformGroupId(Long platformGroupId) 
+    {
+        this.platformGroupId = platformGroupId;
+    }
+
+    public Long getPlatformGroupId() 
+    {
+        return platformGroupId;
+    }
+    public void setPlatformTeamId(Long platformTeamId) 
+    {
+        this.platformTeamId = platformTeamId;
+    }
+
+    public Long getPlatformTeamId() 
+    {
+        return platformTeamId;
+    }
+    public void setEnterDate(Long enterDate) 
+    {
+        this.enterDate = enterDate;
+    }
+
+    public Long getEnterDate() 
+    {
+        return enterDate;
+    }
+    public void setExitDate(Long exitDate) 
+    {
+        this.exitDate = exitDate;
+    }
+
+    public Long getExitDate() 
+    {
+        return exitDate;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("cfgid", getCfgid())
+            .append("serverid", getServerid())
+            .append("bizLicense", getBizLicense())
+            .append("companyCode", getCompanyCode())
+            .append("companyId", getCompanyId())
+            .append("companyName", getCompanyName())
+            .append("companyTypeId", getCompanyTypeId())
+            .append("vendorId", getVendorId())
+            .append("name", getName())
+            .append("leaderName", getLeaderName())
+            .append("leaderPhone", getLeaderPhone())
+            .append("teamId", getTeamId())
+            .append("teamName", getTeamName())
+            .append("type", getType())
+            .append("leaderId", getLeaderId())
+            .append("deleted", getDeleted())
+            .append("createTime", getCreateTime())
+            .append("platformGroupId", getPlatformGroupId())
+            .append("platformTeamId", getPlatformTeamId())
+            .append("enterDate", getEnterDate())
+            .append("exitDate", getExitDate())
+            .append("remark", getRemark())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceGroupMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceGroupMapper.java
new file mode 100644
index 00000000..4921bb11
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceGroupMapper.java
@@ -0,0 +1,61 @@
+package com.yanzhu.jh.project.mapper;
+
+import java.util.List;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceGroup;
+
+/**
+ * 广联达班组信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+public interface SurProjectAttendanceGroupMapper 
+{
+    /**
+     * 查询广联达班组信息
+     * 
+     * @param id 广联达班组信息主键
+     * @return 广联达班组信息
+     */
+    public SurProjectAttendanceGroup selectSurProjectAttendanceGroupById(Long id);
+
+    /**
+     * 查询广联达班组信息列表
+     * 
+     * @param surProjectAttendanceGroup 广联达班组信息
+     * @return 广联达班组信息集合
+     */
+    public List<SurProjectAttendanceGroup> selectSurProjectAttendanceGroupList(SurProjectAttendanceGroup surProjectAttendanceGroup);
+
+    /**
+     * 新增广联达班组信息
+     * 
+     * @param surProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceGroup(SurProjectAttendanceGroup surProjectAttendanceGroup);
+
+    /**
+     * 修改广联达班组信息
+     * 
+     * @param surProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceGroup(SurProjectAttendanceGroup surProjectAttendanceGroup);
+
+    /**
+     * 删除广联达班组信息
+     * 
+     * @param id 广联达班组信息主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupById(Long id);
+
+    /**
+     * 批量删除广联达班组信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupByIds(Long[] ids);
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceGroupService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceGroupService.java
new file mode 100644
index 00000000..ad4415af
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceGroupService.java
@@ -0,0 +1,63 @@
+package com.yanzhu.jh.project.service;
+
+import java.util.List;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceGroup;
+
+/**
+ * 广联达班组信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+public interface ISurProjectAttendanceGroupService 
+{
+    /**
+     * 查询广联达班组信息
+     * 
+     * @param id 广联达班组信息主键
+     * @return 广联达班组信息
+     */
+    public SurProjectAttendanceGroup selectSurProjectAttendanceGroupById(Long id);
+
+    /**
+     * 查询广联达班组信息列表
+     * 
+     * @param surProjectAttendanceGroup 广联达班组信息
+     * @return 广联达班组信息集合
+     */
+    public List<SurProjectAttendanceGroup> selectSurProjectAttendanceGroupList(SurProjectAttendanceGroup surProjectAttendanceGroup);
+
+    /**
+     * 新增广联达班组信息
+     * 
+     * @param surProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceGroup(SurProjectAttendanceGroup surProjectAttendanceGroup);
+
+    /**
+     * 修改广联达班组信息
+     * 
+     * @param surProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceGroup(SurProjectAttendanceGroup surProjectAttendanceGroup);
+
+    /**
+     * 批量删除广联达班组信息
+     * 
+     * @param ids 需要删除的广联达班组信息主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupByIds(Long[] ids);
+
+    /**
+     * 删除广联达班组信息信息
+     * 
+     * @param id 广联达班组信息主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupById(Long id);
+
+    public void add(SurProjectAttendanceGroup group);
+}
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
new file mode 100644
index 00000000..ea9d6fd1
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceGroupServiceImpl.java
@@ -0,0 +1,111 @@
+package com.yanzhu.jh.project.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.jh.project.mapper.SurProjectAttendanceGroupMapper;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceGroup;
+import com.yanzhu.jh.project.service.ISurProjectAttendanceGroupService;
+import com.ruoyi.common.utils.SecurityUtils;
+/**
+ * 广联达班组信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-09-26
+ */
+@Service
+public class SurProjectAttendanceGroupServiceImpl implements ISurProjectAttendanceGroupService 
+{
+    @Autowired
+    private SurProjectAttendanceGroupMapper surProjectAttendanceGroupMapper;
+
+    /**
+     * 查询广联达班组信息
+     * 
+     * @param id 广联达班组信息主键
+     * @return 广联达班组信息
+     */
+    @Override
+    public SurProjectAttendanceGroup selectSurProjectAttendanceGroupById(Long id)
+    {
+        return surProjectAttendanceGroupMapper.selectSurProjectAttendanceGroupById(id);
+    }
+
+    /**
+     * 查询广联达班组信息列表
+     * 
+     * @param surProjectAttendanceGroup 广联达班组信息
+     * @return 广联达班组信息
+     */
+    @Override
+    public List<SurProjectAttendanceGroup> selectSurProjectAttendanceGroupList(SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        return surProjectAttendanceGroupMapper.selectSurProjectAttendanceGroupList(surProjectAttendanceGroup);
+    }
+
+    /**
+     * 新增广联达班组信息
+     * 
+     * @param surProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    @Override
+    public int insertSurProjectAttendanceGroup(SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+
+        surProjectAttendanceGroup.setCreateBy("task");
+        return surProjectAttendanceGroupMapper.insertSurProjectAttendanceGroup(surProjectAttendanceGroup);
+    }
+
+    /**
+     * 修改广联达班组信息
+     * 
+     * @param surProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    @Override
+    public int updateSurProjectAttendanceGroup(SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        surProjectAttendanceGroup.setUpdateBy("task");
+        surProjectAttendanceGroup.setUpdateTime(DateUtils.getNowDate());
+        return surProjectAttendanceGroupMapper.updateSurProjectAttendanceGroup(surProjectAttendanceGroup);
+    }
+
+    /**
+     * 批量删除广联达班组信息
+     * 
+     * @param ids 需要删除的广联达班组信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceGroupByIds(Long[] ids)
+    {
+        return surProjectAttendanceGroupMapper.deleteSurProjectAttendanceGroupByIds(ids);
+    }
+
+    /**
+     * 删除广联达班组信息信息
+     * 
+     * @param id 广联达班组信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceGroupById(Long id)
+    {
+        return surProjectAttendanceGroupMapper.deleteSurProjectAttendanceGroupById(id);
+    }
+
+    @Override
+    public void add(SurProjectAttendanceGroup group) {
+        SurProjectAttendanceGroup where=new SurProjectAttendanceGroup();
+        where.setServerid(group.getServerid());
+        List<SurProjectAttendanceGroup> list=selectSurProjectAttendanceGroupList(where);
+        if(list.size()==0){
+            insertSurProjectAttendanceGroup(group);
+        }else{
+            group.setId(list.get(0).getId());
+            updateSurProjectAttendanceGroup(group);
+        }
+    }
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
index 03277b0f..ac489614 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
@@ -110,7 +110,8 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
         for(Map<String, Object> map:list){
             sum += Convert.toInt(map.get("total"));
             //"1"为验收合格
-            if("1".equals(map.get("check_result").toString())){
+
+            if(map.get("check_result")!=null &&  "1".equals(map.get("check_result").toString())){
                 okSum+=Convert.toInt(map.get("total"));
             }
         }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java
index 60f19077..c83cbd8b 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java
@@ -5,9 +5,11 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.yanzhu.jh.project.domain.SurProjectAttendanceCfg;
 import com.yanzhu.jh.project.domain.SurProjectAttendanceData;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceGroup;
 import com.yanzhu.jh.project.domain.SurProjectAttendanceUser;
 import com.yanzhu.jh.project.service.ISurProjectAttendanceCfgService;
 import com.yanzhu.jh.project.service.ISurProjectAttendanceDataService;
+import com.yanzhu.jh.project.service.ISurProjectAttendanceGroupService;
 import com.yanzhu.jh.project.service.ISurProjectAttendanceUserService;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
@@ -33,6 +35,9 @@ public class AttendanceTask {
 
     @Autowired
     ISurProjectAttendanceDataService attendanceDataService;
+
+    @Autowired
+    ISurProjectAttendanceGroupService attendanceGroupService;
     public  void syncWorker(){
         SurProjectAttendanceCfg where =new SurProjectAttendanceCfg();
         where.setEnabled(1l);
@@ -54,6 +59,57 @@ public class AttendanceTask {
             }
         }
     }
+
+    public void syncGroup(){
+        SurProjectAttendanceCfg where =new SurProjectAttendanceCfg();
+        where.setEnabled(1l);
+        where.setIsDel(0l);
+        where.setVendorsCode("gld");
+        List<SurProjectAttendanceCfg> list=attendanceCfgService.selectSurProjectAttendanceCfgList(where);
+        for(SurProjectAttendanceCfg it :list){
+            String param= it.getVendorsParameter();
+            if(Strings.isNotEmpty(param)){
+                try{
+                    JSONObject jo=JSON.parseObject(param);
+                    String appId=jo.getString("appId");
+                    String secret=jo.getString("secret");
+                    String projectId=jo.getString("projectId");
+                    doSyncGroup(appId,secret,projectId,it);
+                }catch (Exception ex){
+                    ex.printStackTrace();
+                }
+            }
+        }
+    }
+
+    private void doSyncGroup(String appId, String secret, String projectId, SurProjectAttendanceCfg it) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("projectId", projectId);
+        params.put("appid",appId);
+        String sign = getSign(params,secret);
+        String host="https://glm.glodon.com/api/open";
+        params.put("sign",sign);
+        String path="/worker/allGroup";
+        HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(host + path)).newBuilder();
+        params.forEach((s, o) -> {
+            urlBuilder.addQueryParameter(s, (String) o);
+        });
+        Request request = new Request.Builder()
+                .url(urlBuilder.build())
+                .build();
+        String data=getResult(request);
+        JSONObject jo= JSON.parseObject(data);
+        JSONArray arr=jo.getJSONArray("data");
+        if(arr!=null && arr.size()>0) {
+            for (int i = 0; i < arr.size(); i++) {
+                JSONObject json=arr.getJSONObject(i);
+                SurProjectAttendanceGroup group=SurProjectAttendanceGroup.create(json);
+                group.setCfgid(it.getId());
+                attendanceGroupService.add(group);
+            }
+        }
+    }
+
     private  void doSyncWorker(String appid,String secret,String projectld,int page,SurProjectAttendanceCfg it){
         Map<String, Object> params = new HashMap<>();
         params.put("projectId", projectld);
@@ -89,7 +145,7 @@ public class AttendanceTask {
             doSyncWorker(appid,secret,projectld,page+1,it);
         }
     }
-    public static void main(String[] args) {
+    public static void main1(String[] args) {
         //syncWorker("8fba899a21c64be4aa25bf0f3314ad5c","426b3d8280620176d80a826eebef3579","719148569880576",1);
         //doSyncAttendanceData("8fba899a21c64be4aa25bf0f3314ad5c","426b3d8280620176d80a826eebef3579","719148569880576",0,null);
     }
@@ -154,20 +210,20 @@ public class AttendanceTask {
             doSyncAttendanceData(appid,secret,projectld,lastId,it);
         }
     }
-    public static void main3(String[] args){
+    public static void main(String[] args){
         System.out.println("-------1--------->AttendanceUserTask.syncWorker");
         Map<String, Object> params = new HashMap<>();
         params.put("projectId", "719148569880576");
-        params.put("start", "2000-01-01 00:00:00");
-        params.put("end", "2099-01-01 00:00:00");
-        params.put("pageNo", "1");
-        params.put("pageSize", "1000");
+        //params.put("start", "2000-01-01 00:00:00");
+        //params.put("end", "2099-01-01 00:00:00");
+        //params.put("pageNo", "1");
+        //params.put("pageSize", "1000");
         params.put("appid","8fba899a21c64be4aa25bf0f3314ad5c");
         String sign = getSign(params,"426b3d8280620176d80a826eebef3579");
         System.out.println("--->"+sign);
         params.put("sign",sign);
         String host="https://glm.glodon.com/api/open";
-        String path="/worker/new/allWorkerInfo";
+        String path="/worker/allGroup";
         HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(host + path)).newBuilder();
         params.forEach((s, o) -> {
             urlBuilder.addQueryParameter(s, (String) o);
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceGroupMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceGroupMapper.xml
new file mode 100644
index 00000000..764fe300
--- /dev/null
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceGroupMapper.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.jh.project.mapper.SurProjectAttendanceGroupMapper">
+    
+    <resultMap type="SurProjectAttendanceGroup" id="SurProjectAttendanceGroupResult">
+        <result property="id"    column="id"    />
+        <result property="cfgid"    column="cfgid"    />
+        <result property="serverid"    column="serverid"    />
+        <result property="bizLicense"    column="bizLicense"    />
+        <result property="companyCode"    column="companyCode"    />
+        <result property="companyId"    column="companyId"    />
+        <result property="companyName"    column="companyName"    />
+        <result property="companyTypeId"    column="companyTypeId"    />
+        <result property="vendorId"    column="vendorId"    />
+        <result property="name"    column="name"    />
+        <result property="leaderName"    column="leaderName"    />
+        <result property="leaderPhone"    column="leaderPhone"    />
+        <result property="teamId"    column="teamId"    />
+        <result property="teamName"    column="teamName"    />
+        <result property="type"    column="type"    />
+        <result property="leaderId"    column="leaderId"    />
+        <result property="deleted"    column="deleted"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="platformGroupId"    column="platformGroupId"    />
+        <result property="platformTeamId"    column="platformTeamId"    />
+        <result property="enterDate"    column="enterDate"    />
+        <result property="exitDate"    column="exitDate"    />
+        <result property="remark"    column="remark"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectSurProjectAttendanceGroupVo">
+        select id, cfgid, serverid, bizLicense, companyCode, companyId, companyName, companyTypeId, vendorId, name, leaderName, leaderPhone, teamId, teamName, type, leaderId, deleted, createTime, platformGroupId, platformTeamId, enterDate, exitDate, remark, is_del, create_by, create_time, update_by, update_time from sur_project_attendance_group
+    </sql>
+
+    <select id="selectSurProjectAttendanceGroupList" parameterType="SurProjectAttendanceGroup" resultMap="SurProjectAttendanceGroupResult">
+        <include refid="selectSurProjectAttendanceGroupVo"/>
+        <where>  
+            <if test="cfgid != null "> and cfgid = #{cfgid}</if>
+            <if test="serverid != null "> and serverid = #{serverid}</if>
+            <if test="bizLicense != null  and bizLicense != ''"> and bizLicense = #{bizLicense}</if>
+            <if test="companyCode != null  and companyCode != ''"> and companyCode = #{companyCode}</if>
+            <if test="companyId != null "> and companyId = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and companyName like concat('%', #{companyName}, '%')</if>
+            <if test="companyTypeId != null  and companyTypeId != ''"> and companyTypeId = #{companyTypeId}</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="leaderName != null  and leaderName != ''"> and leaderName like concat('%', #{leaderName}, '%')</if>
+            <if test="leaderPhone != null  and leaderPhone != ''"> and leaderPhone = #{leaderPhone}</if>
+            <if test="teamId != null "> and teamId = #{teamId}</if>
+            <if test="teamName != null  and teamName != ''"> and teamName like concat('%', #{teamName}, '%')</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="leaderId != null "> and leaderId = #{leaderId}</if>
+            <if test="deleted != null "> and deleted = #{deleted}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="platformGroupId != null "> and platformGroupId = #{platformGroupId}</if>
+            <if test="platformTeamId != null "> and platformTeamId = #{platformTeamId}</if>
+            <if test="enterDate != null "> and enterDate = #{enterDate}</if>
+            <if test="exitDate != null "> and exitDate = #{exitDate}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectSurProjectAttendanceGroupById" parameterType="Long" resultMap="SurProjectAttendanceGroupResult">
+        <include refid="selectSurProjectAttendanceGroupVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSurProjectAttendanceGroup" parameterType="SurProjectAttendanceGroup" useGeneratedKeys="true" keyProperty="id">
+        insert into sur_project_attendance_group
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cfgid != null">cfgid,</if>
+            <if test="serverid != null">serverid,</if>
+            <if test="bizLicense != null">bizLicense,</if>
+            <if test="companyCode != null">companyCode,</if>
+            <if test="companyId != null">companyId,</if>
+            <if test="companyName != null">companyName,</if>
+            <if test="companyTypeId != null">companyTypeId,</if>
+            <if test="vendorId != null">vendorId,</if>
+            <if test="name != null">name,</if>
+            <if test="leaderName != null">leaderName,</if>
+            <if test="leaderPhone != null">leaderPhone,</if>
+            <if test="teamId != null">teamId,</if>
+            <if test="teamName != null">teamName,</if>
+            <if test="type != null">type,</if>
+            <if test="leaderId != null">leaderId,</if>
+            <if test="deleted != null">deleted,</if>
+            <if test="createTime != null">createTime,</if>
+            <if test="platformGroupId != null">platformGroupId,</if>
+            <if test="platformTeamId != null">platformTeamId,</if>
+            <if test="enterDate != null">enterDate,</if>
+            <if test="exitDate != null">exitDate,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgid != null">#{cfgid},</if>
+            <if test="serverid != null">#{serverid},</if>
+            <if test="bizLicense != null">#{bizLicense},</if>
+            <if test="companyCode != null">#{companyCode},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="companyName != null">#{companyName},</if>
+            <if test="companyTypeId != null">#{companyTypeId},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="leaderName != null">#{leaderName},</if>
+            <if test="leaderPhone != null">#{leaderPhone},</if>
+            <if test="teamId != null">#{teamId},</if>
+            <if test="teamName != null">#{teamName},</if>
+            <if test="type != null">#{type},</if>
+            <if test="leaderId != null">#{leaderId},</if>
+            <if test="deleted != null">#{deleted},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="platformGroupId != null">#{platformGroupId},</if>
+            <if test="platformTeamId != null">#{platformTeamId},</if>
+            <if test="enterDate != null">#{enterDate},</if>
+            <if test="exitDate != null">#{exitDate},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSurProjectAttendanceGroup" parameterType="SurProjectAttendanceGroup">
+        update sur_project_attendance_group
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgid != null">cfgid = #{cfgid},</if>
+            <if test="serverid != null">serverid = #{serverid},</if>
+            <if test="bizLicense != null">bizLicense = #{bizLicense},</if>
+            <if test="companyCode != null">companyCode = #{companyCode},</if>
+            <if test="companyId != null">companyId = #{companyId},</if>
+            <if test="companyName != null">companyName = #{companyName},</if>
+            <if test="companyTypeId != null">companyTypeId = #{companyTypeId},</if>
+            <if test="vendorId != null">vendorId = #{vendorId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="leaderName != null">leaderName = #{leaderName},</if>
+            <if test="leaderPhone != null">leaderPhone = #{leaderPhone},</if>
+            <if test="teamId != null">teamId = #{teamId},</if>
+            <if test="teamName != null">teamName = #{teamName},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="leaderId != null">leaderId = #{leaderId},</if>
+            <if test="deleted != null">deleted = #{deleted},</if>
+            <if test="createTime != null">createTime = #{createTime},</if>
+            <if test="platformGroupId != null">platformGroupId = #{platformGroupId},</if>
+            <if test="platformTeamId != null">platformTeamId = #{platformTeamId},</if>
+            <if test="enterDate != null">enterDate = #{enterDate},</if>
+            <if test="exitDate != null">exitDate = #{exitDate},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSurProjectAttendanceGroupById" parameterType="Long">
+        delete from sur_project_attendance_group where id = #{id}
+    </delete>
+
+    <delete id="deleteSurProjectAttendanceGroupByIds" parameterType="String">
+        delete from sur_project_attendance_group where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
index 34928afd..7d0a8a7b 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
@@ -240,7 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) ) xx
     </sql>
     <select id="queryAttendanceData" parameterType="SurProjectAttendanceCfg"  resultMap="SurProjectAttendanceUserResult">
-
+        select * from (
         select n.*,m.inTime,m.outTime from (
 
                                                SELECT * FROM (
@@ -269,5 +269,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                                ) y on x.workerId=y.workerId
 
                                            ) m left join sur_project_attendance_user n on  m.workerId=n.workerId
+                                               ) oo
     </select>
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 5a637beb..77eff5a6 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -441,7 +441,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from
         (
         select  projectId,prjName,count(1) proble from vw_smz_ssp_problemmodify_audit
-        where infoType=#{infoType}
+        where infoType=#{infoType} AND isDel=0
         <if test="projectId>0">and projectId=#{projectId}</if>
         <if test="deptId >0 ">AND deptid = #{deptId}</if>
         <if test="roleType > 0">AND roletype=#{roleType}</if>
@@ -453,7 +453,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join(
         select projectid,count(1) timoutNoComp  from vw_smz_ssp_problemmodify_audit where
         ((updateTime is null and  date(nickedTime) &lt; date(now()) ) or  date(updateTime )>date(nickedTime))
-        and infoType=#{infoType}
+        and infoType=#{infoType} AND isDel=0
         <if test="projectId>0">and projectId=#{projectId}</if>
         <if test="deptId >0 ">AND deptid = #{deptId}</if>
         <if test="roleType > 0">AND roletype=#{roleType}</if>
@@ -465,7 +465,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         left join (
         SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE   (updateTime is null and  date(nickedTime) &lt; date(now()) )
-        and infoType=#{infoType}
+        and infoType=#{infoType} AND isDel=0
         <if test="projectId>0">and projectId=#{projectId}</if>
         <if test="deptId >0 ">AND deptid = #{deptId}</if>
         <if test="roleType > 0">AND roletype=#{roleType}</if>
@@ -478,7 +478,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join(
         select projectid,count(1) comp  from vw_smz_ssp_problemmodify_audit where
         checkState=4
-        and infoType=#{infoType}
+        and infoType=#{infoType} AND isDel=0
         <if test="projectId>0">and projectId=#{projectId}</if>
         <if test="deptId >0 ">AND deptid = #{deptId}</if>
         <if test="roleType > 0">AND roletype=#{roleType}</if>