sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

dev_xds
姜玉琦 2023-09-03 23:26:50 +08:00
parent 7a8ab8829e
commit 5d0eecd128
5 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue
View File

@ -1,13 +1,15 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-drawer <el-drawer
v-bind="$attrs"
v-if="onOpen" v-if="onOpen"
v-on="$listeners" :visible.sync="onOpen"
@opened="onOpen" direction="rtl"
@close="onClose" size="60%"
style="padding-left: 20px" style="padding-left: 20px"
> >
<template slot="title">
<div>{{ drawerTitle + " 【特种人员管理】" }}</div>
</template>
<el-row <el-row
:gutter="10" :gutter="10"
class="mb8" class="mb8"
@ -374,15 +376,4 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped></style>
@import "@/styles/mixin.scss";
::v-deep .el-drawer__header {
display: none;
}
@include action-bar;
.json-editor {
height: calc(100vh - 33px);
}
</style>

30
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
View File

@ -221,39 +221,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<select id="groupByCheckType" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult"> <select id="groupByCheckType" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult">
SELECT 1 id,COUNT(1) project_id,'送检数' check_type SELECT 1 id,COUNT(1) project_id,'送检数' check_type
FROM sur_project_check_detection WHERE check_type= #{checkType} FROM sur_project_check_detection WHERE is_del='0'
and is_del='0' <if test='checkType !=null and checkType !="0"'>
<if test="deptId !=null and deptId>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}) and project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
</if> </if>
<if test="projectId !=null"> <if test="projectId !=null and projectId > 0 ">
and project_id=#{projectId} and project_id=#{projectId}
</if> </if>
UNION UNION
SELECT 2 id,COUNT(1) project_id,'待检数' check_type 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' 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}) and project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
</if> </if>
<if test="projectId !=null"> <if test="projectId !=null and projectId > 0 ">
and project_id=#{projectId} and project_id=#{projectId}
</if> </if>
UNION UNION
SELECT 3 id,COUNT(1) project_id,'合格数' check_type 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' 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}) and project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
</if> </if>
<if test="projectId !=null"> <if test="projectId !=null and projectId > 0 ">
and project_id=#{projectId} and project_id=#{projectId}
</if> </if>

5
yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
View File

@ -175,12 +175,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM FROM
sur_project sp sur_project sp
LEFT JOIN sur_project_insurance azx ON azx.project_id = sp.id 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 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 where sp.isDel=0
<if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if> <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
<if test="projectId != null "> and sp.id = #{projectId}</if> <if test="projectId != null "> and sp.id = #{projectId}</if>
GROUP BY sp.id,sp.projectName
ORDER BY sp.projectSort ASC ORDER BY sp.projectSort ASC
</select> </select>

18
yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
View File

@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM FROM
sur_project_material_seal sur_project_material_seal
where is_del=0 where is_del=0
and project_id=1 and project_id=#{projectId}
GROUP BY GROUP BY
use_position use_position
</select> </select>
@ -155,16 +155,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</delete> </delete>
<select id="selectTop20" parameterType="SurProjectMaterialSeal" resultMap="SurProjectMaterialSealResult"> <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 ( from (
select * from sur_project_material_seal spme select spme.*,sp.projectName, sd.dept_name from sur_project_material_seal spme
where if(spme.is_del is null,0,spme.is_del)=0 left join sur_project sp on spme.project_id = sp.id
<if test="deptId!=null and deptId>0"> and spme.project_id in (SELECT id FROM sur_project WHERE deptid=#{deptId}) </if> left join sys_dept sd on sd.dept_id = spme.dept_id
<if test="projectId!=null and projectId>0">and spme.project_id = #{projectId}</if> 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 ) 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 order by spme.create_time desc
LIMIT 0,20 LIMIT 0,20
</select> </select>
</mapper> </mapper>

9
yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
View File

@ -182,11 +182,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( (
SELECT measure_info,COUNT(1) cnt SELECT measure_info,COUNT(1) cnt
FROM sur_project_measure FROM sur_project_measure
WHERE measure_type = #{measureType} AND IF(is_del IS NULL,0,is_del)=0 WHERE IF(is_del IS NULL,0,is_del)=0
<if test="deptId !=null and deptId>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}) AND project_id IN (SELECT id FROM sur_project WHERE deptid=#{deptId})
</if> </if>
<if test="projectId !=null"> <if test="projectId !=null and projectId >0">
AND project_id=#{projectId} AND project_id=#{projectId}
</if> </if>
GROUP BY measure_info GROUP BY measure_info