From df2d132b1c3c1c3f5bca9eb5afb2fd26cbaad719 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: Tue, 13 Aug 2024 22:10:53 +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 --- .../mapper/flowable/FlowBusinessKeyMapper.xml | 41 +- .../mapper/flowable/FlowDeployMapper.xml | 3 +- .../views/device/towerProjectConfig/index.vue | 4 + .../task/myProcess/editTaskDrawer.vue | 14 +- .../views/flowable/task/myProcess/index.vue | 509 +++++++++++------- .../task/myProcess/initTaskDrawer.vue | 8 +- .../web/controller/TowerCraneController.java | 38 +- .../ruoyi/api/TowerCraneApiController.java | 2 - .../java/com/ruoyi/emuns/TowerTypeEnums.java | 2 +- .../mapper/DevTowerDataCollideMapper.java | 9 + .../impl/DevTowerDataRunServiceImpl.java | 20 +- .../device/DevTowerDataCollideMapper.xml | 9 + .../mapper/device/DevTowerDataRunMapper.xml | 1 + .../device/DevTowerProjectConfigMapper.xml | 4 + .../SmzProjectQuarterlyAssessMapper.xml | 4 +- .../SurProjectAttendanceDataMapper.xml | 10 +- .../SurProjectAttendanceUserMapper.xml | 4 +- .../project/SurProjectBuildNodeDataMapper.xml | 8 +- .../SurProjectCheckDetectionMapper.xml | 6 +- .../project/SurProjectCostOutputMapper.xml | 20 +- .../project/SurProjectDeptWroksMapper.xml | 4 +- .../mapper/project/SurProjectMapper.xml | 2 +- .../project/SurProjectMaterialSealMapper.xml | 10 +- .../project/SurProjectMeasureMapper.xml | 6 +- .../project/SurProjectScheduleMapper.xml | 4 +- .../project/SurProjectStandardMapper.xml | 6 +- .../project/SurProjectWorkSpecialMapper.xml | 12 +- .../mapper/video/DevAiProjectDataMapper.xml | 5 +- .../video/SurProjectPhotographyMapper.xml | 2 +- .../video/SurProjectVideoConfigMapper.xml | 5 +- 30 files changed, 489 insertions(+), 283 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml index 49db8ced..31cc2ff0 100644 --- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml @@ -156,7 +156,7 @@ SELECT cat taskName, COUNT(1) assigneeId FROM ( - SELECT *,'总包单位' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '总包%' and businessVisible=0 + SELECT *,'总包单位' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '总包%' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -195,7 +195,7 @@ UNION - SELECT *,'监理单位' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '监理%' and businessVisible=0 + SELECT *,'监理单位' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '监理%' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -206,7 +206,7 @@ UNION - SELECT *,'设计单位' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '设计%' and businessVisible=0 + SELECT *,'设计单位' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '设计%' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -217,7 +217,7 @@ UNION - SELECT *,'甲方代表' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '甲方%' and businessVisible=0 + SELECT *,'甲方代表' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '甲方%' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -228,7 +228,7 @@ UNION - SELECT *,'子公司' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '工程%' and businessVisible=0 + SELECT *,'子公司' cat FROM vw_flow_all WHERE finishTime IS NULL AND taskName LIKE '工程%' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -244,7 +244,7 @@ SELECT cat taskName, COUNT(1) assigneeId FROM ( - SELECT *,'总包单位' cat FROM vw_flow_all WHERE taskName LIKE '总包%' AND taskName!='提交申请' and businessVisible=0 + SELECT *,'总包单位' cat FROM vw_flow_all WHERE taskName LIKE '总包%' AND taskName!='提交申请' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -315,7 +315,7 @@ UNION - SELECT *,'监理单位' cat FROM vw_flow_all WHERE taskName LIKE '监理%' AND taskName!='提交申请' and businessVisible=0 + SELECT *,'监理单位' cat FROM vw_flow_all WHERE taskName LIKE '监理%' AND taskName!='提交申请' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -326,7 +326,7 @@ UNION - SELECT *,'设计单位' cat FROM vw_flow_all WHERE taskName LIKE '设计%' AND taskName!='提交申请' and businessVisible=0 + SELECT *,'设计单位' cat FROM vw_flow_all WHERE taskName LIKE '设计%' AND taskName!='提交申请' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -337,7 +337,7 @@ UNION - SELECT *,'甲方代表' cat FROM vw_flow_all WHERE taskName LIKE '甲方%' AND taskName!='提交申请' and businessVisible=0 + SELECT *,'甲方代表' cat FROM vw_flow_all WHERE taskName LIKE '甲方%' AND taskName!='提交申请' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -348,7 +348,7 @@ UNION - SELECT *,'子公司' cat FROM vw_flow_all WHERE taskName LIKE '工程%' AND taskName!='提交申请' and businessVisible=0 + SELECT *,'子公司' cat FROM vw_flow_all WHERE taskName LIKE '工程%' AND taskName!='提交申请' and businessDeptId=#{projectDeptId} and businessKey=#{businessKey} and businessType = #{proType} @@ -365,7 +365,6 @@ SELECT * FROM vw_flow_all - businessVisible=0 AND taskName!='提交申请' AND finishTime IS NULL AND taskName!='提交申请' @@ -422,7 +420,7 @@ + select count(1) as total from dev_tower_data_collide + + and cfg_id = (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey} + and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml index 03795120..12367e4c 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml @@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and dtdc.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%')) and dtdr.device_key = #{deviceKey} and dtdr.device_source = #{deviceSource} + and dtdr.warnings is not null and dtdr.create_time between #{params.beginCreateTime} and #{params.endCreateTime} order by dtdr.id desc diff --git a/yanzhu-jh/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml index 4fb0d0ab..6e2fd00a 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml @@ -139,6 +139,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tower_cap_height = #{towerCapHeight}, tower_section_height = #{towerSectionHeight}, online = #{online}, + dri_name = #{driName}, + dri_phone = #{driPhone}, + saf_name = #{safName}, + saf_phone = #{safPhone}, is_del = #{isDel}, create_by = #{createBy}, create_time = #{createTime}, diff --git a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml index e75e214d..c305791c 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - ) AND a.project_id=p.id and plan_target is not null AND p.deptId=d.dept_id and p.isDel=0 and p.progressVisible=0 + ) AND a.project_id=p.id and plan_target is not null AND p.deptId=d.dept_id and p.isDel=0 and year = #{year} and quarterly = #{quarterly} @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ady.* from sur_project_attendance_data_${year} ady left join sur_project sp on sp.id = ady.projectId - where sp.isDel=0 and sp.progressVisible=0 + where sp.isDel=0 and ady.projectId=#{projectId} @@ -505,13 +505,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and projectId=#{projectId} - and projectId in (select id from sur_project sp where sp.isDel=0 and sp.progressVisible=0 - + and projectId in (select id from sur_project sp where sp.isDel=0 and sp.deptId=#{deptId} and date(ady.attendance_time) =date(#{attendanceTime}) - and sp.projectType = #{proType} and ady.projectId in @@ -521,8 +519,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) ) - - group by ady.companyTypeId diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml index 370f726d..6ec8aa0f 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml @@ -758,7 +758,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT p.id, p.projectName NAME,c.dept_name groupName,g.companyTypeId companyId,COUNT(1) cfgid FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project p,sys_dept c where u.cfgid=b.id and u.state= #{state} and u.companyId=g.companyId and b.project_id=p.id and c.dept_id=b.sub_dept_id - and p.isDel=0 and p.progressVisible=0 + and p.isDel=0 and g.companyTypeId in (1,6,0,2,3,4,5,8) and p.deptId=#{deptId} @@ -783,7 +783,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.project_id,b.sub_dept_id,u.companyName,u.workTypeName,u.groupName, b.project_id,b.sub_dept_id, g.teamname remark,g.companyName degreeName FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project sp - WHERE u.cfgid=b.id and u.state=#{state} and u.companyId=g.companyId and sp.isDel=0 and sp.progressVisible=0 and b.project_id = sp.id + WHERE u.cfgid=b.id and u.state=#{state} and u.companyId=g.companyId and sp.isDel=0 and b.project_id = sp.id and g.companyTypeId in (1,6) diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml index 0525b3c3..f873a6da 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml @@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN ( SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn left join sur_project sp on sp.id = vbn.project_id - WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and sp.progressVisible=0 + WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and vbn.project_id=#{projectId} and sp.deptId=#{id} and sp.projectType = #{proType} @@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN ( SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn left join sur_project sp on sp.id = vbn.project_id - WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and sp.progressVisible=0 + WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and vbn.project_id=#{projectId} and sp.deptId=#{id} and sp.projectType = #{proType} @@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN ( SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn left join sur_project sp on sp.id = vbn.project_id - WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and sp.progressVisible=0 + WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and vbn.project_id=#{projectId} and sp.deptId=#{id} and sp.projectType = #{proType} @@ -210,7 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN ( SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn left join sur_project sp on sp.id = vbn.project_id - WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and sp.progressVisible=0 + WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and vbn.project_id=#{projectId} and sp.deptId=#{id} and sp.projectType = #{proType} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml index b8a66377..03bc5115 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml @@ -248,7 +248,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT 1 id,COUNT(1) project_id,'送检数' check_type FROM sur_project_check_detection spcd left join sur_project sp on sp.id = spcd.project_id - WHERE spcd.is_del='0' and sp.isDel=0 and sp.progressVisible=0 + WHERE spcd.is_del='0' and sp.isDel=0 and spcd.check_type= #{checkType} @@ -318,7 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select left(a.standard_type ,1) dict_label,count(1) STATUS from sur_project_standard a ,sur_project sp - where a.is_del =0 and a.project_id=sp.id and sp.progressVisible=0 + where a.is_del =0 and a.project_id=sp.id and a.project_id=#{projectId} and sp.deptid= #{deptId} @@ -143,7 +142,7 @@ select a.project_id,count(1) cnt from sur_project_standard a where a.is_del=0 group by a.project_id )a, - sur_project b where a.project_id=b.id and b.progressVisible=0 + sur_project b where a.project_id=b.id order by a.cnt desc @@ -155,7 +154,6 @@ and sp.deptId= #{deptId} and sp.projectType = #{proType} - and sp.progressVisible = 0 and sps.project_id in diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml index a4f1b2b8..9020d7cc 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept sd on sd.dept_id = spwp.dept_id left join sys_dict_data sdd on sdd.dict_type = 'project_special_type' and sdd.dict_value = spwp.special_type - and spwp.is_del=0 and sp.isDel=0 and sp.progressVisible=0 + and spwp.is_del=0 and sp.isDel=0 and spwp.project_id = #{projectId} and spwp.dept_id = #{deptId} and sp.projectType = #{proType} @@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(1) as total from sur_project_work_special spwp left join sur_project sp on sp.id = spwp.project_id - and spwp.is_del=0 and sp.isDel=0 and sp.progressVisible=0 + and spwp.is_del=0 and sp.isDel=0 and date(spwp.credential_expiration_time) date(NOW()) and spwp.project_id = #{projectId} and sp.projectType = #{proType} @@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(1) as total from sur_project_work_special spwp left join sur_project sp on sp.id = spwp.project_id - and spwp.is_del=0 and sp.isDel=0 and sp.progressVisible=0 + and spwp.is_del=0 and sp.isDel=0 and date(spwp.credential_expiration_time) ]]> date(NOW()) and spwp.project_id = #{projectId} and sp.projectType = #{proType} @@ -162,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sur_project_work_special s1 left join sur_project sp1 on sp1.id = s1.project_id WHERE - s1.is_del = 0 and sp1.isDel=0 and sp1.progressVisible=0 + s1.is_del = 0 and sp1.isDel=0 and sp1.deptId = #{nowDept} and s1.project_id = #{projectId} and sp1.projectType = #{proType} @@ -189,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sur_project_work_special s2 left join sur_project sp2 on sp2.id = s2.project_id WHERE - s2.is_del = 0 and sp2.isDel=0 and sp2.progressVisible=0 + s2.is_del = 0 and sp2.isDel=0 and sp2.deptId = #{nowDept} and s2.project_id = #{projectId} and sp2.projectType = #{proType} @@ -204,7 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s2.project_id ) void ON void.pid = spws.project_id WHERE - spws.is_del = 0 and sp.isDel=0 and sp.progressVisible=0 + spws.is_del = 0 and sp.isDel=0 and sp.deptId = #{nowDept} and spws.project_id = #{projectId} and sp.projectType = #{proType} diff --git a/yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml index 3ecb88c3..1537784d 100644 --- a/yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml @@ -54,7 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and dapd.is_del='0' and dapd.project_id = #{projectId} and sp.projectType = #{proType} - and sp.progressVisible = 0 and sp.projectName like concat('%', #{projectName}, '%') and dapd.dept_id = #{deptId} and sd.dept_name like concat('%', #{deptName}, '%') @@ -87,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sur_project sp ON sp.id = dapd.project_id - and dapd.project_id is not null and dapd.is_del='0' and sp.progressVisible = 0 + and dapd.project_id is not null and dapd.is_del='0' and dapd.project_id = #{projectId} and sp.projectType = #{proType} and sp.projectName like concat('%', #{projectName}, '%') @@ -126,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept sd ON sd.dept_id = dapd.dept_id - and dapd.is_del='0' and sp.progressVisible = 0 + and dapd.is_del='0' and dapd.project_id = #{projectId} and sp.projectType = #{proType} and sp.projectName like concat('%', #{projectName}, '%') diff --git a/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml b/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml index a81193f8..f9b3a3de 100644 --- a/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spp.create_date, spp.update_date,sp.projectName update_by from sur_project_photography as spp left join sur_project sp on sp.id = spp.project_id - where sp.isDel=0 and sp.progressVisible=0 + where sp.isDel=0 and spp.project_id = #{projectId} and spp.image_url = #{imageUrl} and spp.video_url = #{videoUrl} diff --git a/yanzhu-jh/src/main/resources/mapper/video/SurProjectVideoConfigMapper.xml b/yanzhu-jh/src/main/resources/mapper/video/SurProjectVideoConfigMapper.xml index 1d38f434..b3bd80af 100644 --- a/yanzhu-jh/src/main/resources/mapper/video/SurProjectVideoConfigMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/video/SurProjectVideoConfigMapper.xml @@ -56,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sp.projectName like concat('%', #{projectName}, '%') and spvc.dept_id = #{deptId} and sp.projectType = #{proType} - and sp.progressVisible = 0 and sd.dept_name like concat('%', #{deptName}, '%') and spvc.video_name like concat('%', #{videoName}, '%') and spvc.video_only_type = #{videoOnlyType} @@ -103,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sur_project_video_passage b on b.video_id = a.id left join sur_project p on a.project_id=p.id left join dev_ai_project_config_passage dacp on dacp.video_passage_id = b.id - where dacp.is_del=0 and dacp.channel_id is NOT NULL and dacp.channel_id!='' and p.progressVisible = 0 + where dacp.is_del=0 and dacp.channel_id is NOT NULL and dacp.channel_id!='' and a.project_id = #{projectId} and p.projectType = #{proType} and p.deptId = #{deptId} @@ -127,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sur_project_video_passage b on b.video_id = a.id left join sur_project p on a.project_id=p.id left join dev_ai_project_config_passage dacp on dacp.video_passage_id = b.id - where dacp.is_del=0 and dacp.channel_id is NOT NULL and dacp.channel_id!='' and p.progressVisible = 0 and p.isDel=0 + where dacp.is_del=0 and dacp.channel_id is NOT NULL and dacp.channel_id!='' and p.isDel=0 and a.project_id = #{projectId} and p.projectType = #{proType} and p.deptId = #{deptId}