From 088d06e4812fdd828213f03767093b0d0dfa961d 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: Wed, 3 Jul 2024 01:11:58 +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 --- .../project/surProjectInsurance/index.vue | 6 +++--- .../views/project/surProjectSpecial/index.vue | 20 +++++++++++++++++++ .../surProjectSpecialDrawer.vue | 15 +++++++++++--- .../src/views/work/emergencyDrill/index.vue | 8 ++++++++ ruoyi-ui/src/views/work/workTrain/index.vue | 8 ++++++++ .../project/SurProjectInsuranceMapper.xml | 4 ++-- .../project/SurProjectWorkSpecialMapper.xml | 1 + .../resources/mapper/work/WorkTrainMapper.xml | 11 +++++----- 8 files changed, 60 insertions(+), 13 deletions(-) diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue index 844f455e..216b2f90 100644 --- a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue +++ b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue @@ -16,10 +16,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -134,7 +134,7 @@ > - + + + + + + + - - -
确 定 diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue index d29a67d1..ed659171 100644 --- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue +++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue @@ -16,6 +16,14 @@ @keyup.enter.native="handleQuery" /> + + + + + + and sp.deptId = #{nowDept} and sp.projectType = #{proType} and sp.id = #{projectId} - and sp.id in + and sp.id in #{item} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml index 5b33cb01..a4f1b2b8 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml @@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sp.projectType = #{proType} and spwp.name like concat('%', #{name}, '%') and sp.projectName like concat('%', #{projectName}, '%') + and sd.dept_name like concat('%', #{deptName}, '%') and spwp.is_credential = #{isCredential} and spwp.phone_number like concat('%', #{phoneNumber}, '%') and spwp.credential_number like concat('%', #{credentialNumber}, '%') diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml index e71572b1..03020caf 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sur_project_userinfo spu on spu.project_id = sp.id left join work_train_dept wtd2 on wtd2.train_id = wt.id and wtd2.is_main ='Y' - and sp.isDel=0 and sp.progressVisible=0 + and sp.isDel=0 and sp.projectType = #{proType} and wt.project_id = #{projectId} and wtd2.dept_id = #{deptId} @@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and train_type = #{trainType} and train_title like concat('%', #{trainTitle}, '%') and wt.train_nature = #{trainNature} + and wtd.is_main = 'Y' and sd.dept_name like concat('%', #{trainNatureName}, '%') and wt.is_del = #{isDel} and wt.begin_date between #{params.beginMarksTime} and #{params.endMarksTime} and wt.create_time between #{params.beginTime} and #{params.endTime} @@ -92,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select gr.train_nature as gr_type ,max(gr.id) as maxid from work_train gr left join sur_project sp on sp.id = gr.project_id - and gr.is_del=0 and sp.isDel=0 and sp.progressVisible=0 + and gr.is_del=0 and sp.isDel=0 and sp.deptId = #{deptId} and gr.train_type = #{trainType} @@ -111,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value where - wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0 + wt.is_del=0 and sp.isDel=0 and sp.deptId = #{nowDept} and wt.train_type = #{trainType} and wt.project_id = #{projectId} @@ -271,7 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( SELECT COUNT(1) cnt,data_type FROM work_train wt left join sur_project sp on sp.id = wt.project_id - where sp.isDel=0 and sp.progressVisible=0 + where sp.isDel=0 and sp.deptId = #{nowDept} and sp.id = #{projectId} and sp.projectType = #{proType} @@ -294,7 +295,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value where - wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0 + wt.is_del=0 and sp.isDel=0 and wt.data_type = #{dataType} and sp.deptId = #{nowDept} and wt.train_type = #{trainType}