From 5d0eecd12842be12e5053d6988c3049ed2550584 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: Sun, 3 Sep 2023 23:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectUserInfoDrawer.vue                 | 23 +++++---------
 .../SurProjectCheckDetectionMapper.xml        | 30 +++++++++++--------
 .../project/SurProjectInsuranceMapper.xml     |  5 ++--
 .../project/SurProjectMaterialSealMapper.xml  | 18 +++++------
 .../project/SurProjectMeasureMapper.xml       |  9 ++++--
 5 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue b/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue
index 5d9a329d..acadb7a9 100644
--- a/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue
+++ b/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue
@@ -1,13 +1,15 @@
 <template>
   <div class="app-container">
     <el-drawer
-      v-bind="$attrs"
       v-if="onOpen"
-      v-on="$listeners"
-      @opened="onOpen"
-      @close="onClose"
+      :visible.sync="onOpen"
+      direction="rtl"
+      size="60%"
       style="padding-left: 20px"
     >
+      <template slot="title">
+        <div>{{ drawerTitle + " 【特种人员管理】" }}</div>
+      </template>
       <el-row
         :gutter="10"
         class="mb8"
@@ -374,15 +376,4 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-@import "@/styles/mixin.scss";
-
-::v-deep .el-drawer__header {
-  display: none;
-}
-@include action-bar;
-
-.json-editor {
-  height: calc(100vh - 33px);
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
index 378fba18..bb2cf9a5 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
@@ -221,39 +221,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="groupByCheckType" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult">
-
-
         SELECT 1 id,COUNT(1) project_id,'送检数' check_type
-        FROM  sur_project_check_detection WHERE check_type= #{checkType}
-        and is_del='0'
-        <if test="deptId !=null and deptId>0">
+        FROM  sur_project_check_detection WHERE is_del='0'
+        <if test='checkType !=null and checkType !="0"'>
+            and check_type= #{checkType}
+        </if>
+        <if test="deptId !=null and deptId > 0 ">
            and project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
         </if>
-        <if test="projectId !=null">
+        <if test="projectId !=null and projectId > 0 ">
           and  project_id=#{projectId}
         </if>
 
         UNION
 
         SELECT 2 id,COUNT(1) project_id,'待检数' check_type
-        FROM  sur_project_check_detection WHERE check_type= #{checkType} AND check_state='1'
+        FROM  sur_project_check_detection WHERE check_state='1'
         and is_del='0'
-        <if test="deptId !=null and deptId>0">
+        <if test='checkType !=null and checkType !="0"'>
+            and check_type= #{checkType}
+        </if>
+        <if test="deptId !=null and deptId > 0 ">
             and project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
         </if>
-        <if test="projectId !=null">
+        <if test="projectId !=null and projectId > 0 ">
             and  project_id=#{projectId}
         </if>
 
         UNION
 
         SELECT 3 id,COUNT(1) project_id,'合格数' check_type
-        FROM  sur_project_check_detection WHERE check_type= #{checkType} AND detection_result='1'
+        FROM  sur_project_check_detection WHERE detection_result='1'
         and is_del='0'
-        <if test="deptId !=null and deptId>0">
+        <if test='checkType !=null and checkType !="0"'>
+            and check_type= #{checkType}
+        </if>
+        <if test="deptId !=null and deptId > 0 ">
             and project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
         </if>
-        <if test="projectId !=null">
+        <if test="projectId !=null and projectId > 0 ">
             and  project_id=#{projectId}
         </if>
 
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
index 074aa56b..a03e4b67 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
@@ -175,12 +175,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         sur_project sp
         LEFT JOIN sur_project_insurance azx ON azx.project_id = sp.id
-        AND azx.insurance_type = 1
+        AND azx.insurance_type = 2 and azx.is_del=0
         LEFT JOIN sur_project_insurance yqx ON yqx.project_id = sp.id
-        AND yqx.insurance_type = 2
+        AND yqx.insurance_type = 1 and yqx.is_del=0
         where sp.isDel=0
         <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
         <if test="projectId != null "> and sp.id = #{projectId}</if>
+        GROUP BY sp.id,sp.projectName
         ORDER BY sp.projectSort ASC
     </select>
     
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
index 23419e9c..686f6a8a 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             sur_project_material_seal
         where is_del=0
-            and project_id=1
+            and project_id=#{projectId}
         GROUP BY
             use_position
     </select>
@@ -155,16 +155,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     <select id="selectTop20" parameterType="SurProjectMaterialSeal" resultMap="SurProjectMaterialSealResult">
-    select spme.id, spme.project_id, spme.dept_id, spme.main_image, spme.image_urls, spme.material_name, spme.use_position, spme.contract_brand, spme.use_brand, spme.seal_date, spme.sign_files, spme.alteration_files, spme.is_del, spme.create_by, spme.create_time, spme.update_by, spme.update_time, spme.remark, sp.projectName, sd.dept_name
+    select spme.id, spme.project_id, spme.dept_id, spme.main_image, spme.image_urls, spme.material_name, spme.use_position, spme.contract_brand, spme.use_brand, spme.seal_date, spme.sign_files, spme.alteration_files, spme.is_del, spme.create_by, spme.create_time, spme.update_by, spme.update_time, spme.remark, spme.projectName, spme.dept_name
     from (
-        select * from sur_project_material_seal spme
-        where if(spme.is_del is null,0,spme.is_del)=0
-            <if test="deptId!=null and deptId>0"> and spme.project_id in (SELECT id FROM sur_project WHERE deptid=#{deptId}) </if>
-            <if test="projectId!=null and projectId>0">and spme.project_id  = #{projectId}</if>
+        select spme.*,sp.projectName, sd.dept_name from sur_project_material_seal spme
+        left join sur_project sp on spme.project_id = sp.id
+        left join sys_dept sd on sd.dept_id = spme.dept_id
+        where spme.is_del=0
+            <if test="deptId != null and deptId > 0"> and sp.deptId = #{deptId} </if>
+            <if test="projectId != null and projectId > 0">and sp.id = #{projectId}</if>
         ) spme
-    left join sur_project sp on spme.project_id = sp.id
-    left join sys_dept sd on sd.dept_id = spme.dept_id
     order by spme.create_time desc
-    LIMIT	0,20
+    LIMIT 0,20
     </select>
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
index 72a3f5f4..afc7656f 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
@@ -182,11 +182,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (
             SELECT measure_info,COUNT(1) cnt
             FROM sur_project_measure
-            WHERE measure_type = #{measureType} AND  IF(is_del IS NULL,0,is_del)=0
-            <if test="deptId !=null and deptId>0">
+            WHERE IF(is_del IS NULL,0,is_del)=0
+            <if test='measureType !=null and measureType !="0"'>
+                and measure_type = #{measureType}
+            </if>
+            <if test="deptId !=null and deptId >0">
                 AND  project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
             </if>
-            <if test="projectId !=null">
+            <if test="projectId !=null and projectId >0">
                 AND  project_id=#{projectId}
             </if>
             GROUP BY measure_info