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

提交代码

dev_xds
姜玉琦 2024-08-13 22:10:53 +08:00
parent bb0f7c0a49
commit df2d132b1c
30 changed files with 489 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
View File

@ -156,7 +156,7 @@
<select id="groupByCategory" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
SELECT a.dict_label taskName,b.cnt assigneeId,c.cnt procDefVersion FROM
( SELECT * FROM sys_dict_data WHERE dict_type = 'sys_process_category') a
LEFT JOIN (SELECT category,COUNT(1) cnt FROM vw_flow_all WHERE finishTime IS NOT NULL and businessVisible=0
LEFT JOIN (SELECT category,COUNT(1) cnt FROM vw_flow_all WHERE finishTime IS NOT NULL
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -168,7 +168,7 @@
</if>
GROUP BY category) b ON a.dict_value=b.category
LEFT JOIN (SELECT category,COUNT(1) cnt FROM vw_flow_all WHERE finishTime IS NULL and businessVisible=0 and taskName!='提交申请'
LEFT JOIN (SELECT category,COUNT(1) cnt FROM vw_flow_all WHERE finishTime IS NULL and taskName!='提交申请'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -184,7 +184,7 @@
<select id="groupByUnit" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
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 '总包%'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -195,7 +195,7 @@
</foreach>
</if>
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 '监理%'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -206,7 +206,7 @@
</foreach>
</if>
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 '设计%'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -217,7 +217,7 @@
</foreach>
</if>
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 '甲方%'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -228,7 +228,7 @@
</foreach>
</if>
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 '工程%'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -244,7 +244,7 @@
<select id="groupByUnitFinish" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
SELECT cat taskName, COUNT(1) assigneeId FROM (
SELECT *,'总包单位' cat FROM vw_flow_all WHERE taskName LIKE '总包%' AND taskName!='提交申请' and finishTime IS not NULL and businessVisible=0
SELECT *,'总包单位' cat FROM vw_flow_all WHERE taskName LIKE '总包%' AND taskName!='提交申请' and finishTime IS not NULL
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -255,7 +255,7 @@
</foreach>
</if>
UNION
SELECT *,'监理单位' cat FROM vw_flow_all WHERE taskName LIKE '监理%' AND taskName!='提交申请' and finishTime IS not NULL and businessVisible=0
SELECT *,'监理单位' cat FROM vw_flow_all WHERE taskName LIKE '监理%' AND taskName!='提交申请' and finishTime IS not NULL
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -266,7 +266,7 @@
</foreach>
</if>
UNION
SELECT *,'设计单位' cat FROM vw_flow_all WHERE taskName LIKE '设计%' AND taskName!='提交申请' and finishTime IS not NULL and businessVisible=0
SELECT *,'设计单位' cat FROM vw_flow_all WHERE taskName LIKE '设计%' AND taskName!='提交申请' and finishTime IS not NULL
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -277,7 +277,7 @@
</foreach>
</if>
UNION
SELECT *,'甲方代表' cat FROM vw_flow_all WHERE taskName LIKE '甲方%' AND taskName!='提交申请' and finishTime IS not NULL and businessVisible=0
SELECT *,'甲方代表' cat FROM vw_flow_all WHERE taskName LIKE '甲方%' AND taskName!='提交申请' and finishTime IS not NULL
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -288,7 +288,7 @@
</foreach>
</if>
UNION
SELECT *,'子公司' cat FROM vw_flow_all WHERE taskName LIKE '工程%' AND taskName!='提交申请' and finishTime IS not NULL and businessVisible=0
SELECT *,'子公司' cat FROM vw_flow_all WHERE taskName LIKE '工程%' AND taskName!='提交申请' and finishTime IS not NULL
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -304,7 +304,7 @@
<select id="groupByUnitTotal" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
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!='提交申请'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -315,7 +315,7 @@
</foreach>
</if>
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!='提交申请'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -326,7 +326,7 @@
</foreach>
</if>
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!='提交申请'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -337,7 +337,7 @@
</foreach>
</if>
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!='提交申请'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -348,7 +348,7 @@
</foreach>
</if>
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!='提交申请'
<if test="projectDeptId !=null and projectDeptId!=''">and businessDeptId=#{projectDeptId}</if>
<if test="businessKey !=null and businessKey!=''">and businessKey=#{businessKey}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -365,7 +365,6 @@
<select id="listByCategory" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
SELECT * FROM vw_flow_all
<where>
businessVisible=0
<if test="category != null and category != ''"> and category = #{category}</if>
<if test="deptId !=null and deptId>0">and businessDeptId=#{deptId}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
@ -380,7 +379,7 @@
</select>
<select id="listByUnit" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
SELECT * FROM vw_flow_all WHERE finishTime IS NULL and businessVisible=0
SELECT * FROM vw_flow_all WHERE finishTime IS NULL
<if test="taskId!=null">
<if test="taskId==1"> AND taskName LIKE '总包%' </if>
<if test="taskId==2"> AND taskName LIKE '监理%' </if>
@ -402,7 +401,6 @@
<select id="listByState" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
SELECT * FROM vw_flow_all
<where>
businessVisible=0
<if test="taskId!=null">
<if test="taskId==1"> AND taskName!='提交申请' </if>
<if test="taskId==2"> AND finishTime IS NULL AND taskName!='提交申请' </if>
@ -422,7 +420,7 @@
<select id="groupByProject" resultType="com.ruoyi.system.domain.FlowTaskEntity" parameterType="long">
SELECT a.businessKey,a.cnt duration ,b.projectName businessKeyName FROM (
SELECT businessKey,COUNT(1) cnt FROM vw_flow_all WHERE taskName!='提交申请' and businessVisible=0
SELECT businessKey,COUNT(1) cnt FROM vw_flow_all WHERE taskName!='提交申请'
<if test="deptId !=null and deptId>0">and businessDeptId=#{deptId}</if>
<if test="proType != null and proType != ''"> and businessType = #{proType}</if>
GROUP BY businessKey ) a,sur_project b WHERE a.businessKey=b.id
@ -454,7 +452,6 @@
FROM
vw_flow_all fa
<where>
businessVisible=0
<if test="proType != null and proType != ''"> and fa.businessType = #{proType}</if>
<if test="procDefKey != null and procDefKey != ''"> and fa.procDefKey = #{procDefKey}</if>
<if test="businessKey != null and businessKey != ''"> and fa.businessKey = #{businessKey}</if>

3
ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml
View File

@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join act_re_procdef_role rpr on rp.key_ = rpr.PROCDEF_KEY_
left join sys_role sr on sr.role_id = rpr.ROLE_ID_
<where>
rp.SUSPENSION_STATE_ = 1
<if test="roleId != null and roleId != ''">
and rpr.ROLE_ID_ = #{roleId}
</if>
@ -62,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user_role sur on sur.role_id = rpr.ROLE_ID_
left join sys_user su on su.user_id = sur.user_id
<where>
su.user_name = #{username}
rp.SUSPENSION_STATE_ = 1 and su.user_name = #{username}
<if test="name != null and name != ''">
and rd.name_ like concat('%', #{name}, '%')
</if>

4
ruoyi-ui/src/views/device/towerProjectConfig/index.vue
View File

@ -104,6 +104,7 @@
<dict-tag :options="dict.type.device_tower_type" :value="scope.row.towerType"/>
</template>
</el-table-column>
<el-table-column label="设备厂商" align="center" prop="deviceSource" />
<el-table-column label="塔机坐标x" align="center" prop="coordinateX" />
<el-table-column label="塔机坐标y" align="center" prop="coordinateY" />
<el-table-column label="前臂长度" align="center" prop="frontBrachium" />
@ -218,6 +219,9 @@
<el-form-item label="设备序列号" prop="deviceSn">
<el-input v-model="form.deviceSn" placeholder="请输入设备序列号" />
</el-form-item>
<el-form-item label="设备厂商" prop="deviceSource">
<el-input v-model="form.deviceSource" placeholder="请输入设备厂商" />
</el-form-item>
<el-form-item label="塔机司机" prop="driName">
<el-input v-model="form.driName" placeholder="请输入塔机司机" />
</el-form-item>

14
ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
View File

@ -172,11 +172,23 @@
show-icon
/>
<el-alert
v-if="options.procDefKey=='flow_spl_spb' || options.procDefKey=='flow_spl_spb_cope'"
v-if="options.procDefKey=='flow_cxjzll_fyspbsb' || options.procDefKey=='flow_cxjzll_fyspbsb_cope'"
title="费用索赔申请表、费用索赔审批表等。"
type="warning"
show-icon
/>
<el-alert
v-if="options.procDefKey=='flow_cxjzll_fb_zfbgczlysjl' || options.procDefKey=='flow_cxjzll_fb_zfbgczlysjl_cope'"
title="各方会签表、验收记录等。"
type="warning"
show-icon
/>
<el-alert
v-if="options.procDefKey=='flow_cxjzll_dwgczljgysjl' || options.procDefKey=='flow_cxjzll_fb_zfbgczlysjl_cope'"
title="各方会签表、验收记录等。"
type="warning"
show-icon
/>
</el-form-item>
<el-form-item label="申请说明" prop="remark">
<el-input

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

@ -1,6 +1,12 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="流程名称" prop="procDefName">
<el-input
v-model="queryParams.procDefName"
@ -11,20 +17,20 @@
/>
</el-form-item>
<el-form-item label="所属项目" prop="businessKey" v-if="showPro">
<el-select
v-model="queryParams.businessKey"
placeholder="请选择所属项目"
filterable
clearable
<el-select
v-model="queryParams.businessKey"
placeholder="请选择所属项目"
filterable
clearable
>
<el-option
v-for="(item, index) in projectOptions"
:key="index"
:label="item.projectName"
:value="item.id"
>
<el-option
v-for="(item, index) in projectOptions"
:key="index"
:label="item.projectName"
:value="item.id"
>
</el-option>
</el-select>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="流程类型" prop="category">
<el-select
@ -53,7 +59,9 @@
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -67,7 +75,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:deployment:add']"
>新增流程</el-button>
>新增流程</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@ -86,13 +95,36 @@
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.await" name="await"></el-tab-pane>
<el-tab-pane :label="tabs.finished" name="finished"></el-tab-pane>
</el-tabs>
<el-table v-loading="loading" :data="myProcessList" @selection-change="handleSelectionChange" stripe>
</el-tabs>
<el-table
v-loading="loading"
:data="myProcessList"
@selection-change="handleSelectionChange"
stripe
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目名称" align="center" prop="businessKeyName" width="160" :show-overflow-tooltip="true"/>
<el-table-column label="申请编号" align="center" prop="procInsId" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="流程名称" align="center" prop="procDefName" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="流程类别" align="center" prop="category" >
<el-table-column
label="项目名称"
align="center"
prop="businessKeyName"
width="160"
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请编号"
align="center"
prop="procInsId"
width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
label="流程名称"
align="center"
prop="procDefName"
width="120"
:show-overflow-tooltip="true"
/>
<el-table-column label="流程类别" align="center" prop="category">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_process_category"
@ -102,15 +134,25 @@
</el-table-column>
<el-table-column label="流程版本" align="center" width="80">
<template slot-scope="scope">
<el-tag size="medium" >v{{ scope.row.procDefVersion }}</el-tag>
<el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
</template>
</el-table-column>
<el-table-column label="提交时间" align="center" prop="createTime" width="180"/>
<el-table-column label="提交时间" align="center" prop="createTime" width="180" />
<el-table-column label="流程状态" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.finishTime == null" size="mini">进行中</el-tag>
<el-tag type="success" v-if="scope.row.finishTime != null && scope.row.assigneeId != null" size="mini">已完成</el-tag>
<el-tag type="danger" v-if="scope.row.finishTime != null && scope.row.assigneeId == null" size="mini">已终止</el-tag>
<el-tag
type="success"
v-if="scope.row.finishTime != null && scope.row.assigneeId != null"
size="mini"
>已完成</el-tag
>
<el-tag
type="danger"
v-if="scope.row.finishTime != null && scope.row.assigneeId == null"
size="mini"
>已终止</el-tag
>
</template>
</el-table-column>
<el-table-column label="当前节点" align="center" prop="taskName">
@ -121,26 +163,65 @@
</el-table-column>
<el-table-column label="处理耗时" align="center" prop="duration" width="150">
<template slot-scope="scope">
{{getDurationDate(scope.row)}}
{{ getDurationDate(scope.row) }}
</template>
</el-table-column>
<el-table-column label="办理人" align="center" width="200">
<template slot-scope="scope">
<label v-if="scope.row.assigneeName">{{scope.row.assigneeName}} <el-tag type="info" size="mini">{{scope.row.assigneeDeptName}}</el-tag></label>
<label v-if="scope.row.assigneeName"
>{{ scope.row.assigneeName }}
<el-tag type="info" size="mini">{{
scope.row.assigneeDeptName
}}</el-tag></label
>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center" fixed="right" class-name="small-padding fixed-width">
<el-table-column
label="操作"
width="200"
align="center"
fixed="right"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button v-if="getActivate(scope.row)" @click="handleActivate(scope.row)" type="text" size="small" icon="el-icon-edit-outline">处理</el-button>
<el-button @click="handleFlowRecord(scope.row)" type="text" size="small" icon="el-icon-finished">详情</el-button>
<el-button v-if="scope.row.finishTime == null" @click="handleStop(scope.row)" type="text" size="small" icon="el-icon-switch-button">终止</el-button>
<el-button v-if="scope.row.finishTime == null || superAdmin" @click="handleDelete(scope.row)" type="text" size="small" icon="el-icon-delete" v-hasPermi="['system:deployment:remove']">删除</el-button>
<el-button
v-if="getActivate(scope.row)"
@click="handleActivate(scope.row)"
type="text"
size="small"
icon="el-icon-edit-outline"
>处理</el-button
>
<el-button
@click="handleFlowRecord(scope.row)"
type="text"
size="small"
icon="el-icon-finished"
>详情</el-button
>
<el-button
v-if="scope.row.finishTime == null"
@click="handleStop(scope.row)"
type="text"
size="small"
icon="el-icon-switch-button"
>终止</el-button
>
<el-button
v-if="scope.row.finishTime == null || superAdmin"
@click="handleDelete(scope.row)"
type="text"
size="small"
icon="el-icon-delete"
v-hasPermi="['system:deployment:remove']"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -148,8 +229,21 @@
/>
<!-- 发起流程 -->
<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-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
v-model="queryProcessParams.name"
@ -160,53 +254,73 @@
/>
</el-form-item>
<el-form-item label="流程类型" prop="category">
<el-select
v-model="queryProcessParams.category"
@keyup.enter.native="handleProcessQuery"
placeholder="请选择流程类型"
clearable
>
<el-option
v-for="dict in dict.type.sys_process_category"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-select
v-model="queryProcessParams.category"
@keyup.enter.native="handleProcessQuery"
placeholder="请选择流程类型"
clearable
>
<el-option
v-for="dict in dict.type.sys_process_category"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleProcessQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetProcessQuery">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleProcessQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetProcessQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table v-loading="processLoading" fit :data="definitionList" border >
<el-table-column label="流程名称" align="center" prop="name" width="400" :show-overflow-tooltip="true"/>
<el-table v-loading="processLoading" fit :data="definitionList" border>
<el-table-column
label="流程名称"
align="center"
prop="name"
width="400"
:show-overflow-tooltip="true"
/>
<el-table-column label="流程版本" align="center">
<template slot-scope="scope">
<el-tag size="medium" >v{{ scope.row.version }}</el-tag>
<el-tag size="medium">v{{ scope.row.version }}</el-tag>
</template>
</el-table-column>
<el-table-column label="流程分类" align="center" prop="category">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_process_category"
:value="scope.row.category"
/>
</template>
<dict-tag
:options="dict.type.sys_process_category"
:value="scope.row.category"
/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
<el-table-column
label="操作"
align="center"
width="300"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit-outline"
@click="handleStartProcess(scope.row)"
>发起流程</el-button>
>发起流程</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="processTotal>0"
v-show="processTotal > 0"
:total="processTotal"
:page.sync="queryProcessParams.pageNum"
:limit.sync="queryProcessParams.pageSize"
@ -214,12 +328,21 @@
/>
</el-dialog>
<!-- 终止流程 -->
<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"
<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"
v-loading="stopLoading"
label-width="80px">
label-width="80px"
>
<el-form-item label="终止原因" prop="comment">
<el-input
type="textarea"
@ -235,9 +358,15 @@
</div>
</el-dialog>
<initTaskDrawer ref="initTaskDrawer" :closeCallBack="getList"></initTaskDrawer>
<initLeaveTaskDrawer ref="initLeaveTaskDrawer" :closeCallBack="getList"></initLeaveTaskDrawer>
<initLeaveTaskDrawer
ref="initLeaveTaskDrawer"
:closeCallBack="getList"
></initLeaveTaskDrawer>
<editTaskDrawer ref="editTaskDrawer" :closeCallBack="getList"></editTaskDrawer>
<editLeaveTaskDrawer ref="editLeaveTaskDrawer" :closeCallBack="getList"></editLeaveTaskDrawer>
<editLeaveTaskDrawer
ref="editLeaveTaskDrawer"
:closeCallBack="getList"
></editLeaveTaskDrawer>
<detailDrawer ref="detailDrawer"></detailDrawer>
<detailLeaveDrawer ref="detailLeaveDrawer"></detailLeaveDrawer>
</div>
@ -250,15 +379,15 @@ import {
addDeployment,
updateDeployment,
exportDeployment,
flowRecord
flowRecord,
} from "@/api/flowable/finished";
import { myProcessList,stopProcess } from "@/api/flowable/process";
import {allList,queryCount} from "@/api/flowable/businessKey";
import {myDefinitionList} from "@/api/flowable/definition";
import { myProcessList, stopProcess } from "@/api/flowable/process";
import { allList, queryCount } from "@/api/flowable/businessKey";
import { myDefinitionList } from "@/api/flowable/definition";
import initTaskDrawer from "./initTaskDrawer.vue";
import initLeaveTaskDrawer from './initLeaveTaskDrawer.vue'
import initLeaveTaskDrawer from "./initLeaveTaskDrawer.vue";
import editTaskDrawer from "./editTaskDrawer.vue";
import editLeaveTaskDrawer from './editLeaveTaskDrawer.vue'
import editLeaveTaskDrawer from "./editLeaveTaskDrawer.vue";
import detailDrawer from "./detail/detailDrawer.vue";
import detailLeaveDrawer from "./detail/detailLeaveDrawer.vue";
export default {
@ -269,7 +398,7 @@ export default {
detailDrawer,
detailLeaveDrawer,
editTaskDrawer,
editLeaveTaskDrawer
editLeaveTaskDrawer,
},
dicts: ["sys_process_category"],
data() {
@ -288,16 +417,16 @@ export default {
showSearch: true,
// 总条数
total: 0,
processTotal:0,
processTotal: 0,
// 我发起的流程列表数据
myProcessList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
stopOpen:false,
stopOpen: false,
src: "",
definitionList:[],
definitionList: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -305,8 +434,8 @@ export default {
procDefName: null,
category: null,
params: null,
businessKey:null,
activeName:null,
businessKey: null,
activeName: null,
},
// 查询参数
queryProcessParams: {
@ -320,7 +449,7 @@ export default {
derivedFrom: null,
derivedFromRoot: null,
parentDeploymentId: null,
engineVersion: null
engineVersion: null,
},
// 表单参数
form: {},
@ -335,21 +464,22 @@ export default {
},
],
},
daterangeCheckTime:[],
tabs:{
all:"全部申请（0）",
await:"进行中（0）",
finished:"已完成（0）",
daterangeCheckTime: [],
tabs: {
all: "全部申请（0）",
await: "进行中（0）",
finished: "已完成（0）",
},
activeName:"await",
showPro:false,
activeName: "await",
showPro: false,
projectOptions: null,
superAdmin:false,
superAdmin: false,
};
},
created() {
if(this.$store.getters.userId==1){
this.superAdmin=true;
let myMinRoles = this.$store.getters.roles;
if (myMinRoles.includes("admin") || myMinRoles.includes("super")) {
this.superAdmin = true;
}
this.queryParams.activeName = this.activeName;
this.getList();
@ -365,18 +495,21 @@ export default {
this.queryParams.params["endDate"] = this.daterangeCheckTime[1];
}
this.queryCount(this.queryParams);
allList(this.queryParams).then(response => {
allList(this.queryParams).then((response) => {
this.myProcessList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 统计 */
queryCount(params){
queryCount(params).then(response => {
this.tabs.await = "进行中（"+response.data.await+"）";
this.tabs.finished = "已完成（"+response.data.finished+"）";
this.tabs.all = "全部申请（"+(parseInt(response.data.await)+parseInt(response.data.finished))+"）";
queryCount(params) {
queryCount(params).then((response) => {
this.tabs.await = "进行中（" + response.data.await + "）";
this.tabs.finished = "已完成（" + response.data.finished + "）";
this.tabs.all =
"全部申请（" +
(parseInt(response.data.await) + parseInt(response.data.finished)) +
"）";
});
},
// 查询和我相关的项目信息
@ -407,7 +540,7 @@ export default {
derivedFrom: null,
derivedFromRoot: null,
parentDeploymentId: null,
engineVersion: null
engineVersion: null,
};
this.resetForm("form");
},
@ -419,7 +552,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.daterangeCheckTime=[];
this.daterangeCheckTime = [];
this.handleQuery();
},
/** 搜索按钮操作 */
@ -434,9 +567,9 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.procInsId)
this.single = selection.length!==1
this.multiple = !selection.length
this.ids = selection.map((item) => item.procInsId);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
@ -444,19 +577,19 @@ export default {
this.title = "发起流程";
this.myDefinitionList();
},
myDefinitionList(){
myDefinitionList(this.queryProcessParams).then(response => {
myDefinitionList() {
myDefinitionList(this.queryProcessParams).then((response) => {
this.definitionList = response.data.records;
this.processTotal = response.data.total;
this.processLoading = false;
});
},
/** 发起流程申请 */
handleStartProcess(row){
handleStartProcess(row) {
this.open = false;
if(row.flowKey=="flow_xmglzdl_qjspb"){
if (row.flowKey == "flow_xmglzdl_qjspb") {
this.$refs.initLeaveTaskDrawer.show(row);
}else{
} else {
this.$refs.initTaskDrawer.show(row);
}
// this.$router.push({ path: '/flowable/task/myProcess/send/index',
@ -467,51 +600,54 @@ export default {
// })
},
/** 继续办理 */
handleActivate(row){
if(row.procDefKey=="flow_xmglzdl_qjspb"){
handleActivate(row) {
if (row.procDefKey == "flow_xmglzdl_qjspb") {
this.$refs.editLeaveTaskDrawer.show(row);
}else{
} else {
this.$refs.editTaskDrawer.show(row);
}
},
/** 判断是否继续办理 */
getActivate(row){
if(row.taskName=="提交申请" && row.assigneeId==this.$store.getters.userId){
getActivate(row) {
if (row.taskName == "提交申请" && row.assigneeId == this.$store.getters.userId) {
return true;
}else{
} else {
return false;
}
},
/** 取消流程申请 */
handleStop(row){
handleStop(row) {
this.form.taskId = row.taskId;
this.form.userId = this.$store.getters.userId
this.form.userId = this.$store.getters.userId;
this.form.instanceId = row.procInsId;
this.stopOpen = true;
},
/** 取消流程申请 */
handleStopClick(){
handleStopClick() {
let that = this;
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
this.$modal.confirm('是否终止当前流程申请？').then(function() {
that.stopLoading = true;
return stopProcess(that.form);
}).then(res => {
that.$modal.msgSuccess(res.msg);
that.stopLoading=false;
that.stopOpen = false;
that.getList();
});
this.$modal
.confirm("是否终止当前流程申请？")
.then(function () {
that.stopLoading = true;
return stopProcess(that.form);
})
.then((res) => {
that.$modal.msgSuccess(res.msg);
that.stopLoading = false;
that.stopOpen = false;
that.getList();
});
}
});
},
/** 流程流转记录 */
handleFlowRecord(row){
handleFlowRecord(row) {
//根据不同业务跳转不同表单
if(row.procDefKey=="flow_xmglzdl_qjspb"){
if (row.procDefKey == "flow_xmglzdl_qjspb") {
this.$refs.detailLeaveDrawer.show(row);
}else{
} else {
this.$refs.detailDrawer.show(row);
}
// this.$router.push({ path: '/flowable/task/myProcess/detail/index',
@ -524,8 +660,8 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getDeployment(id).then(response => {
const id = row.id || this.ids;
getDeployment(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改流程定义";
@ -533,17 +669,17 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateDeployment(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
updateDeployment(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addDeployment(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
addDeployment(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
@ -553,73 +689,80 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.procInsId || this.ids;// 暂不支持删除多个流程
this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?删除后数据将不可找回！！', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.loading = true;
return delDeployment(ids);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
})
const ids = row.procInsId || this.ids; // 暂不支持删除多个流程
this.$confirm(
'是否确认删除流程定义编号为"' + ids + '"的数据项?删除后数据将不可找回！！',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(() => {
this.loading = true;
return delDeployment(ids);
})
.then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有流程定义数据项?', "警告", {
this.$confirm("是否确认导出所有流程定义数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
return exportDeployment(queryParams);
}).then(response => {
this.download(response.msg);
type: "warning",
})
.then(() => {
return exportDeployment(queryParams);
})
.then((response) => {
this.download(response.msg);
});
},
// 页签点击
handleClick() {
this.queryParams.activeName = this.activeName;
this.getList();
},
getDurationDate(row){
let day=0;
let hours=0;
let min = row.duration;
if(min>1440){
day = parseInt(min/1440);
min = min % 1440;
if(min>60){
hours = parseInt(min/60);
min = min % 60;
}
}else if(min>60){
hours = parseInt(min/60);
getDurationDate(row) {
let day = 0;
let hours = 0;
let min = row.duration;
if (min > 1440) {
day = parseInt(min / 1440);
min = min % 1440;
if (min > 60) {
hours = parseInt(min / 60);
min = min % 60;
}
} else if (min > 60) {
hours = parseInt(min / 60);
min = min % 60;
}
if(day>0){
if(day<10) day="0"+day;
if(hours<10) hours="0"+hours;
if(min<10) min="0"+min;
return day+"天"+hours+"小时"+min+"分钟";
if (day > 0) {
if (day < 10) day = "0" + day;
if (hours < 10) hours = "0" + hours;
if (min < 10) min = "0" + min;
return day + "天" + hours + "小时" + min + "分钟";
}
if(hours>0){
if(hours<10) hours="0"+hours;
if(min<10) min="0"+min;
return hours+"小时"+min+"分钟";
if (hours > 0) {
if (hours < 10) hours = "0" + hours;
if (min < 10) min = "0" + min;
return hours + "小时" + min + "分钟";
}
if(min>0){
if(min<10) min="0"+min;
return min+"分钟";
if (min > 0) {
if (min < 10) min = "0" + min;
return min + "分钟";
}
if(min==0){
if (min == 0) {
return "1分钟";
}
},
}
},
};
</script>

8
ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
View File

@ -166,11 +166,17 @@
show-icon
/>
<el-alert
v-if="options.flowKey=='flow_spl_spb' || options.flowKey=='flow_spl_spb_cope'"
v-if="options.flowKey=='flow_cxjzll_fyspbsb' || options.flowKey=='flow_cxjzll_fyspbsb_cope'"
title="费用索赔申请表、费用索赔审批表等。"
type="warning"
show-icon
/>
<el-alert
v-if="options.flowKey=='flow_cxjzll_fb_zfbgczlysjl' || options.flowKey=='flow_cxjzll_fb_zfbgczlysjl_cope'"
title="各方会签表、验收记录等。"
type="warning"
show-icon
/>
</el-form-item>
<el-form-item label="申请说明" prop="remark">
<el-input

38
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/TowerCraneController.java
View File

@ -6,6 +6,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.PublicStateEnum;
import com.yanzhu.jh.device.domain.DevTowerDataLimit;
import com.yanzhu.jh.device.domain.DevTowerDataRun;
import com.yanzhu.jh.device.domain.DevTowerProjectConfig;
import com.yanzhu.jh.device.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@ -51,8 +53,8 @@ public class TowerCraneController extends BaseController {
/**
* 查询塔基配置列表
*/
@GetMapping("/findtowerConfigGroupOnline")
public AjaxResult findtowerConfigGroupOnline(String deptId, String projectId)
@GetMapping("/findTowerConfigGroupOnline")
public AjaxResult findTowerConfigGroupOnline(String deptId, String projectId)
{
String key = "bgscreen.tower.findtowerConfigGroupOnline."+projectId;
Object obj=redisCache.getCacheObject(key);
@ -69,8 +71,8 @@ public class TowerCraneController extends BaseController {
/**
* 查询塔基配置列表
*/
@GetMapping("/findtowerConfigListByProjectId")
public AjaxResult findtowerConfigListByProjectId(String deptId, String projectId)
@GetMapping("/findTowerConfigListByProjectId")
public AjaxResult findTowerConfigListByProjectId(String deptId, String projectId)
{
String key = "bgscreen.tower.findtowerConfigListByProjectId."+projectId;
Object obj=redisCache.getCacheObject(key);
@ -86,10 +88,10 @@ public class TowerCraneController extends BaseController {
}
/**
* 查询塔基运行数据
* 查询塔基运行统计
*/
@GetMapping("/findtowerStatisticsView")
public AjaxResult findtowerStatisticsView(String deviceSn)
@GetMapping("/findTowerStatisticsView")
public AjaxResult findTowerStatisticsView(String deviceSn)
{
String key = "bgscreen.tower.findtowerStatisticsView."+deviceSn;
Object obj=redisCache.getCacheObject(key);
@ -100,4 +102,26 @@ public class TowerCraneController extends BaseController {
redisCache.setCacheObject(key, data, Constants.BIGSCREEN_QUERY_CACHE*5, TimeUnit.MINUTES);
return success(data);
}
/**
* 查询塔基限位数据
*/
@GetMapping("/selectDevTowerDataLimitList")
public AjaxResult selectDevTowerDataLimitList(DevTowerDataLimit devTowerDataLimit)
{
startPage();
List<DevTowerDataLimit> list = devTowerDataLimitService.selectDevTowerDataLimitList(devTowerDataLimit);
return success(list);
}
/**
* 查询塔基实时数据
*/
@GetMapping("/selectDevTowerDataRunList")
public AjaxResult selectDevTowerDataRunList(DevTowerDataRun devTowerDataRun)
{
startPage();
List<DevTowerDataRun> list = devTowerDataRunService.selectDevTowerDataRunList(devTowerDataRun);
return success(list);
}
}

2
yanzhu-deviceApi/src/main/java/com/ruoyi/api/TowerCraneApiController.java
View File

@ -1,6 +1,5 @@
package com.ruoyi.api;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.annotation.RateLimiter;
import com.ruoyi.common.constant.CacheConstants;
@ -72,7 +71,6 @@ public class TowerCraneApiController {
@RateLimiter(count = 10, limitType = LimitType.IP)
@PostMapping("/v1/push")
public AjaxResult pushData(@Validated @RequestBody TowerReqVo req) {
log.info("towerCrane==>{}", JSON.toJSONString(req));
DevTowerProjectConfig config = redisCache.getCacheObject(CacheConstants.YANZHU_DEVICE_TOWER+req.getContent().getDeviceKey());
if(config==null){
throw new ServiceException(HttpStatusEnum.DARA_EXCEPTION.getInfo(),HttpStatusEnum.DARA_EXCEPTION.getCode());

2
yanzhu-deviceApi/src/main/java/com/ruoyi/emuns/TowerTypeEnums.java
View File

@ -7,7 +7,7 @@ public enum TowerTypeEnums {
BASE(118,"塔机上报基本信息"),
RUN(111,"塔机上报实时数据"),
ROUND(111,"塔机上报工作循环数据"),
ROUND(119,"塔机上报工作循环数据"),
COLLIDE(116,"塔机上报碰撞信息"),
LIMIT(120,"塔机上报限位信息"),
LOCAL(121,"塔机上报标定位信息");

9
yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/DevTowerDataCollideMapper.java
View File

@ -3,6 +3,7 @@ package com.yanzhu.jh.device.mapper;
import java.util.List;
import com.yanzhu.jh.device.domain.DevTowerDataCollide;
import com.yanzhu.jh.device.domain.DevTowerDataCollideDetail;
import com.yanzhu.jh.device.domain.DevTowerDataRound;
/**
* 塔机碰撞信息Mapper接口
@ -84,4 +85,12 @@ public interface DevTowerDataCollideMapper
* @return 结果
*/
public int deleteDevTowerDataCollideDetailByCollideId(Long id);
/**
* 查询塔机碰撞数据
*
* @param DevTowerDataRound 设备循环信息
* @return 结果
*/
public int findCollideCountByDeviceKey(DevTowerDataRound DevTowerDataRound);
}

20
yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/DevTowerDataRunServiceImpl.java
View File

@ -5,13 +5,14 @@ import java.util.*;
import com.ruoyi.common.utils.DateUtils;
import com.yanzhu.jh.device.domain.DevTowerDataRound;
import com.yanzhu.jh.device.mapper.DevTowerDataCollideMapper;
import com.yanzhu.jh.device.mapper.DevTowerDataRoundMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yanzhu.jh.device.mapper.DevTowerDataRunMapper;
import com.yanzhu.jh.device.domain.DevTowerDataRun;
import com.yanzhu.jh.device.service.IDevTowerDataRunService;
import com.ruoyi.common.utils.SecurityUtils;
/**
* 塔机实时数据Service业务层处理
*
@ -27,6 +28,9 @@ public class DevTowerDataRunServiceImpl implements IDevTowerDataRunService
@Autowired
private DevTowerDataRoundMapper devTowerDataRoundMapper;
@Autowired
private DevTowerDataCollideMapper devTowerDataCollideMapper;
/**
* 查询塔机实时数据
*
@ -118,9 +122,10 @@ public class DevTowerDataRunServiceImpl implements IDevTowerDataRunService
int b0 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
dataMap.put("b0",b0);
devTowerDataRound.setActiveName("gj");
int c0 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
int d0 = devTowerDataRunMapper.findRunCountByDeviceKey(devTowerDataRound);
dataMap.put("c0",c0+d0);
int c0 = devTowerDataRunMapper.findRunCountByDeviceKey(devTowerDataRound);
//int d0 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
//int e0 = devTowerDataCollideMapper.findCollideCountByDeviceKey(devTowerDataRound);
dataMap.put("c0",c0);
Calendar cale = Calendar.getInstance();
// 获取当月第一天和最后一天
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@ -146,9 +151,10 @@ public class DevTowerDataRunServiceImpl implements IDevTowerDataRunService
int b1 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
dataMap.put("b1",b1);
devTowerDataRound.setActiveName("gj");
int c1 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
int d1 = devTowerDataRunMapper.findRunCountByDeviceKey(devTowerDataRound);
dataMap.put("c1",c1+d1);
int c1 = devTowerDataRunMapper.findRunCountByDeviceKey(devTowerDataRound);
//int d1 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
//int e1 = devTowerDataCollideMapper.findCollideCountByDeviceKey(devTowerDataRound);
dataMap.put("c1",c1);
return dataMap;
}

9
yanzhu-jh/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
View File

@ -198,4 +198,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( #{item.id}, #{item.collideId}, #{item.deviceKey}, #{item.deviceSource}, #{item.towerId}, #{item.coordinateX}, #{item.coordinateY}, #{item.frontBrachium}, #{item.afterBrachium}, #{item.towerBodyHeight}, #{item.height}, #{item.angle}, #{item.range}, #{item.collideHorizontalDistance}, #{item.collideVerticalDistance}, #{item.collideState})
</foreach>
</insert>
<select id="findCollideCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
select count(1) as total from dev_tower_data_collide
<where>
<if test="deviceKey != null and deviceKey != ''">and cfg_id = (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
</mapper>

1
yanzhu-jh/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
View File

@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptName != null and deptName != ''"> and dtdc.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{deptName}, '%'))</if>
<if test="deviceKey != null and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
<if test="deviceSource != null and deviceSource != ''"> and dtdr.device_source = #{deviceSource}</if>
<if test="warnings != null and warnings != ''"> and dtdr.warnings is not null </if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and dtdr.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
order by dtdr.id desc

4
yanzhu-jh/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
View File

@ -139,6 +139,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="towerCapHeight != null">tower_cap_height = #{towerCapHeight},</if>
<if test="towerSectionHeight != null">tower_section_height = #{towerSectionHeight},</if>
<if test="online != null">online = #{online},</if>
<if test="driName != null">dri_name = #{driName},</if>
<if test="driPhone != null">dri_phone = #{driPhone},</if>
<if test="safName != null">saf_name = #{safName},</if>
<if test="safPhone != null">saf_phone = #{safPhone},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>

4
yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml
View File

@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
</where>
) 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
<if test="year != null "> and year = #{year}</if>
<if test="quarterly != null "> and quarterly = #{quarterly}</if>
@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="queryByProjectType" parameterType="SmzProjectQuarterlyAssess" resultMap="SmzProjectQuarterlyAssessResultToProject">
SELECT p.id, p.projectName,p.projectSchedule,a.plan_target
FROM sur_project p LEFT JOIN smz_project_quarterly_assess a ON a.project_id=p.id
WHERE p.projecttype=#{id} AND a.year=#{year} AND a.quarterly=#{quarterly} AND p.isdel=0 and p.progressVisible=0
WHERE p.projecttype=#{id} AND a.year=#{year} AND a.quarterly=#{quarterly} AND p.isdel=0
<if test="deptId>0">and p.deptId=#{deptId}</if>
<if test='proType != null and proType != "" and proType != "0"'> and p.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0">

10
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
View File

@ -401,7 +401,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g,
sur_project sp
where u.cfgid=c.id and u.companyId=g.companyId and u.state=#{id} and c.project_id = sp.id
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
and g.companyTypeId in (0,1,2,3,4,5,6,8)
<if test="projectId!=null and projectId>0">
and c.project_id=#{projectId}
@ -453,7 +453,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="todayAttendance" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
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
<if test="projectId!=null and projectId>0">
and ady.projectId=#{projectId}
</if>
@ -505,13 +505,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId!=null and projectId>0">
and projectId=#{projectId}
</if>
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
<if test="deptId!=null and deptId>0">
and sp.deptId=#{deptId}
</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ady.attendance_time) =date(#{attendanceTime})</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0">
and ady.projectId in
@ -521,8 +519,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
)
)
group by ady.companyTypeId
</select>

4
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
View File

@ -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)
<if test="deptId!=null and deptId>0">
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
<if test="id==101">
and g.companyTypeId in (1,6)
</if>

8
yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
View File

@ -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
<if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if>
<if test="id!=null and id!=0">and sp.deptId=#{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -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
<if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if>
<if test="id!=null and id!=0">and sp.deptId=#{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -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
<if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if>
<if test="id!=null and id!=0">and sp.deptId=#{id}</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
@ -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
<if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if>
<if test="id!=null and id!=0">and sp.deptId=#{id}</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>

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

@ -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
<if test='checkType !=null and checkType !="0"'>
and spcd.check_type= #{checkType}
</if>
@ -318,7 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getList" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult">
<include refid="selectSurProjectCheckDetectionVo"/>
WHERE spcd.is_del=0 and sp.isDel=0 and sp.progressVisible=0
WHERE spcd.is_del=0 and sp.isDel=0
<if test="detectionResult==1">and spcd.detection_result=1</if>
<if test="detectionResult==0">and spcd.detection_result &lt;&gt; 1</if>
<if test="checkType!=null and checkType>0">and spcd.check_type= #{checkType}</if>
@ -341,7 +341,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT spcd.check_type id,count(1) project_id
FROM sur_project_check_detection spcd
LEFT JOIN sur_project sp ON spcd.project_id = sp.id
where spcd.is_del=0 and sp.isDel=0 and sp.progressVisible=0
where spcd.is_del=0 and sp.isDel=0
<if test="deptId !=null and deptId > 0 ">
and sp.deptId=#{deptId}
</if>

20
yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml
View File

@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT 10 cost_type , SUM(spco.money) money FROM sur_project_cost_output spco
left join sur_project sp on sp.id = spco.project_id
WHERE spco.cost_type=9 AND (spco.YEAR &lt;#{year} or ( spco.Year =#{year} and spco.MONTH &lt;= #{month})) and sp.isDel=0 and sp.progressVisible=0
WHERE spco.cost_type=9 AND (spco.YEAR &lt;#{year} or ( spco.Year =#{year} and spco.MONTH &lt;= #{month})) and sp.isDel=0
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectId!=null and projectId>0">
@ -146,7 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT 2 cost_type , SUM(spco.money) money FROM sur_project_cost_output spco
left join sur_project sp on sp.id = spco.project_id
WHERE (spco.cost_type=9 AND spco.YEAR=#{year} AND spco.MONTH &lt;= #{month} )
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectId!=null and projectId>0">
@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT 9 cost_type , SUM(spco.money) money FROM sur_project_cost_output spco
left join sur_project sp on sp.id = spco.project_id
WHERE (spco.cost_type=9 AND spco.YEAR=#{year} AND spco.MONTH= #{month} )
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectId!=null and projectId>0">
@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select 1 cost_type,sum(money) money,'合同总金额' remark
from sur_project_cost_output a,sur_project sp
where a.project_id=sp.id and a.cost_type=3
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectId!=null and projectId>0">
@ -189,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT 2 cost_type,SUM(money) money,'建安费总金额' remark
FROM sur_project_cost_output a,sur_project sp
WHERE a.project_id=sp.id AND a.cost_type=10
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectId!=null and projectId>0">
@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT 3 cost_type,SUM(money2) money,'总计付款' remark
FROM sur_project_cost_output a,sur_project sp
WHERE a.project_id=sp.id AND a.cost_type in (11,12)
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
<if test="createTime!=null "> and a.date1 &gt;= #{createTime}</if>
<if test="updateTime!=null "> and a.date1 &lt;= #{updateTime}</if>
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
@ -229,7 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT 4 cost_type,SUM(money2) money,'进度款已支付' remark
FROM sur_project_cost_output a,sur_project sp
WHERE a.project_id=sp.id AND a.cost_type in (11)
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
<if test="createTime!=null "> and a.date1 &gt;= #{createTime}</if>
<if test="updateTime!=null "> and a.date1 &lt;= #{updateTime}</if>
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
@ -249,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT 5 cost_type,SUM(money2) money,'安措费已支付' remark
FROM sur_project_cost_output a,sur_project sp
WHERE a.project_id=sp.id AND a.cost_type IN (12)
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
<if test="createTime!=null "> and a.date1 &gt;= #{createTime}</if>
<if test="updateTime!=null "> and a.date1 &lt;= #{updateTime}</if>
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
@ -268,7 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT 6 cost_type,SUM(money-money2) money,'挂账总金额' remark
FROM sur_project_cost_output a,sur_project sp
WHERE a.project_id=sp.id AND a.cost_type IN (11,12)
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
<if test="createTime!=null "> and a.date1 &gt;= #{createTime}</if>
<if test="updateTime!=null "> and a.date1 &lt;= #{updateTime}</if>
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
@ -288,7 +288,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT a.id, a.project_id, a.money, a.year, a.month, a.cost_type, CONCAT(sp.projectName,'(',sd.dept_name,')') remark, a.is_del, a.create_by, a.create_time, a.update_by, a.update_time,a.money2,a.date1,a.date2
FROM sur_project_cost_output a,sur_project sp,sys_dept sd
WHERE a.project_id=sp.id AND a.cost_type IN (11,12) AND sd.dept_id=a.deptid
and sp.isDel=0 and sp.progressVisible=0
and sp.isDel=0
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectId!=null and projectId>0">

4
yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml
View File

@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sur_project_dept_wroks spdw
left join sur_project sp on spdw.project_id=sp.id
<where>
and spdw.is_del=0 and sp.progressVisible=0 and sp.isDel=0
and spdw.is_del=0 and sp.isDel=0
<if test="projectId != null and projectId>0"> and spdw.project_id = #{projectId}</if>
<if test="deptId != null and deptId>0"> and sp.deptId = #{deptId}</if>
<if test="prjIds !=null and prjIds.size()>0">
@ -186,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sur_project_dept_wroks spdw
LEFT JOIN sur_project prj ON spdw.project_id=prj.id
LEFT JOIN sys_dept dept ON spdw.dept_id=dept.dept_id
WHERE spdw.is_del=0 and prj.progressVisible=0 and prj.isDel=0
WHERE spdw.is_del=0 and prj.isDel=0
<if test="projectId != null and projectId>0"> and spdw.project_id = #{projectId}</if>
<if test="deptId != null and deptId>0"> and spdw.dept_id = #{deptId}</if>
<if test="prjIds !=null and prjIds.size()>0">

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
View File

@ -366,7 +366,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT d.dict_value dept_name,d.dict_label projectName,p.projectSchedule ,COUNT(p.id) deptId FROM
(SELECT * FROM sys_dict_data WHERE dict_type='project_category') d
LEFT JOIN
(SELECT projectType,IF(projectSchedule IS NULL,1,projectSchedule) projectSchedule,id FROM sur_project
(SELECT projectType,IF(projectSchedule IS NULL,1,projectSchedule) projectSchedule,id FROM sur_project
WHERE isDel=0
<if test="deptId!=null and deptId>0">and deptid=#{deptId}</if>
<if test='proType != null and proType !=""'> and projectType = #{proType}</if>

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

@ -189,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select spme.*,sp.projectName, sd.dept_name from sur_project_material_seal spme
left join sur_project sp on spme.project_id = sp.id
left join sys_dept sd on sd.dept_id = spme.dept_id
where spme.is_del=0 and sp.isDel=0 and sp.progressVisible=0
where spme.is_del=0 and sp.isDel=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>
<if test='proType != null and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if>
@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select year(spms.seal_date) project_id, month(spms.seal_date) dept_id,count(1) id
from sur_project_material_seal spms
left join sur_project sp on spms.project_id = sp.id
where spms.is_del=0 and sp.isDel=0 and sp.progressVisible=0
where spms.is_del=0 and sp.isDel=0
<if test="deptId != null and deptId > 0"> and sp.deptId= #{deptId} </if>
<if test='proType != null and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if>
<if test="projectId != null and projectId > 0">and spms.project_id = #{projectId}</if>
@ -229,7 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM sys_dict_data WHERE dict_type='project_check_status' ) X LEFT JOIN (
SELECT a.approve_status,COUNT(1) cnt FROM sur_project_material_seal a, sys_dict_data b, sur_project sp
WHERE a.approve_status=b.dict_value AND b.dict_type='project_check_status'
and a.project_id=sp.id and sp.isDel=0 and sp.progressVisible=0
and a.project_id=sp.id and sp.isDel=0
<if test="deptId != null and deptId > 0"> and sp.deptId= #{deptId} </if>
<if test='proType != null and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if>
<if test="projectId != null and projectId > 0">and a.project_id = #{projectId}</if>
@ -247,7 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select spme.*,sp.projectName, sd.dept_name from sur_project_material_seal spme
left join sur_project sp on spme.project_id = sp.id
left join sys_dept sd on sd.dept_id = spme.dept_id
where spme.is_del=0 and sp.isDel=0 and sp.progressVisible=0
where spme.is_del=0 and sp.isDel=0
and spme.seal_date>=DATE_SUB(CURDATE(),interval 12 month)
<if test="deptId != null and deptId > 0"> and sp.deptId = #{deptId} </if>
<if test='proType != null and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if>
@ -268,7 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select spme.*,sp.projectName, sd.dept_name from sur_project_material_seal spme
left join sur_project sp on spme.project_id = sp.id
left join sys_dept sd on sd.dept_id = spme.dept_id
where spme.is_del=0 and sp.isDel=0 and sp.progressVisible=0
where spme.is_del=0 and sp.isDel=0
<if test="approveStatus==4">and spme.approve_status = 4</if>
<if test="approveStatus==0">and spme.approve_status &lt;&gt; 4</if>
<if test="deptId != null and deptId > 0"> and sp.deptId = #{deptId} </if>

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

@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT spm.measure_info,COUNT(1) cnt
FROM sur_project_measure spm
left join sur_project sp on sp.id = spm.project_id
WHERE spm.is_del=0 and sp.isDel=0 and sp.progressVisible=0
WHERE spm.is_del=0 and sp.isDel=0
<if test='measureType !=null and measureType !="0"'>
and spm.measure_type = #{measureType}
</if>
@ -224,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_dict_data sdd2 ON sdd2.dict_type = 'project_measure_info_type' AND sdd2.dict_value = spm.measure_info
LEFT JOIN sys_user u1 ON spm.create_by=u1.phonenumber
LEFT JOIN sys_user u2 ON spm.update_by=u2.phonenumber
WHERE spm.is_del=0 and sp.isDel=0 and sp.progressVisible=0
WHERE spm.is_del=0 and sp.isDel=0
<if test='measureType !=null and measureType !="0"'>
and spm.measure_type = #{measureType}
</if>
@ -248,7 +248,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT spm.measure_type id,count(1) project_id
FROM sur_project_measure spm
LEFT JOIN sur_project sp ON spm.project_id = sp.id
where spm.is_del=0 and sp.isDel=0 and sp.progressVisible=0
where spm.is_del=0 and sp.isDel=0
<if test="deptId !=null and deptId > 0 ">
and sp.deptId=#{deptId}
</if>

4
yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml
View File

@ -183,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE c.id IN (
SELECT MAX(spc.id) FROM sur_project_schedule spc
left join sur_project sp on spc.project_id = sp.id
where spc.is_del=0 and sp.projectType=#{prjType} and sp.isDel=0 and sp.progressVisible=0
where spc.is_del=0 and sp.projectType=#{prjType} and sp.isDel=0
<if test="deptId>0">and sp.deptId=#{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0">
@ -202,7 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select max(spc.id)
from sur_project_schedule spc
left join sur_project sp on sp.id=spc.project_id
where spc.is_del=0 and sp.isDel=0 and sp.progressVisible=0
where spc.is_del=0 and sp.isDel=0
<if test="deptId!=null and deptId>0">
and sp.deptId= #{deptId}
</if>

6
yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml
View File

@ -36,7 +36,6 @@
<where>
<if test="projectId != null "> and sps.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="activeName != null and activeName != ''"> and sp.progressVisible = 0</if>
<if test="deptId != null "> and sps.dept_id = #{deptId}</if>
<if test="standardDesc != null and standardDesc != ''"> and sps.standard_desc like concat('%', #{standardDesc}, '%')</if>
<if test="standardType != null and standardType != ''"> and sps.standard_type like concat('', #{standardType}, '%')</if>
@ -122,7 +121,7 @@
<select id="groupByType" parameterType="SurProjectStandard" resultMap="com.ruoyi.system.mapper.SysDictDataMapper.SysDictDataResult">
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
<if test="projectId!=null and projectId>0"> and a.project_id=#{projectId}</if>
<if test="deptId!=null and deptId>0">
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
</select>
@ -155,7 +154,6 @@
and sp.deptId= #{deptId}
</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="activeName != null and activeName != ''"> and sp.progressVisible = 0</if>
<if test="prjIds !=null and prjIds.size()>0">
and sps.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">

12
yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml
View File

@ -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
<where>
and spwp.is_del=0 and sp.isDel=0 and sp.progressVisible=0
and spwp.is_del=0 and sp.isDel=0
<if test="projectId != null "> and spwp.project_id = #{projectId}</if>
<if test="deptId != null "> and spwp.dept_id = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -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
<where>
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) <![CDATA[ <= ]]> date(NOW())
<if test="projectId != null "> and spwp.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -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
<where>
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) <![CDATA[ > ]]> date(NOW())
<if test="projectId != null "> and spwp.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -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
<if test="nowDept != null and nowDept != ''"> and sp1.deptId = #{nowDept}</if>
<if test="projectId != null "> and s1.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp1.projectType = #{proType}</if>
@ -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
<if test="nowDept != null and nowDept != ''"> and sp2.deptId = #{nowDept}</if>
<if test="projectId != null "> and s2.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp2.projectType = #{proType}</if>
@ -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
<if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
<if test="projectId != null "> and spws.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>

5
yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml
View File

@ -54,7 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and dapd.is_del='0'
<if test="projectId != null "> and dapd.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="activeName != null and activeName != ''"> and sp.progressVisible = 0</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<if test="deptId != null "> and dapd.dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and sd.dept_name like concat('%', #{deptName}, '%')</if>
@ -87,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN
sur_project sp ON sp.id = dapd.project_id
<where>
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'
<if test="projectId != null "> and dapd.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
@ -126,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN
sys_dept sd ON sd.dept_id = dapd.dept_id
<where>
and dapd.is_del='0' and sp.progressVisible = 0
and dapd.is_del='0'
<if test="projectId != null "> and dapd.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>

2
yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml
View File

@ -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
<if test="projectId != null and projectId!=0"> and spp.project_id = #{projectId}</if>
<if test="imageUrl != null and imageUrl != ''"> and spp.image_url = #{imageUrl}</if>
<if test="videoUrl != null and videoUrl != ''"> and spp.video_url = #{videoUrl}</if>

5
yanzhu-jh/src/main/resources/mapper/video/SurProjectVideoConfigMapper.xml
View File

@ -56,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectName != null "> and sp.projectName like concat('%', #{projectName}, '%')</if>
<if test="deptId != null "> and spvc.dept_id = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="activeName != null and activeName != ''"> and sp.progressVisible = 0</if>
<if test="deptName != null "> and sd.dept_name like concat('%', #{deptName}, '%')</if>
<if test="videoName != null "> and spvc.video_name like concat('%', #{videoName}, '%')</if>
<if test="videoOnlyType != null and videoOnlyType != ''"> and spvc.video_only_type = #{videoOnlyType}</if>
@ -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!=''
<if test="projectId != null "> and a.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and p.projectType = #{proType}</if>
<if test="deptId != null "> and p.deptId = #{deptId}</if>
@ -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
<if test="projectId != null "> and a.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and p.projectType = #{proType}</if>
<if test="deptId != null "> and p.deptId = #{deptId}</if>