From 65d90a55e6085e9ce2f049b002f1a1715abf6e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 22:13:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkDetection/checkDetectionDrawer.vue   |   2 +-
 .../views/project/checkDetection/index.vue    | 536 +++++++++++++-----
 .../src/views/project/materialSeal/index.vue  |   2 +-
 .../projectMaterialSealDrawer.vue             |   2 +-
 .../views/project/projectChecking/index.vue   |   2 +-
 .../projectChecking/projectCheckingDrawer.vue |   2 +-
 .../views/project/projectMeasure/index.vue    |   2 +-
 .../projectMeasure/projectMeasureDrawer.vue   |   2 +-
 .../mapper/SurProjectUserinfoMapper.java      |   8 +
 .../impl/SurProjectUserinfoServiceImpl.java   |   7 +
 .../jh/project/task/AttendanceJgwTask.java    |   3 +-
 .../project/SurProjectUserinfoMapper.xml      |  11 +
 12 files changed, 443 insertions(+), 136 deletions(-)

diff --git a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue
index 3c588c3f..e35e1198 100644
--- a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue
+++ b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue
@@ -89,7 +89,7 @@
           </el-table-column>
           <el-table-column label="提交时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
           <el-table-column label="操作" align="center" width="180" fixed="right" class-name="small-padding fixed-width">
diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue
index 6db557d3..7a9a7864 100644
--- a/ruoyi-ui/src/views/project/checkDetection/index.vue
+++ b/ruoyi-ui/src/views/project/checkDetection/index.vue
@@ -1,16 +1,37 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="项目名称" prop="projectName">
-        <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.projectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="单位名称" prop="deptName">
-        <el-input v-model="queryParams.deptName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入单位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="送检类型" prop="checkType">
         <el-select v-model="queryParams.checkType" placeholder="请选择送检类型" clearable>
-          <el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+          <el-option
+            v-for="dict in dict.type.check_detection_check_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="检测结果" prop="detectionResult">
@@ -28,32 +49,66 @@
         </el-select>
       </el-form-item> -->
       <el-form-item label="材料名称" prop="materialName">
-        <el-input v-model="queryParams.materialName" placeholder="请输入材料名称" clearable
-          @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入材料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="送检时间">
-        <el-date-picker v-model="daterangeCheckTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker
+          v-model="daterangeCheckTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item label="审批状态" prop="approveStatus" v-if="false">
-        <el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable>
-          <el-option v-for="dict in dict.type.project_check_status" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+        <el-select
+          v-model="queryParams.approveStatus"
+          placeholder="请选择审批状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.project_check_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="使用部位" prop="usePosition">
-        <el-input v-model="queryParams.usePosition" placeholder="请输入使用部位" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.usePosition"
+          placeholder="请输入使用部位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="监理专员" prop="witnessUserName">
-        <el-input v-model="queryParams.witnessUserName" placeholder="请输入监理专员名称" clearable
-          @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.witnessUserName"
+          placeholder="请输入监理专员名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="实验室" prop="laboratoryName">
-        <el-input v-model="queryParams.laboratoryName" placeholder="请输入实验室名称" clearable
-          @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.laboratoryName"
+          placeholder="请输入实验室名称"
+          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 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>
@@ -110,35 +165,80 @@
     <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
-      <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane></el-tabs>
-    <el-table v-loading="loading" :data="checkDetectionList" @selection-change="handleSelectionChange" stripe>
+      <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane
+    ></el-tabs>
+    <el-table
+      v-loading="loading"
+      :data="checkDetectionList"
+      @selection-change="handleSelectionChange"
+      stripe
+    >
       <el-table-column label="项目名称" align="center" prop="projectName" width="200">
         <template slot-scope="scope">
           <div>{{ scope.row.projectName }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="单位名称" align="center" prop="deptName" width="180" show-overflow-tooltip />
+      <el-table-column
+        label="单位名称"
+        align="center"
+        prop="deptName"
+        width="180"
+        show-overflow-tooltip
+      />
       <el-table-column label="送检类型" align="center" prop="checkType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.check_detection_check_type" :value="scope.row.checkType" />
+          <dict-tag
+            :options="dict.type.check_detection_check_type"
+            :value="scope.row.checkType"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="材料名称" align="center" prop="materialName" width="100" show-overflow-tooltip />
-      <el-table-column label="使用部位" align="center" prop="usePosition" width="120" show-overflow-tooltip />
-      <el-table-column label="取样数量" align="center" prop="sampleNum" width="80" show-overflow-tooltip />
+      <el-table-column
+        label="材料名称"
+        align="center"
+        prop="materialName"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="使用部位"
+        align="center"
+        prop="usePosition"
+        width="120"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="取样数量"
+        align="center"
+        prop="sampleNum"
+        width="80"
+        show-overflow-tooltip
+      />
       <el-table-column label="合格证" align="center" prop="qualifiedFlag">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.qualifiedFlag == 'Y'" type="success">已提供</el-tag>
           <el-tag v-if="scope.row.qualifiedFlag == 'N'" type="danger">未提供</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="监理专员" align="left" prop="witnessUser" width="140" show-overflow-tooltip>
+      <el-table-column
+        label="监理专员"
+        align="left"
+        prop="witnessUser"
+        width="140"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
           <div>{{ scope.row.witnessUserName }}</div>
           <div>{{ scope.row.witnessUser }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="实验室名称" align="center" prop="laboratoryName" width="150" show-overflow-tooltip />
+      <el-table-column
+        label="实验室名称"
+        align="center"
+        prop="laboratoryName"
+        width="150"
+        show-overflow-tooltip
+      />
       <el-table-column label="送检时间" align="center" prop="checkTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
@@ -154,12 +254,24 @@
       </el-table-column> -->
       <el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
+          <dict-tag
+            v-if="scope.row.approveStatus"
+            :options="dict.type.project_check_status"
+            :value="scope.row.approveStatus"
+          />
+          <el-tag
+            v-if="!scope.row.approveStatus"
+            key="待登记检测结果"
+            type="info"
+            effect="dark"
+          >
+            待登记检测结果
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="提交时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="提交用户" align="center" prop="createBy" width="110" />
@@ -171,52 +283,127 @@
       </el-table-column>
       <el-table-column label="检测报告" align="center" prop="updateTime" width="80">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.checkState == '2'" size="mini" type="text" icon="el-icon-paperclip"
-            @click="doDown(scope.row)" v-hasPermi="['project:surProjectSpecial:list']">下载检测报告</el-button>
+          <el-button
+            v-if="scope.row.checkState == '2'"
+            size="mini"
+            type="text"
+            icon="el-icon-paperclip"
+            @click="doDown(scope.row)"
+            v-hasPermi="['project:surProjectSpecial:list']"
+            >下载检测报告</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="200">
+      <el-table-column
+        label="操作"
+        align="center"
+        fixed="right"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.checkState == '1'" size="mini" type="text" icon="el-icon-edit-outline"
-            @click="handleUpdateResult(scope.row)" style="margin-left: 8px"
-            v-hasPermi="['project:checkDetection:editResult']">登记检测结果</el-button>
-          <el-button v-if="scope.row.approveStatus != null" size="mini" type="text" icon="el-icon-tickets"
-            @click="handleAuditinfo(scope.row)">审批日志</el-button>
-          <el-button v-if="scope.row.approveStatus == '1'" size="mini" type="text" icon="el-icon-finished"
-            v-hasPermi="['project:checkDetection:approve']" @click="handleAudit(scope.row)">处理审批</el-button>
-          <el-button v-if="scope.row.checkState == '1'" size="mini" type="text" icon="el-icon-edit"
-            @click="handleUpdate(scope.row)" v-hasPermi="['project:checkDetection:edit']">修改</el-button>
-          <el-button v-if="scope.row.approveStatus != '4'" size="mini" type="text" icon="el-icon-delete"
-            @click="handleDelete(scope.row)" v-hasPermi="['project:checkDetection:remove']">删除</el-button>
+          <el-button
+            v-if="scope.row.checkState == '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit-outline"
+            @click="handleUpdateResult(scope.row)"
+            style="margin-left: 8px"
+            v-hasPermi="['project:checkDetection:editResult']"
+            >登记检测结果</el-button
+          >
+          <el-button
+            v-if="scope.row.approveStatus != null"
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="handleAuditinfo(scope.row)"
+            >审批日志</el-button
+          >
+          <el-button
+            v-if="scope.row.approveStatus == '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-finished"
+            v-hasPermi="['project:checkDetection:approve']"
+            @click="handleAudit(scope.row)"
+            >处理审批</el-button
+          >
+          <el-button
+            v-if="scope.row.checkState == '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:checkDetection:edit']"
+            >修改</el-button
+          >
+          <el-button
+            v-if="scope.row.approveStatus != '4'"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['project:checkDetection: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" />
+    <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="900px" append-to-body :close-on-click-modal="false" custom-class="prj-checking-detection-dlg"
-      :close-on-press-escape="false">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="900px"
+      append-to-body
+      :close-on-click-modal="false"
+      custom-class="prj-checking-detection-dlg"
+      :close-on-press-escape="false"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="项目名称" prop="projectName" class="mg-b-8">
-              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
+              <el-input
+                v-model="form.projectName"
+                placeholder="请输入项目名称"
+                :disabled="true"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="deptName"  class="mg-b-8">
-              <el-input v-model="form.deptName" placeholder="请输入单位名称" :disabled="true" />
+            <el-form-item label="单位名称" prop="deptName" class="mg-b-8">
+              <el-input
+                v-model="form.deptName"
+                placeholder="请输入单位名称"
+                :disabled="true"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="送检类型" prop="checkType">
-              <el-select v-model="form.checkType" placeholder="请选择送检类型" style="width: 100%">
-                <el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
+              <el-select
+                v-model="form.checkType"
+                placeholder="请选择送检类型"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.check_detection_check_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -246,45 +433,75 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12"> <el-form-item label="提供合格证" prop="qualifiedFlag">
-              <el-select v-model="form.qualifiedFlag" placeholder="请选择提供合格证" style="width: 100%">
-                <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
+          <el-col :span="12">
+            <el-form-item label="提供合格证" prop="qualifiedFlag">
+              <el-select
+                v-model="form.qualifiedFlag"
+                placeholder="请选择提供合格证"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="监理专员" prop="witnessUser">
-              <el-select v-model="form.witnessUser" placeholder="请选择监理专员" filterable style="width: 100%"
-                @change="selectWitnessUser">
-                <el-option-group v-for="group in deptUserData" :key="group.unitId + ''"
-                  :label="group.unitName + ' [' + group.unitTypeName + '] '">
-                  <el-option v-for="item in group.userinfoList" :key="item.phonenumber"
-                    :label="item.nickName + ' [' + item.jobTypeName + '] '" :value="item.phonenumber">
+              <el-select
+                v-model="form.witnessUser"
+                placeholder="请选择监理专员"
+                filterable
+                style="width: 100%"
+                @change="selectWitnessUser"
+              >
+                <el-option-group
+                  v-for="group in deptUserData"
+                  :key="group.unitId + ''"
+                  :label="group.unitName + ' [' + group.unitTypeName + '] '"
+                >
+                  <el-option
+                    v-for="item in group.userinfoList"
+                    :key="item.phonenumber"
+                    :label="item.nickName + ' [' + item.jobTypeName + '] '"
+                    :value="item.phonenumber"
+                  >
                   </el-option>
                 </el-option-group>
               </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
 
         <el-row>
           <el-col :span="24">
-
             <el-form-item label="实验室名称" prop="laboratoryName">
-              <el-input v-model="form.laboratoryName" placeholder="请输入实验室名称" />
-            </el-form-item></el-col>
+              <el-input
+                v-model="form.laboratoryName"
+                placeholder="请输入实验室名称"
+              /> </el-form-item
+          ></el-col>
         </el-row>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="委托单" prop="trustDeed" :class="form.trustDeed?'img-1':''">
+            <el-form-item
+              label="委托单"
+              prop="trustDeed"
+              :class="form.trustDeed ? 'img-1' : ''"
+            >
               <image-upload v-model="form.trustDeed" :limit="1" />
             </el-form-item>
           </el-col>
-          <el-col :span="12"  v-if="false">
-            <el-form-item label="样品照片" prop="specimenPhoto" :class="form.specimenPhoto?'img-1':''">
+          <el-col :span="12" v-if="false">
+            <el-form-item
+              label="样品照片"
+              prop="specimenPhoto"
+              :class="form.specimenPhoto ? 'img-1' : ''"
+            >
               <image-upload v-model="form.specimenPhoto" :limit="1" />
             </el-form-item>
           </el-col>
@@ -293,8 +510,13 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="送检时间" prop="checkTime">
-              <el-date-picker clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd"
-                placeholder="请选择送检时间">
+              <el-date-picker
+                clearable
+                v-model="form.checkTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择送检时间"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -307,47 +529,97 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-
       </el-form>
-      <div slot="footer" class="dialog-footer" style="text-align: center;">
+      <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
     <!-- 材料取样复试等级结果 -->
-    <el-dialog :title="title" v-if="resultopen" :visible.sync="resultopen" width="680px" append-to-body
-      :close-on-click-modal="false" :close-on-press-escape="false">
-      <el-form ref="resultform" :model="resultform" :rules="resultrules" label-width="100px">
+    <el-dialog
+      :title="title"
+      v-if="resultopen"
+      :visible.sync="resultopen"
+      width="680px"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <el-form
+        ref="resultform"
+        :model="resultform"
+        :rules="resultrules"
+        label-width="100px"
+      >
         <el-form-item label="项目名称">
-          <el-input v-model="resultform.projectName" placeholder="请输入项目名称" :disabled="true" />
+          <el-input
+            v-model="resultform.projectName"
+            placeholder="请输入项目名称"
+            :disabled="true"
+          />
         </el-form-item>
         <el-form-item label="单位名称">
-          <el-input v-model="resultform.deptName" placeholder="请输入单位名称" :disabled="true" />
+          <el-input
+            v-model="resultform.deptName"
+            placeholder="请输入单位名称"
+            :disabled="true"
+          />
         </el-form-item>
         <el-form-item label="送检类型">
-          <el-select v-model="resultform.checkType" placeholder="请选择送检类型" style="width: 100%" :disabled="true">
-            <el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+          <el-select
+            v-model="resultform.checkType"
+            placeholder="请选择送检类型"
+            style="width: 100%"
+            :disabled="true"
+          >
+            <el-option
+              v-for="dict in dict.type.check_detection_check_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="材料名称">
-          <el-input v-model="resultform.materialName" placeholder="请输入材料名称" :disabled="true" />
+          <el-input
+            v-model="resultform.materialName"
+            placeholder="请输入材料名称"
+            :disabled="true"
+          />
         </el-form-item>
         <el-form-item label="实验室名称">
-          <el-input v-model="resultform.laboratoryName" placeholder="请输入实验室名称" :disabled="true" />
+          <el-input
+            v-model="resultform.laboratoryName"
+            placeholder="请输入实验室名称"
+            :disabled="true"
+          />
         </el-form-item>
         <el-form-item label="送检时间">
-          <el-input v-model="resultform.checkTime" placeholder="请输入实送检时间" :disabled="true" />
+          <el-input
+            v-model="resultform.checkTime"
+            placeholder="请输入实送检时间"
+            :disabled="true"
+          />
         </el-form-item>
         <el-form-item label="检测结果" prop="detectionResult" v-if="false">
-          <el-radio v-model="resultform.detectionResult" v-for="dict in dict.type.project_checking_result"
-            :label="dict.value" :key="dict.value" border size="small">{{ dict.label }}</el-radio>
+          <el-radio
+            v-model="resultform.detectionResult"
+            v-for="dict in dict.type.project_checking_result"
+            :label="dict.value"
+            :key="dict.value"
+            border
+            size="small"
+            >{{ dict.label }}</el-radio
+          >
         </el-form-item>
         <el-form-item label="检测报告" prop="detectionFile">
-          <FileUpload v-model="resultform.detectionFile" :limit="2" @input="fileInput"
-            :fileType="['pdf', 'png', 'jpg', 'jpeg']" />
+          <FileUpload
+            v-model="resultform.detectionFile"
+            :limit="2"
+            @input="fileInput"
+            :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -356,7 +628,10 @@
       </div>
     </el-dialog>
     <indexDrawer ref="indexDrawer" />
-    <approveCheckDetectionDrawer ref="approveCheckDetectionDrawer" :closeCallBack="getList" />
+    <approveCheckDetectionDrawer
+      ref="approveCheckDetectionDrawer"
+      :closeCallBack="getList"
+    />
   </div>
 </template>
 
@@ -379,7 +654,12 @@ export default {
     indexDrawer,
     approveCheckDetectionDrawer,
   },
-  dicts: ["sys_yes_no", "project_check_status", "project_checking_result", "check_detection_check_type"],
+  dicts: [
+    "sys_yes_no",
+    "project_check_status",
+    "project_checking_result",
+    "check_detection_check_type",
+  ],
   data() {
     return {
       // 遮罩层
@@ -450,12 +730,8 @@ export default {
         qualifiedFlag: [
           { required: true, message: "请选择是否提供合格证", trigger: "blur" },
         ],
-        trustDeed:[
-          {required:true,message:'请上传委托单',trigger:"blur"}
-        ],
-        specimenPhoto:[
-          {required:true,message:'请上传样品照片',trigger:"blur"}
-        ],
+        trustDeed: [{ required: true, message: "请上传委托单", trigger: "blur" }],
+        specimenPhoto: [{ required: true, message: "请上传样品照片", trigger: "blur" }],
         witnessUser: [
           { required: true, message: "请选择监理单位监理专员", trigger: "blur" },
         ],
@@ -466,7 +742,9 @@ export default {
         checkTime: [{ required: true, message: "请选择送检时间", trigger: "blur" }],
       },
       resultrules: {
-        detectionResult: [{ required: false, message: "请选择检测结果", trigger: "blur" }],
+        detectionResult: [
+          { required: false, message: "请选择检测结果", trigger: "blur" },
+        ],
         detectionFile: [{ required: true, message: "请上传检测报告", trigger: "blur" }],
       },
       deptUserData: [],
@@ -477,11 +755,11 @@ export default {
       },
     };
   },
-  created() {    
+  created() {
     this.getList();
   },
   methods: {
-    doDown(row){
+    doDown(row) {
       this.files = row.detectionFile.split(",");
       this.files.forEach((item) => {
         this.$download.resource(item);
@@ -508,8 +786,8 @@ export default {
       }
       this.queryCount(this.queryParams);
       listCheckDetection(this.queryParams).then((response) => {
-        this.checkDetectionList = (response.rows||[]).map(d=>{
-          d.attachmentFiles=this.$tryToJson(d.attachment,[]);
+        this.checkDetectionList = (response.rows || []).map((d) => {
+          d.attachmentFiles = this.$tryToJson(d.attachment, []);
           return d;
         });
         this.total = response.total;
@@ -588,14 +866,14 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getCheckDetection(id).then((response) => {
-        let obj= response.data;
-        obj.attachmentFiles=this.$tryToJson(obj.attachment||'[]',[]).map(d=>{
+        let obj = response.data;
+        obj.attachmentFiles = this.$tryToJson(obj.attachment || "[]", []).map((d) => {
           return {
-            name:d,
-            url:d
-          }
+            name: d,
+            url: d,
+          };
         });
-        this.form =obj;
+        this.form = obj;
         this.open = true;
         this.title = "修改材料取样复试";
       });
@@ -622,7 +900,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.form.attachment=this.form.attachmentFiles?JSON.stringify(this.form.attachmentFiles.map(d=>d.url)):"[]";
+          this.form.attachment = this.form.attachmentFiles
+            ? JSON.stringify(this.form.attachmentFiles.map((d) => d.url))
+            : "[]";
           if (this.form.id != null) {
             updateCheckDetection(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -666,7 +946,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -687,7 +967,7 @@ export default {
           }
         });
       });
-    },   
+    },
     /** 审批日志 */
     handleAuditinfo(row) {
       row.title = "材料取样复试";
@@ -698,51 +978,51 @@ export default {
     handleAudit(row) {
       row.typeName = "材料封样";
       this.$refs.approveCheckDetectionDrawer.show(row);
-    }
+    },
   },
 };
 </script>
 <style lang="scss">
-.prj-checking-detection-dlg{
-  .el-dialog__body{
-    padding:0px 10px;
-    .el-form-item{
+.prj-checking-detection-dlg {
+  .el-dialog__body {
+    padding: 0px 10px;
+    .el-form-item {
       margin-bottom: 16px;
-      &.mg-b-8{
+      &.mg-b-8 {
         margin-bottom: 8px;
       }
-      &.img-1{
-        .el-upload--picture-card{
+      &.img-1 {
+        .el-upload--picture-card {
           display: none;
         }
-        .el-upload__tip{
+        .el-upload__tip {
           display: none;
         }
       }
       .upload-file {
-        .upload-file-uploader{
+        .upload-file-uploader {
           display: flex;
           align-items: center;
           margin-bottom: 0px;
           line-height: 30px;
-          .el-upload__tip{
+          .el-upload__tip {
             margin-left: 8px;
           }
         }
       }
-      .el-form-item__error{
+      .el-form-item__error {
         z-index: 9;
-        margin-top:-4px;
+        margin-top: -4px;
       }
       .upload-file-list {
         max-height: 120px;
         overflow-y: auto;
-        padding-right:30px;
-        .el-upload-list__item{
+        padding-right: 30px;
+        .el-upload-list__item {
           margin-bottom: 0px !important;
         }
       }
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/ruoyi-ui/src/views/project/materialSeal/index.vue b/ruoyi-ui/src/views/project/materialSeal/index.vue
index 0311be92..eb7ab730 100644
--- a/ruoyi-ui/src/views/project/materialSeal/index.vue
+++ b/ruoyi-ui/src/views/project/materialSeal/index.vue
@@ -286,7 +286,7 @@
       </el-table-column>
       <el-table-column label="提交时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue b/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
index dbc5284e..1deda04d 100644
--- a/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
+++ b/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
@@ -101,7 +101,7 @@
         </el-table-column>
         <el-table-column label="提交时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue
index 1da8e571..213dc8de 100644
--- a/ruoyi-ui/src/views/project/projectChecking/index.vue
+++ b/ruoyi-ui/src/views/project/projectChecking/index.vue
@@ -338,7 +338,7 @@
       </el-table-column>
       <el-table-column label="提交时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
index 6b5d5974..71780a30 100644
--- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
@@ -95,7 +95,7 @@
         </el-table-column>
         <el-table-column label="提交时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue
index 575f3a74..5e337480 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/index.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue
@@ -287,7 +287,7 @@
       </el-table-column>
       <el-table-column label="提交时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
index b8b2128a..552962bd 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
@@ -97,7 +97,7 @@
         </el-table-column>
         <el-table-column label="提交时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectUserinfoMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectUserinfoMapper.java
index 9d7c9d58..397872ab 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectUserinfoMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectUserinfoMapper.java
@@ -91,4 +91,12 @@ public interface SurProjectUserinfoMapper
      * @return
      */
     public List<SysUser> selectDesignUsers();
+
+    /**
+     * 批量删除项目用户
+     *
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public List<SurProjectUserinfo> findProjectUserExists(Long[] userIds);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java
index 832fb5ca..d7ea5650 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java
@@ -9,6 +9,7 @@ import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.DeptTypeEnum;
 import com.ruoyi.common.enums.PublicStateEnum;
 import com.ruoyi.common.enums.SysRoleEnum;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -219,6 +220,7 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
          */
         surProjectUserinfo.setCreateTime(DateUtils.getNowDate());
         SysDept sysDept = deptMapper.selectDeptById(surProjectUserinfo.getDeptId());
+
         //如果时城建公司的人&&当前选的单位非子公司，这里自己查询项目的所属单位
         if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag()) || DeptTypeEnum.JTGS.getCode().equals(sysDept.getTypeFlag())){
             SurProject surProject = surProjectMapper.selectSurProjectById(surProjectUserinfo.getProjectId());
@@ -233,6 +235,11 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
             //集团人进入项目也是责任主体
             surProjectUserinfo.setDeptType(DeptTypeEnum.ZGS.getCode());
         }else{
+            //查询当前人是否已在其它项目
+            List<SurProjectUserinfo> exists = surProjectUserinfoMapper.findProjectUserExists(surProjectUserinfo.getUserIds());
+            if(StringUtils.isNotEmpty(exists)){
+                throw new ServiceException(exists.get(0).getNickName()+"已加入"+exists.get(0).getProjectName());
+            }
             surProjectUserinfo.setDeptType(sysDept.getTypeFlag());
         }
         surProjectUserinfo.setDeptName(sysDept.getDeptName());
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 b44325c4..35d666a9 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
@@ -204,7 +204,8 @@ public class AttendanceJgwTask {
         String appid="6a6f24fe35b04ee0bcf31cfb46ed1051";
         String secret="c3h5enh4MjAyNHN1Yw==";
         //String prjId="db955e11ef774e63968a47c3dc2acc15";//"b67f1baa6dca4558a16bf90a4681b82e";//
-        String prjId="cace2f676371427e8f6da20d2924f64e";//泾河新城荟锦坊二期
+        //String prjId="cace2f676371427e8f6da20d2924f64e";//泾河新城荟锦坊二期
+        String prjId="209aa0c01d8248b6a56a0921d1b88c83";//泾河新城锦樾坊项目
         String phone="15619028761";
         String token= getToken(appid,secret);
         if(token==null || token.length()==0){
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectUserinfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectUserinfoMapper.xml
index 49cc5d7d..182f3a8b 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectUserinfoMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectUserinfoMapper.xml
@@ -198,4 +198,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND (u.dept_id = 101 or find_in_set(101, d.ancestors))
         order by d.dept_id
     </select>
+
+    <select id="findProjectUserExists" parameterType="String" resultMap="SurProjectUserinfoResult">
+        select spu.id, spu.project_id, spu.dept_id, spu.dept_name, spu.dept_type, spu.job_type, spu.user_id, spu.is_del, spu.create_by, spu.create_time, spu.update_by, spu.update_time, spu.remark, sp.projectName, su.nick_name, su.phonenumber from sur_project_userinfo spu
+        left join sys_user su on spu.user_id = su.user_id
+        left join sur_project sp on spu.project_id = sp.id
+        where spu.is_del=0 and spu.user_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>
\ No newline at end of file