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

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
姜玉琦 2024-01-20 21:06:20 +08:00
parent cc1e20f77d 7e62fc42fc
commit c7d542a769
81 changed files with 450 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -40,7 +40,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root
password: Sxyanzhu@cf
# 从库数据源

2
ruoyi-ui/src/components/ImageUpload/index.vue
View File

@ -28,7 +28,7 @@
的文件
</div>
<el-dialog
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
:visible.sync="dialogVisible"
title="预览"
width="800"

8
ruoyi-ui/src/components/Process/components/nodePanel/task.vue
View File

@ -73,8 +73,8 @@
title="选择人员"
:visible.sync="userVisible"
width="60%"
:close-on-press-escape="false"
:show-close="false"
:close-on-click-modal="false" :close-on-press-escape="false"
:show-close="false"
>
<flow-user :checkType="checkType" :selectValues="selectValues" @handleUserSelect="handleUserSelect"></flow-user>
<span slot="footer" class="dialog-footer">
@ -87,7 +87,7 @@
title="选择表达式"
:visible.sync="expVisible"
width="60%"
:close-on-press-escape="false"
:close-on-click-modal="false" :close-on-press-escape="false"
:show-close="false"
>
<flow-exp :selectValues="selectValues" @handleSingleExpSelect="handleSingleExpSelect"></flow-exp>
@ -101,7 +101,7 @@
title="选择候选角色"
:visible.sync="roleVisible"
width="60%"
:close-on-press-escape="false"
:close-on-click-modal="false" :close-on-press-escape="false"
:show-close="false"
>
<flow-role :checkType="checkType" :selectValues="selectValues" @handleRoleSelect="handleRoleSelect"></flow-role>

2
ruoyi-ui/src/components/RightToolbar/index.vue
View File

@ -13,7 +13,7 @@
</el-tooltip>
<slot name="right"></slot>
</el-row>
<el-dialog :title="title" :visible.sync="open" append-to-body>
<el-dialog :title="title" :visible.sync="open" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-transfer :titles="['显示', '隐藏']" v-model="value" :data="columns" @change="dataChange"></el-transfer>
</el-dialog>
</div>

10
ruoyi-ui/src/views/flowable/definition/index.vue
View File

@ -169,7 +169,7 @@
/>
<!-- 添加或修改流程定义对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="看看" prop="name">
<el-input v-model="form.name" placeholder="请输入看看" />
@ -182,7 +182,7 @@
</el-dialog>
<!-- bpmn20.xml导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-upload
ref="upload"
:limit="1"
@ -224,20 +224,20 @@
</el-dialog>
<!-- 流程图 -->
<el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
<el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<!-- <el-image :src="readImage.src"></el-image> -->
<flow :flowData="flowData"/>
</el-dialog>
<!--表单配置详情-->
<el-dialog :title="formTitle" :visible.sync="formConfOpen" width="50%" append-to-body>
<el-dialog :title="formTitle" :visible.sync="formConfOpen" width="50%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<div class="test-form">
<parser :key="new Date().getTime()" :form-conf="formConf" />
</div>
</el-dialog>
<!--挂载表单-->
<el-dialog :title="formDeployTitle" :visible.sync="formDeployOpen" width="60%" append-to-body>
<el-dialog :title="formDeployTitle" :visible.sync="formDeployOpen" width="60%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-row :gutter="24">
<el-col :span="10" :xs="24">
<el-table

4
ruoyi-ui/src/views/flowable/task/form/index.vue
View File

@ -102,7 +102,7 @@
/>
<!-- 添加或修改流程表单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="表单名称" prop="formName">
<el-input v-model="form.formName" placeholder="请输入表单名称" />
@ -121,7 +121,7 @@
</el-dialog>
<!--表单配置详情-->
<el-dialog :title="formTitle" :visible.sync="formConfOpen" width="60%" append-to-body>
<el-dialog :title="formTitle" :visible.sync="formConfOpen" width="60%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<div class="test-form">
<parser :key="new Date().getTime()" :form-conf="formConf" />
</div>

4
ruoyi-ui/src/views/flowable/task/myProcess/index.vue
View File

@ -148,7 +148,7 @@
/>
<!-- 发起流程 -->
<el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="60%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="流程名称" prop="name">
<el-input
@ -214,7 +214,7 @@
/>
</el-dialog>
<!-- 终止流程 -->
<el-dialog :title="title" :visible.sync="stopOpen" width="30%" append-to-body>
<el-dialog :title="title" :visible.sync="stopOpen" width="30%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form"
:model="form"
:rules="rules"

2
ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
View File

@ -21,7 +21,7 @@
</el-tab-pane>
</el-tabs>
<!--选择流程接收人-->
<el-dialog :title="taskTitle" :visible.sync="taskOpen" width="65%" append-to-body>
<el-dialog :title="taskTitle" :visible.sync="taskOpen" width="65%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"/>
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"/>
<span slot="footer" class="dialog-footer">

6
ruoyi-ui/src/views/flowable/task/record/index.vue
View File

@ -92,7 +92,7 @@
</el-card>
<!--审批正常流程-->
<el-dialog :title="completeTitle" :visible.sync="completeOpen" :width="checkSendUser? '60%':'40%'" append-to-body>
<el-dialog :title="completeTitle" :visible.sync="completeOpen" :width="checkSendUser? '60%':'40%'" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="taskForm" :model="taskForm" label-width="80px" >
<el-form-item v-if="checkSendUser" prop="targetKey">
<el-row :gutter="20">
@ -157,7 +157,7 @@
</el-dialog>
<!--退回流程-->
<el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body>
<el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="taskForm" :model="taskForm" label-width="80px" >
<el-form-item label="退回节点" prop="targetKey">
<el-radio-group v-model="taskForm.targetKey">
@ -179,7 +179,7 @@
</el-dialog>
<!--驳回流程-->
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="taskForm" :model="taskForm" label-width="80px" >
<el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>

6
ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
View File

@ -81,7 +81,7 @@
</el-tab-pane>
</el-tabs>
<!--审批任务-->
<el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
<el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="taskForm" :model="taskForm">
<el-form-item prop="targetKey">
<flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
@ -98,7 +98,7 @@
</span>
</el-dialog>
<!--退回流程-->
<el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body>
<el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="退回节点" prop="targetKey">
<el-radio-group v-model="taskForm.targetKey">
@ -121,7 +121,7 @@
</span>
</el-dialog>
<!--驳回流程-->
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="驳回意见" prop="comment"
:rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">

6
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -152,7 +152,7 @@
/>
<!-- 添加或修改定时任务对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
@ -236,12 +236,12 @@
</div>
</el-dialog>
<el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar">
<el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar" :close-on-click-modal="false" :close-on-press-escape="false">
<crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
</el-dialog>
<!-- 任务日志详细 -->
<el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
<el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" label-width="120px" size="mini">
<el-row>
<el-col :span="12">

2
ruoyi-ui/src/views/monitor/job/log.vue
View File

@ -144,7 +144,7 @@
/>
<!-- 调度日志详细 -->
<el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
<el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">

2
ruoyi-ui/src/views/monitor/operlog/index.vue
View File

@ -151,7 +151,7 @@
/>
<!-- 操作日志详细 -->
<el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
<el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">

2
ruoyi-ui/src/views/project/attendance/index.vue
View File

@ -87,7 +87,7 @@
@pagination="getList" />
<!-- 添加或修改劳务实名制管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="厂商编号参考字典attendance_vendors" prop="vendorsCode">
<el-input v-model="form.vendorsCode" placeholder="请输入厂商编号参考字典attendance_vendors" />

2
ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="attendance-config-dialog">
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="项目名称" prop="projectId">
<el-select v-if="mode != 'edit'" v-model="form.projectId" placeholder="请选择项目" clearable

4
ruoyi-ui/src/views/project/checkDetection/index.vue
View File

@ -355,7 +355,7 @@
/>
<!-- 添加或修改材料取样复试对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="项目名称" prop="projectName">
<el-input
@ -457,7 +457,7 @@
v-if="resultopen"
:visible.sync="resultopen"
width="680px"
append-to-body
append-to-body :close-on-click-modal="false" :close-on-press-escape="false"
>
<el-form
ref="resultform"

12
ruoyi-ui/src/views/project/costOutput/costMonth.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="cost-month" style="border:solid 1px #409eff;margin: 12px 0px;padding: 6px 12px 0px;position: relative;">
<el-popover placement="top" v-model="showPop2">
<el-popover placement="top" v-model="showPop2" ref="pop">
<p>选择年份</p>
<div style="margin-bottom: 12px;">
<el-date-picker v-model="selYear" type="year" placeholder="选择年" :picker-options="{disabledDate:doPick}" >
@ -32,7 +32,7 @@ export default {
name: 'RuoyiUiCostMonth',
data() {
return {
return {
selYear:'',
names:['','一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月'],
activeName:'',
@ -47,15 +47,17 @@ export default {
methods: {
doPick(a,b){
return this.yearInv.filter(d=>d.year==a.getFullYear()).length>0;
return this.monthInv.filter(d=>d.year==a.getFullYear()).length>0;
},
doAddYear(){
doAddYear(){
addMonthInvestment({year:this.$dt(this.selYear).$y,projectId:this.prj.id,costType:9}).then(d=>{
this.$refs.pop.showPopper=false
this.$emit('success');
});
},
init(d){
init(d,prj){
this.monthInv=d;
this.prj=prj;
if(d.filter(it=>it.year==new Date().getFullYear()).length>0){
this.activeName=""+new Date().getFullYear()
}else{

6
ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue
View File

@ -119,9 +119,11 @@ export default {
obj.money=obj.money?obj.money*10000:0;
return obj;
});
batchUpdate(objs).then(d=>{
batchUpdate(objs).then(d=>{
if(d.code!=200){
this.loadData();
this.loadData();
}else{
this.$modal.msgSuccess("保存成功");
}
});
},

2
ruoyi-ui/src/views/project/costOutput/index.vue
View File

@ -132,7 +132,7 @@
/>
<!-- 添加或修改项目成本产值对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目编号" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目编号" />

2
ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
View File

@ -276,7 +276,7 @@
/>
<!-- 添加或修改广联达班组信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="${comment}" prop="cfgid">
<el-input v-model="form.cfgid" placeholder="请输入${comment}" />

2
ruoyi-ui/src/views/project/materialSeal/index.vue
View File

@ -341,7 +341,7 @@
/>
<!-- 添加或修改材料封样对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input

2
ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
View File

@ -215,7 +215,7 @@
/>
<!-- 添加或修改项目材料封样对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input

2
ruoyi-ui/src/views/project/projectChecking/index.vue
View File

@ -321,7 +321,7 @@
/>
<!-- 添加或修改项目验收对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="验收图片" prop="imageUrls">
<image-upload v-model="form.imageUrls" :limit="9" />

2
ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
View File

@ -212,7 +212,7 @@
/>
<!-- 添加或修改项目举牌验收对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input

2
ruoyi-ui/src/views/project/projectDeptWroks/index.vue
View File

@ -126,7 +126,7 @@
/>
<!-- 添加或修改在岗人员对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目主键" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目主键" />

2
ruoyi-ui/src/views/project/projectMeasure/index.vue
View File

@ -351,7 +351,7 @@
/>
<!-- 添加或修改实测实量对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input

2
ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
View File

@ -220,7 +220,7 @@
/>
<!-- 添加或修改实测实量对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input

2
ruoyi-ui/src/views/project/projectPlan/index copy.vue
View File

@ -152,7 +152,7 @@
/>
<!-- 添加或修改项目跟进计划对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="form.projectName" type="textarea" placeholder="请输入内容" />

2
ruoyi-ui/src/views/project/projectStandard/index.vue
View File

@ -132,7 +132,7 @@
/>
<!-- 添加或修改标准化管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目ID" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目ID" />

2
ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body custom-class="project-standard-dlg">
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body custom-class="project-standard-dlg" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称:">
{{ prj.projectName }}

2
ruoyi-ui/src/views/project/surProjectAttendance/index.vue
View File

@ -150,7 +150,7 @@
/>
<!-- 添加或修改项目出勤对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目主键" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目主键" />

2
ruoyi-ui/src/views/project/surProjectInsurance/index.vue
View File

@ -249,7 +249,7 @@
/>
<!-- 添加或修改项目保险对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="保险类型" prop="insuranceType">
<el-select

2
ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
View File

@ -106,7 +106,7 @@
/>
<!-- 添加或修改项目保险对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input

2
ruoyi-ui/src/views/project/surProjectQuarterlyAssess/index.vue
View File

@ -166,7 +166,7 @@
/>
<!-- 添加或修改项目季度考核对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目编号" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目编号" />

2
ruoyi-ui/src/views/project/surProjectSpecial/index.vue
View File

@ -259,7 +259,7 @@
/>
</el-tabs>
<!-- 添加或修改项目特种人员对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="form.projectName" placeholder="请输入项目名称" disabled />

2
ruoyi-ui/src/views/system/applyConfig/index.vue
View File

@ -148,7 +148,7 @@
/>
<!-- 添加或修改系统应用注册对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<div class="page-warning">
<p><strong style="color: #E6A23C;">“应用公钥”</strong> 在注册应用后由系统生成，请在保存后查看。</p>

2
ruoyi-ui/src/views/system/config/index.vue
View File

@ -148,7 +148,7 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="参数名称" prop="configName">
<el-input v-model="form.configName" placeholder="请输入参数名称" />

2
ruoyi-ui/src/views/system/dept/index.vue
View File

@ -97,7 +97,7 @@
</el-table>
<!-- 添加或修改部门对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">

2
ruoyi-ui/src/views/system/dict/data.vue
View File

@ -141,7 +141,7 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典类型">
<el-input v-model="form.dictType" :disabled="true" />

2
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -158,7 +158,7 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入字典名称" />

2
ruoyi-ui/src/views/system/expression/index.vue
View File

@ -106,7 +106,7 @@
/>
<!-- 添加或修改流程达式对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="请输入表达式名称" />

2
ruoyi-ui/src/views/system/listener/index.vue
View File

@ -115,7 +115,7 @@
/>
<!-- 添加或修改流程监听对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="请输入名称" />

2
ruoyi-ui/src/views/system/menu/index.vue
View File

@ -103,7 +103,7 @@
</el-table>
<!-- 添加或修改菜单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">

2
ruoyi-ui/src/views/system/notice/index.vue
View File

@ -123,7 +123,7 @@
/>
<!-- 添加或修改公告对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">

2
ruoyi-ui/src/views/system/post/index.vue
View File

@ -124,7 +124,7 @@
/>
<!-- 添加或修改岗位对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="岗位名称" prop="postName">
<el-input v-model="form.postName" placeholder="请输入岗位名称" />

4
ruoyi-ui/src/views/system/role/index.vue
View File

@ -156,7 +156,7 @@
/>
<!-- 添加或修改角色配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
@ -208,7 +208,7 @@
</el-dialog>
<!-- 分配角色数据权限对话框 -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="form" label-width="80px">
<el-form-item label="角色名称">
<el-input v-model="form.roleName" :disabled="true" />

2
ruoyi-ui/src/views/system/role/selectUser.vue
View File

@ -24,7 +24,7 @@
</el-form-item>
</el-form>
<el-row>
<el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" stripe height="260px">
<el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" stripe height="260px" :close-on-click-modal="false" :close-on-press-escape="false">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="登录账号" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="姓名" prop="nickName" :show-overflow-tooltip="true" />

4
ruoyi-ui/src/views/system/user/index.vue
View File

@ -214,7 +214,7 @@
</el-row>
<!-- 添加或修改用户配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
@ -325,7 +325,7 @@
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-upload
ref="upload"
:limit="1"

2
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog" :close-on-click-modal="false" :close-on-press-escape="false">
<el-row>
<el-col :xs="24" :md="12" :style="{height: '350px'}">
<vue-cropper

2
ruoyi-ui/src/views/tool/build/IconsDialog.vue
View File

@ -3,7 +3,7 @@
<el-dialog
v-bind="$attrs"
width="980px"
:modal-append-to-body="false"
:modal-append-to-body="false" :close-on-click-modal="false" :close-on-press-escape="false"
v-on="$listeners"
@open="onOpen"
@close="onClose"

2
ruoyi-ui/src/views/tool/build/ResourceDialog.vue
View File

@ -4,7 +4,7 @@
v-bind="$attrs"
title="外部资源引用"
width="600px"
:close-on-click-modal="false"
:close-on-click-modal="false" :close-on-press-escape="false"
v-on="$listeners"
@open="onOpen"
@close="onClose"

2
ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue
View File

@ -2,7 +2,7 @@
<div>
<el-dialog
v-bind="$attrs"
:close-on-click-modal="false"
:close-on-click-modal="false" :close-on-press-escape="false"
:modal-append-to-body="false"
v-on="$listeners"
@open="onOpen"

2
ruoyi-ui/src/views/tool/build/index.vue
View File

@ -118,7 +118,7 @@
/>
<input id="copyNode" type="hidden">
<!--表单配置详情-->
<el-dialog :title="formTitle" :visible.sync="formOpen" width="500px" append-to-body>
<el-dialog :title="formTitle" :visible.sync="formOpen" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="表单名称" prop="formName">
<el-input v-model="form.formName" placeholder="请输入表单名称" />

2
ruoyi-ui/src/views/tool/gen/importTable.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 导入表 -->
<el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form-item label="表名称" prop="tableName">
<el-input

2
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -158,7 +158,7 @@
@pagination="getList"
/>
<!-- 预览界面 -->
<el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
<el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar" :close-on-click-modal="false" :close-on-press-escape="false">
<el-tabs v-model="preview.activeName">
<el-tab-pane
v-for="(value, key) in preview.data"

4
ruoyi-ui/src/views/trouble/pshMarks/index.vue
View File

@ -164,7 +164,7 @@
/>
<!-- 添加或修改安全留痕对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="id" prop="id">
<el-input v-model="form.id" placeholder="请输入id" />
@ -271,7 +271,7 @@
</el-dialog>
<el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="srcList" />
<el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body>
<el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<video ref="video" :src="videoSrc" controls="controls" autoplay="autoplay" poster="../../../assets/images/video_loading.gif" style="max-height: 550px;"/>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelVideo">关 闭</el-button>

4
ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue
View File

@ -294,7 +294,7 @@
</el-tabs>
<!-- 添加或修改安全整改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目id" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目id" />
@ -378,7 +378,7 @@
:visible.sync="openVideo"
width="980px"
:before-close="cancelVideo"
append-to-body
append-to-body :close-on-click-modal="false" :close-on-press-escape="false"
>
<video
ref="video"

4
ruoyi-ui/src/views/trouble/sspMarks/index.vue
View File

@ -164,7 +164,7 @@
/>
<!-- 添加或修改质量留痕对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="id" prop="id">
<el-input v-model="form.id" placeholder="请输入id" />
@ -271,7 +271,7 @@
</el-dialog>
<el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="srcList" />
<el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body>
<el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<video ref="video" :src="videoSrc" controls="controls" autoplay="autoplay" poster="../../../assets/images/video_loading.gif" style="max-height: 550px;"/>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelVideo">关 闭</el-button>

4
ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
View File

@ -288,7 +288,7 @@
</el-tabs>
<!-- 添加或修改质量整改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目id" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目id" />
@ -371,7 +371,7 @@
title="视频播放"
:visible.sync="openVideo"
width="980px"
:before-close="cancelVideo"
:before-close="cancelVideo" :close-on-click-modal="false" :close-on-press-escape="false"
append-to-body
>
<video

2
ruoyi-ui/src/views/video/aiBoxProjectConfig/aiBoxVideoConfigDrawer.vue
View File

@ -99,7 +99,7 @@
/>
<!-- 添加或修改AI视频配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="720px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true"/>

2
ruoyi-ui/src/views/video/aiBoxProjectConfig/index.vue
View File

@ -140,7 +140,7 @@
/>
<!-- 添加或修改AI视频配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="720px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="项目名称" prop="projectId">
<el-select

2
ruoyi-ui/src/views/video/videoConfig/index.vue
View File

@ -229,7 +229,7 @@
/>
<!-- 添加或修改视频配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectId">
<el-select

2
ruoyi-ui/src/views/video/videoConfig/videoConfigDrawer.vue
View File

@ -162,7 +162,7 @@
/>
<!-- 添加或修改视频配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input

2
ruoyi-ui/src/views/work/emergencyDrill/index.vue
View File

@ -230,7 +230,7 @@
/>
<!-- 添加或修改演练演练对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称">
<el-input

2
ruoyi-ui/src/views/work/workFile/index.vue
View File

@ -164,7 +164,7 @@
/>
<!-- 添加或修改文件传达对话框 -->
<el-dialog :title="title" v-if="open" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" v-if="open" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="文件归属" prop="fileBelong">
<el-select v-model="form.fileBelong" placeholder="请选择文件归属" style="width: 100%;">

2
ruoyi-ui/src/views/work/workJournalism/index.vue
View File

@ -228,7 +228,7 @@
/>
</el-tabs>
<!-- 添加或修改集团新闻对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="新闻标题" prop="title">
<el-input v-model="form.title" placeholder="请输入新闻标题" />

2
ruoyi-ui/src/views/work/workTrain/index.vue
View File

@ -230,7 +230,7 @@
/>
<!-- 添加或修改演练培训对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="培训主图" prop="mainImage">
<image-upload v-model="form.mainImage" :limit="1" />

2
ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue
View File

@ -133,7 +133,7 @@
/>
<!-- 添加或修改菜单配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="菜单图标" prop="menuImg">
<image-upload v-model="form.menuImg" :limit="1"/>

4
ruoyi-ui/vue.config.js
View File

@ -41,8 +41,8 @@ module.exports = {
// }
// },
'/jhapi':{
//target: `http://62.234.3.186/jhapi/`,
target: `http://127.0.0.1:8090/jhapi/`,
target: `http://62.234.3.186/jhapi/`,
//target: `http://127.0.0.1:8090/jhapi/`,
changeOrigin: true,
pathRewrite: {
'^/jhapi':'/'

42
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java
View File

@ -6,12 +6,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.yanzhu.jh.project.domain.SurProjectDeptWroks;
import com.yanzhu.jh.work.domain.WorkTrain;
import com.yanzhu.jh.work.service.IWorkTrainService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 培训演训Conller
@ -45,4 +46,39 @@ public class BgWorkTrainController extends BaseController {
return getDataTable(workTrainService.selectBgscreenWorkTrainListv2(workTrain));
}
/**
* 大屏教训培训，应急演练图标数据查询
* @return
*/
@GetMapping("/getGroupByDataType")
public AjaxResult getGroupByDataType(String deptId, String projectId){
WorkTrain workTrain = new WorkTrain();
if(deptId!=null && !"0".equals(deptId)){
workTrain.setNowDept(deptId);
}else{
if (SecurityUtils.isUserB()) {
workTrain.setPrjIds(getProjectIds());
}
}
if(projectId!=null && !"0".equals(projectId)){
workTrain.setProjectId(Convert.toLong(projectId));
}
return AjaxResult.success(workTrainService.getGroupByDataType(workTrain));
}
@PostMapping("/queryWorkTrainList")
public TableDataInfo queryWorkTrainList(@RequestBody WorkTrain where){
Long deptId= where.getDeptId();
if(deptId!=null && deptId>0){
where.setNowDept(""+deptId);
}else{
if (SecurityUtils.isUserB()) {
where.setPrjIds(getProjectIds());
}
}
startPage();
List<WorkTrain> list=workTrainService.queryWorkTrainList(where);
return getDataTable(list);
}
}

69
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java
View File

@ -8,9 +8,7 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.yanzhu.jh.project.domain.SurProjectChecking;
import com.yanzhu.jh.project.service.ISurProjectCheckingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* 项目验收Conller
@ -65,4 +63,69 @@ public class ProjectCheckingController extends BaseController {
}
return success(surProjectCheckingService.selectBgscreenProjectCheckingView(surProjectChecking));
}
/**
* 根据验收类型2级分组查询，用于大屏质量管理-举牌验收图表
* @param deptId
* @param projectId
* @return
*/
@GetMapping("/getProjectCheckingGroupFoChart")
public AjaxResult getProjectCheckingGroupFoChart(String deptId, String projectId){
SurProjectChecking surProjectChecking = new SurProjectChecking();
if(deptId!=null && !"0".equals(deptId)){
surProjectChecking.setProjectDeptId(deptId);
}else{
if (SecurityUtils.isUserB()) {
surProjectChecking.setPrjIds(getProjectIds());
}
}
if(projectId!=null && !"0".equals(projectId)){
surProjectChecking.setProjectId(Convert.toLong(projectId));
}
return success(surProjectCheckingService.getProjectCheckingGroupFoChart(surProjectChecking));
}
/**
* 根据验收类型2级分组查询，用于大屏质量管理-举牌验收分组查询
* @param deptId
* @param projectId
* @return
*/
@GetMapping("/groupCheckingByProjectId")
public AjaxResult groupCheckingByProjectId(String lvl,String deptId, String projectId){
SurProjectChecking surProjectChecking = new SurProjectChecking();
surProjectChecking.setDataTypeLvl2(lvl);
if(deptId!=null && !"0".equals(deptId)){
surProjectChecking.setProjectDeptId(deptId);
}else{
if (SecurityUtils.isUserB()) {
surProjectChecking.setPrjIds(getProjectIds());
}
}
if(projectId!=null && !"0".equals(projectId)){
surProjectChecking.setProjectId(Convert.toLong(projectId));
}
return success(surProjectCheckingService.groupCheckingByProjectId(surProjectChecking));
}
@PostMapping("/queryProjectCheckingList")
public TableDataInfo queryProjectCheckingList(@RequestBody SurProjectChecking where){
Long deptId=where.getDeptId();
Long projectId=where.getProjectId();
if(deptId!=null && deptId.equals(0)){
where.setProjectDeptId(""+deptId);
where.setDeptId(null);
}else{
if (SecurityUtils.isUserB()) {
where.setPrjIds(getProjectIds());
}
}
if(projectId!=null && projectId.equals(0)){
where.setProjectId(Convert.toLong(projectId));
}
startPage();
return getDataTable(surProjectCheckingService.selectBgscreenProjectCheckingListByPage(where));
}
}

24
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java
View File

@ -105,6 +105,30 @@ public class SurProjectChecking extends BaseEntity
@Excel(name = "审核状态")
private String approveStatus;
@Excel(name = "验收类型")
private String dataTypeLvl1;
public String getDataTypeLvl1() {
return dataTypeLvl1;
}
public void setDataTypeLvl1(String dataTypeLvl1) {
this.dataTypeLvl1 = dataTypeLvl1;
}
public String getDataTypeLvl2() {
return dataTypeLvl2;
}
public void setDataTypeLvl2(String dataTypeLvl2) {
this.dataTypeLvl2 = dataTypeLvl2;
}
@Excel(name = "子验收类型")
private String dataTypeLvl2;
private String projectName;
private String deptName;

14
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java
View File

@ -32,11 +32,15 @@ public interface SurProjectCheckingMapper
/**
* 查询项目验收列表
*
* @param surProjectChecking 项目验收
* @return 项目验收集合
*/
public List<SurProjectChecking> selectBgscreenProjectCheckingList(SurProjectChecking surProjectChecking);
/**
* 查询项目验收列表(分页)
*
* @return 项目验收集合
*/
public List<SurProjectChecking> selectBgscreenProjectCheckingListByPage(SurProjectChecking where);
/**
* 查询项目验收统计
*
@ -84,4 +88,10 @@ public interface SurProjectCheckingMapper
* @return 结果
*/
public List<Map<String,Object>> findStatisticsByProjectId(Long projectId);
public List<SurProjectChecking> playVideo(SurProjectChecking where);
List<SurProjectChecking> selectProjectCheckingGroupFoChart(SurProjectChecking surProjectChecking);
List<SurProjectChecking> groupCheckingByProjectId(SurProjectChecking where);
}

16
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java
View File

@ -92,4 +92,20 @@ public interface ISurProjectCheckingService
* @return 结果
*/
public List<Map<String,Object>> findStatisticsByProjectId(Long projectId);
/**
* 根据验收类型2级分组查询，用于大屏质量管理-举牌验收图表
* @param surProjectChecking
* @return
*/
public List<SurProjectChecking> getProjectCheckingGroupFoChart(SurProjectChecking surProjectChecking);
/**
* 根据验收类型2级分组查询，用于大屏质量管理-举牌验收分组查询
* @param surProjectChecking
* @return
*/
public List<SurProjectChecking> groupCheckingByProjectId(SurProjectChecking surProjectChecking);
public List<SurProjectChecking> selectBgscreenProjectCheckingListByPage(SurProjectChecking where);
}

15
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
View File

@ -229,4 +229,19 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
public List<Map<String,Object>> findStatisticsByProjectId(Long projectId) {
return surProjectCheckingMapper.findStatisticsByProjectId(projectId);
}
@Override
public List<SurProjectChecking> getProjectCheckingGroupFoChart(SurProjectChecking surProjectChecking) {
return surProjectCheckingMapper.selectProjectCheckingGroupFoChart(surProjectChecking);
}
@Override
public List<SurProjectChecking> groupCheckingByProjectId(SurProjectChecking where) {
return surProjectCheckingMapper.groupCheckingByProjectId(where);
}
@Override
public List<SurProjectChecking> selectBgscreenProjectCheckingListByPage(SurProjectChecking where) {
return surProjectCheckingMapper.selectBgscreenProjectCheckingListByPage(where);
}
}

11
yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java
View File

@ -70,6 +70,17 @@ public class WorkTrain extends BaseEntity
@Excel(name = "演训内容")
private String trainFile;
/** 数据类型 */
private Integer dataType;
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
/** 演练培训协同部门信息 */
private List<WorkTrainDept> workTrainDeptList;

4
yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java
View File

@ -118,4 +118,8 @@ public interface WorkTrainMapper
* @return 结果
*/
public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
public List<WorkTrain> getGroupByDataType(WorkTrain workTrain);
public List<WorkTrain> queryWorkTrainList(WorkTrain where);
}

4
yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java
View File

@ -92,4 +92,8 @@ public interface IWorkTrainService
* @return 结果
*/
public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
public List<WorkTrain> getGroupByDataType(WorkTrain workTrain);
public List<WorkTrain> queryWorkTrainList(WorkTrain where);
}

10
yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java
View File

@ -220,4 +220,14 @@ public class WorkTrainServiceImpl implements IWorkTrainService
public List<Map<String,Object>> findGroupCountByProjectId(Long projectId) {
return workTrainMapper.findGroupCountByProjectId(projectId);
}
@Override
public List<WorkTrain> getGroupByDataType(WorkTrain workTrain) {
return workTrainMapper.getGroupByDataType(workTrain);
}
@Override
public List<WorkTrain> queryWorkTrainList(WorkTrain where) {
return workTrainMapper.queryWorkTrainList(where);
}
}

99
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
View File

@ -34,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="projectName" column="projectName" />
<result property="deptName" column="dept_name" />
<result property="approveStatus" column="approve_status" />
<result property="dataTypeLvl1" column="data_type_lvl1" />
<result property="dataTypeLvl2" column="data_type_lvl2" />
</resultMap>
<sql id="selectSurProjectCheckingVo">
@ -87,7 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectBgscreenProjectCheckingList" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, sp.projectName, sd.dept_name from sur_project_checking spc
select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, sp.projectName, sd.dept_name
from sur_project_checking spc
left join sur_project sp on spc.project_id = sp.id
left join sys_dept sd on sd.dept_id = spc.dept_id
<!--监理单位/总包公司/分包单位-->
@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</if>
<if test="dataTypeLvl2 != null "> and spc.data_type_lvl2 = #{dataTypeLvl2}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<if test="deptId != null "> and spc.dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and sd.dept_name like concat('%', #{deptName}, '%')</if>
@ -130,6 +134,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
limit 0,10
</select>
<select id="selectBgscreenProjectCheckingListByPage" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, sp.projectName, sd.dept_name
from sur_project_checking spc
left join sur_project sp on spc.project_id = sp.id
left join sys_dept sd on sd.dept_id = spc.dept_id
<!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
<where>
and spc.is_del=0
<if test="projectId != null "> and spc.project_id = #{projectId}</if>
<if test="prjIds !=null and prjIds.size()>0">
and spc.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="dataTypeLvl2 != null "> and spc.data_type_lvl2 = #{dataTypeLvl2}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<if test="deptId != null "> and spc.dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and sd.dept_name like concat('%', #{deptName}, '%')</if>
<if test="groupDeptId != null "> and spc.group_dept_id = #{groupDeptId}</if>
<if test="checkType != null and checkType != ''"> and spc.check_type = #{checkType}</if>
<if test="workingPositionType != null and workingPositionType != ''"> and spc.working_position_type = #{workingPositionType}</if>
<if test="checkWorkingPosition != null and checkWorkingPosition != ''"> and spc.check_working_position like concat('%', #{checkWorkingPosition}, '%')</if>
<if test="checkResult != null and checkResult != ''"> and spc.check_result = #{checkResult}</if>
<if test="qualityUser != null and qualityUser != ''"> and (spc.quality_user like concat('%', #{qualityUser}, '%') or spc.quality_user_name like concat('%', #{qualityUser}, '%'))</if>
<if test="qualityUserName != null and qualityUserName != ''"> and spc.quality_user_name like concat('%', #{qualityUserName}, '%')</if>
<if test="superviseUser != null and superviseUser != ''"> and (spc.supervise_user like concat('%', #{superviseUser}, '%') or spc.supervise_user_name like concat('%', #{superviseUser}, '%'))</if>
<if test="superviseUserName != null and superviseUserName != ''"> and spc.supervise_user_name like concat('%', #{superviseUserName}, '%')</if>
<if test="groupDeptUser != null and groupDeptUser != ''"> and spc.group_dept_user like concat('%', #{groupDeptUser}, '%')</if>
<if test="groupDeptUserName != null and groupDeptUserName != ''"> and spc.group_dept_user_name like concat('%', #{groupDeptUserName}, '%')</if>
<if test="params.beginCheckingDate != null and params.beginCheckingDate != '' and params.endCheckingDate != null and params.endCheckingDate != ''"> and spc.checking_date between #{params.beginCheckingDate} and #{params.endCheckingDate}</if>
<if test="isDel != null "> and spc.is_del = #{isDel}</if>
<!-- 查询条件-项目部门 -->
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
<!--子部门数据-->
<if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
<!--监理单位/总包公司/分包单位查询当前关联数据-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spc.create_by = #{nowUserName}</if>
</where>
order by checking_date desc
</select>
<select id="selectBgscreenProjectCheckingView" parameterType="SurProjectChecking" resultType="map">
select spc.check_result, count(spc.id) as total from sur_project_checking spc
left join sur_project sp on spc.project_id = sp.id
@ -180,7 +231,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY
spc.project_id
</select>
<insert id="insertSurProjectChecking" parameterType="SurProjectChecking" useGeneratedKeys="true" keyProperty="id">
insert into sur_project_checking
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -208,6 +260,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="dataTypeLvl1 != null">data_type_lvl1,</if>
<if test="dataTypeLvl2 != null">data_type_lvl2,</if>
<if test="remark != null">remark,</if>
<if test="approveStatus != null">approve_status,</if>
</trim>
@ -236,6 +290,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="dataTypeLvl1 != null">#{dataTypeLvl1},</if>
<if test="dataTypeLvl2 != null">#{dataTypeLvl2},</if>
<if test="remark != null">#{remark},</if>
<if test="approveStatus != null">#{approveStatus},</if>
</trim>
@ -268,6 +324,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="dataTypeLvl1 != null">data_type_lvl1 = #{dataTypeLvl1},</if>
<if test="dataTypeLvl2 != null">data_type_lvl2 = #{dataTypeLvl2},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="approveStatus != null">approve_status = #{approveStatus},</if>
</trim>
@ -284,4 +342,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<select id="selectProjectCheckingGroupFoChart" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
select a.dict_value data_type_lvl2,dict_label main_image,a.css_class check_type,b.cnt id from
(
SELECT *
FROM sys_dict_data WHERE dict_type='project_checking_data_type_lvl2'
) a
left join
(
SELECT data_type_lvl2,count(1) cnt
FROM sur_project_checking a,sur_project b WHERE a.project_id=b.id
and a.is_del=0
<if test="projectId != null "> and a.project_id = #{projectId}</if>
<if test="projectDeptId != null "> and b.deptId = #{projectDeptId}</if>
<if test="prjIds !=null and prjIds.size()>0">
and a.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
group by data_type_lvl2
) b
on a.dict_value=b.data_type_lvl2
</select>
<select id="groupCheckingByProjectId" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
SELECT a.project_id,COUNT(1) id,b.projectName
FROM sur_project_checking a,sur_project b WHERE a.project_id=b.id AND a.data_type_lvl2=#{dataTypeLvl2}
and a.is_del=0
<if test="projectId != null "> and a.project_id = #{projectId}</if>
<if test="projectDeptId != null "> and b.deptId = #{projectDeptId}</if>
<if test="prjIds !=null and prjIds.size()>0">
and a.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
GROUP BY a.project_id
</select>
</mapper>

51
yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
View File

@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" />
<result property="vDel" column="v_del" />
<result property="trainNatureName" column="train_nature_name" />
<result property="dataType" column="data_type" />
</resultMap>
<resultMap id="WorkTrainWorkTrainDeptResult" type="WorkTrain" extends="WorkTrainResult">
@ -174,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="dataType != null">data_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectId != null">#{projectId},</if>
@ -193,9 +195,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="dataType != null">#{dataType},</if>
</trim>
</insert>
<update id="updateWorkTrain" parameterType="WorkTrain">
update work_train
<trim prefix="SET" suffixOverrides=",">
@ -215,6 +219,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="dataType != null">data_type = #{dataType},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
@ -248,4 +253,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( #{item.trainId}, #{item.deptId}, #{item.isMain})
</foreach>
</insert>
<select id="getGroupByDataType" parameterType="WorkTrain" resultMap="WorkTrainResult">
SELECT a.dict_value data_type,dict_label train_title,css_class train_type,b.cnt id
FROM (
SELECT *
FROM sys_dict_data WHERE dict_type='work_train_data_type' ) a
LEFT JOIN
(
SELECT COUNT(1) cnt,data_type
FROM work_train
<where>
<if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
<if test="projectId != null"> and project_id = #{projectId}</if>
<if test="prjIds !=null and prjIds.size()>0">
and project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
GROUP BY data_type
) b ON a.dict_value=b.data_type
</select>
<select id="queryWorkTrainList" parameterType="WorkTrain" resultMap="WorkTrainResult">
select wt.id, wt.project_id, wt.project_name, wt.main_image, wt.train_type, wt.train_title, wt.train_nature, sdd.dict_label as train_nature_name, wt.train_participants, wt.begin_date, wt.end_date, wt.train_content, wt.train_file, wt.is_del, wt.create_by, wt.create_time, wt.update_by, wt.update_time, wt.remark, group_concat(sd.dept_id) as trainDeptIds, group_concat(sd.dept_name) as trainDeptNames
from work_train wt
left join work_train_dept wtd on wtd.train_id = wt.id
left join sys_dept sd on sd.dept_id = wtd.dept_id
left join sur_project sp on sp.id = wt.project_id
<if test='trainType != null and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if>
<if test='trainType != null and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if>
<where>
and wt.is_del=0
<if test="dataType != null and dataType != 0 "> and wt.data_type = #{dataType}</if>
<if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
<if test="trainType != null and trainType != ''"> and wt.train_type = #{trainType}</if>
<if test="projectId != null and projectId!=0"> and wt.project_id = #{projectId}</if>
<if test="prjIds !=null and prjIds.size()>0">
and wt.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
group by wt.id
order by wt.create_time desc
</select>
</mapper>