jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

举牌验收大屏开发

dev_xd
lj7788@126.com 2025-07-31 18:17:11 +08:00
parent a3495715e8
commit 3eb1144d63
10 changed files with 801 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
yanzhu-bigscreen/src/api/checked.js 100644
View File

@ -0,0 +1,59 @@
import request from "@/utils/request";
// 查询项目举牌验收列表
const listProjectChecked=(query)=> {
return request({
url: '/manage/projectChecked/list',
method: 'get',
params: query
})
}
//举牌验收数量统计
const groupByStatus = (projectId) => {
return request({
url: `/manage//api/bgscreen/projectChecked/groupByStatus?projectId=${projectId || 0}`,
method: 'get'
})
}
//举牌验收技术员统计
const groupByTechnician = (projectId) => {
return new Promise((resolve, reject) => {
request({
url: `/manage//api/bgscreen/projectChecked/groupByTechnician?projectId=${projectId || 0}`,
method: 'get'
}).then(d => {
let tmps = (d.data || []).map(it => {
it.result = it.result || 0;
it.cnt = it.cnt || 0;
return it;
})
let info = [];
tmps.forEach(it => {
let name = it.userName;
let user = info.find(item => item.name == name);
if (!user) {
user = {
name,
toBe: 0, //待验收
accepted: 0 //已验收
};
info.push(user);
}
if (it.result == 0) {
user.toBe = it.cnt;
} else {
user.accepted = it.cnt;
}
});
resolve(info);
})
});
}
export default {
groupByStatus,
groupByTechnician,
listProjectChecked
}

5
yanzhu-bigscreen/src/api/index.js
View File

@ -13,6 +13,8 @@ import planSchedule from "./planSchedule";
import labor from "./labor";
import bim from "./bim"
import machMater from './machmater'
import checked from './checked'
export default {
http: axios,
downFile: download,
@ -29,5 +31,6 @@ export default {
planSchedule,
labor,
bim,
machMater
machMater,
checked
};

132
yanzhu-bigscreen/src/views/check/projectCheckedDetailDialog.vue 100644
View File

@ -0,0 +1,132 @@
<template>
<MyDialog v-if="show" v-model="show" width="960px" height="650px" class="project-checked-detail-dialog">
<template slot="title">举牌验收详情</template>
<div class="detail-content scroll">
<div class="data-row">
<div class="data-label">验收时间:</div>
<div class="data-content">{{ row.checkingDate }}</div>
</div>
<div class="data-row">
<div class="data-label">验收结果:</div>
<div class="data-content">
<span :class="'check-state check-state-' + row.checkResultColor">{{
row.checkResultName }}</span>
</div>
</div>
<div class="data-row">
<div class="data-label">验收图片:</div>
<div class="data-content data-images">
<div class="data-img" v-for="(it, index) in row.images" :key="index">
<el-image :src="it" :preview-src-list="row.images" fit="cover" />
</div>
</div>
</div>
<div class="data-row">
<div class="data-label">工序部位:</div>
<div class="data-content">{{ row.workingPosition }}</div>
</div>
<div class="data-row">
<div class="data-label">验收描述:</div>
<div class="data-content">{{ row.intro }}</div>
</div>
<div class="data-row">
<div class="data-label">班组长:</div>
<div class="data-content">{{ row.groupDeptUserName }}({{ row.groupDeptUser }})</div>
</div>
<div class="data-row">
<div class="data-label">技术员:</div>
<div class="data-content">{{ row.technicianUserName }}({{ row.technicianUserName }})</div>
</div>
<div class="data-row">
<div class="data-label">监理专员:</div>
<div class="data-content">{{ row.superviseUserName }}({{ row.superviseUserName }})</div>
</div>
<div class="data-row">
<div class="data-label">三方验收照:</div>
<div class="data-content check-images">
<div class="data-img" v-for="(it, index) in row.checkImages" :key="index">
<el-image :src="it" :preview-src-list="row.checkImages" fit="cover" />
</div>
</div>
</div>
</div>
</MyDialog>
</template>
<script>
export default {
data() {
return {
loading: false,
show: false,
row: null
}
},
methods: {
showDialog(data) {
this.row = data
this.show = true
},
},
}
</script>
<style lang="less">
.project-checked-detail-dialog {
.popup-project-introduction-min {
.detail-content {
height: 500px;
overflow-y: auto;
.data-row {
display: flex;
color: #3da2ff;
line-height: 30px;
.data-label {
min-width: 120px;
text-align: right;
color: #32e1e4;
padding-right: 10px;
}
.data-images,
.check-images {
width: 100%;
.data-img {
margin-right: 1%;
width: 32%;
display: inline-block;
}
}
.check-state {
display: inline-block;
line-height: 20px;
padding: 2px 4px;
border-radius: 4px;
&.check-state-1 {
color: #09f509;
background: #01b24954;
}
&.check-state-2 {
color: #192c64;
background: #6abee9;
}
}
}
}
}
}
</style>

564
yanzhu-bigscreen/src/views/projectChecked.vue
View File

@ -1,46 +1,167 @@
<template>
<div class="project-checked main-page">
<el-col :span="6" class="h100">
<module-one-1-1 label="举牌验收数量统计" class="chart1-module">
<doughnut-chart :data="doughnutData" title="验收统计"/>
<module-one-1-1 label="举牌验收数量统计" class="chart1-group">
<project-overview-chart :htmlShow="true" :key="'ai1' + chart1Key" :sp="''" :fn="changeChart1"
:maintitle="groupTotal" :legend-opt="groupLendOpt" :typedata="groupData" text="验收数"
:height="chart1Height"></project-overview-chart>
</module-one-1-1>
<module-one-2-1 label="本周验收列表">
<module-one-2-1 label="本周验收列表" class="week-group">
<template v-if="weekData.length == 0">
<div class="no-data">
<div class="no-data-conten">
<img src="images/nodata.png" style="width: 240px;" />
<div class="no-data">暂无数据</div>
</div>
</div>
</template>
<template v-else>
<div class="week-list scroll" :key="weekKey">
<div class="week-item" v-for="(it, index) in weekData" :key="index" @click="handleWeekItemClick(it, $event)">
<div class="item-left">
<el-image :src="it.image" :preview-src-list="it.images" fit="cover" />
</div>
<div class="item-right">
<div class="item-right-row">
<span :class="'check-state check-state-' + it.checkResultColor">{{
it.checkResultName }}</span>
<span class="check-date">{{ it.checkingDate }}</span>
</div>
<div class="item-right-row">
<div class="item-label">工序部位:</div>
<div class="item-data">{{ it.workingPosition }}</div>
</div>
<div class="item-right-row">
<div class="item-label">班组长:</div>
<div class="item-data">{{ it.groupDeptUserName }}({{ it.groupDeptUser }})</div>
</div>
<div class="item-right-row">
<div class="item-label">技术员:</div>
<div class="item-data">{{ it.technicianUserName }}({{ it.technicianUser }})</div>
</div>
<div class="item-right-row">
<div class="item-label">监理专员:</div>
<div class="item-data">{{ it.superviseUserName }}({{ it.superviseUser }})</div>
</div>
</div>
</div>
</div>
</template>
</module-one-2-1>
</el-col>
<el-col :span="18" class="h100">
<module-one-2-3 label="举牌验收列表" class="h66">
<module-one-2-3 label="举牌验收列表" class="h66 list-group">
<div class="head-title-tab" :key="chart1Key">
<div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(1)">已验收({{
getCheckedCount(1) }})</div>
<div :class="nav == 0 ? 'head-nav active' : 'head-nav'" @click="doNav(0)">未验收({{
getCheckedCount(0) }})</div>
</div>
<template v-if="listData.length == 0">
<div class="no-data">
<div class="no-data-conten">
<img src="images/nodata.png" style="width: 240px;" />
<div class="no-data">暂无数据</div>
</div>
</div>
</template>
<template v-else>
<div class="list-data scroll" :key="listKey">
<div class="week-item" v-for="(it, index) in weekData" :key="index" @click="handleWeekItemClick(it, $event)">
<div class="item-left" >
<el-image :src="it.image" :preview-src-list="it.images" fit="cover" />
</div>
<div class="item-right">
<div class="item-right-row">
<span :class="'check-state check-state-' + it.checkResultColor">{{
it.checkResultName }}</span>
<span class="check-date">{{ it.checkingDate }}</span>
</div>
<div class="item-right-row">
<div class="item-label">工序部位:</div>
<div class="item-data">{{ it.workingPosition }}</div>
</div>
<div class="item-right-row">
<div class="item-label">班组长:</div>
<div class="item-data">{{ it.groupDeptUserName }}({{ it.groupDeptUser }})</div>
</div>
<div class="item-right-row">
<div class="item-label">技术员:</div>
<div class="item-data">{{ it.technicianUserName }}({{ it.technicianUser }})</div>
</div>
<div class="item-right-row">
<div class="item-label">监理专员:</div>
<div class="item-data">{{ it.superviseUserName }}({{ it.superviseUser }})</div>
</div>
</div>
</div>
</div>
<el-pagination layout="total,prev, pager, next" :hide-on-single-page="true"
@current-change="handleCurrentChange" :total="total" :page-size="size"
:current-page.sync="index" class="bg-pagination"></el-pagination>
</template>
</module-one-2-3>
<module-one-1-3 label="举牌验收技术员统计" class="h33">
<module-one-1-3 label="举牌验收技术员统计" class="h33 group-technician">
<template v-if="technicianData.length == 0">
<div class="no-data">
<div class="no-data-conten">
<img src="images/nodata.png" style="width: 240px;" />
<div class="no-data">暂无数据</div>
</div>
</div>
</template>
<template v-else>
<my-chart :key="chart2Key" id="project-safety-check-chart2" width="100%" height="100%"
:render="renderChart2"></my-chart>
</template>
</module-one-1-3>
</el-col>
<projectCheckedDetailDialog ref="detailDlg" />
</div>
</template>
<script>
import DoughnutChart from '@/components/doughnutChart.vue'
import debounce from "lodash.debounce";
import projectCheckedDetailDialog from '@/views/check/projectCheckedDetailDialog.vue'
export default {
components: {
DoughnutChart
projectCheckedDetailDialog
},
data() {
return {
dpi: "",
chartKey: 0,
selProject: null,
// 圆环图数据 - 参考进度管理中计划状态的数据格式
doughnutData: [
{ name: '未开始', value: 15 },
{ name: '进行中（正常）', value: 45 },
{ name: '进行中（滞后）', value: 25 },
{ name: '已完成（正常）', value: 10 },
{ name: '已完成（滞后）', value: 5 }
]
// 举牌验收数量统计
chart1Key: 0,
chart1Height: 200,
groupTotal: 0,
groupLendOpt: {
},
groupData: [
],
// 举牌验收技术员统计
chart2Key: 0,
chart2Height: 200,
technicianData: [],
//本周验收列表
weekKey: 0,
weekData: [],
//举牌验收列表
nav: 1,
listData: [],
total: 0,
size: 9,
index: 1,
listKey: 10000,
}
},
mounted() {
@ -62,22 +183,290 @@ export default {
}
});
this.resize();
this.setOpts();
},
methods: {
setOpts() {
let is1K = this.$dpi() == '1K'
let is2K = this.$dpi() == '2K'
this.groupLendOpt = {
icon: 'rect',
orient: 'horizontal',
itemWidth: '50%',
left: 240,
right: '10%',
itemWidth: 20,
itemGap: 20,
itemHeight: 20,
textStyle: {
padding: [0, 0, 0, 0],
fontSize: is1K ? 10 : is2K ? 14 : 16,
color: '#c3dbfd',
align: 'center',
rich: {
name: {
fontSize: is1K ? 10 : is2K ? 14 : 16,
color: '#c3dbfd',
padding: [5, 2, 5, 2],
},
percent: {
fontSize: is1K ? 10 : is2K ? 14 : 16,
color: '#4676FD',
padding: [0, 2, 0, 2],
},
},
},
}
},
init() {
if (!this.selProject) {
return
}
this.chartKey++;
// 这里可以调用API获取真实数据
this.loadDoughnutData();
this.loadGroupData();
this.loadGroupByTechnician();
this.loadWeekProjectChecked();
this.nav = -1;
this.doNav(1);
},
resize() {
this.$refs.chart && this.$refs.chart.resize();
let is1K = this.$dpi() == '1K'
let is2K = this.$dpi() == '2K'
this.chart1Height = is1K ? 230 : is2K ? 360 : 595
this.chart1Key++;
this.chart2Key++;
},
loadDoughnutData() {
// 模拟从API获取数据
// this.$api.project.getCheckStats().then(res => {
// this.doughnutData = res.data;
// })
getCheckedCount(n) {
let obj = this.groupData.find(item => item.name == (n == 1 ? '已验收' : '未验收'))
return obj ? obj.value : 0
},
showDetail(row){
this.$refs.detailDlg.showDialog(row);
},
handleWeekItemClick(row, event) {
// 检查点击的是否在图片区域内
const target = event.target;
const imageContainer = event.currentTarget.querySelector('.item-left');
if (imageContainer && !imageContainer.contains(target)) {
this.showDetail(row);
}
},
doNav(n) {
if (this.nav == n) {
return;
}
this.nav = n;
this.index = 1;
this.loadDataList();
},
handleCurrentChange(n) {
this.index = n
this.loadDataList();
},
loadDataList() {
let param = {
projectId: this.selProject.id,
checkResult: this.nav == 1 ? 99 : 100,
pageNum: this.index,
pageSize: this.size,
}
this.$api.checked.listProjectChecked(param).then(res => {
this.total = res.total + 88;
this.listData = this.mapData(res);
this.listKey++;
});
},
loadWeekProjectChecked() {
let param = {
projectId: this.selProject.id,
remark: "lastWeek",
pageNum: 1,
pageSize: 100,
}
this.$api.checked.listProjectChecked(param).then(res => {
this.weekData = this.mapData(res);
for (i = 0; i < 8; i++) {
this.weekData.push(this.weekData[0])
}
this.weekKey++;
})
},
mapData(res) {
return (res.rows || []).map(item => {
if (item.imageUrls) {
item.images = item.imageUrls.split(',');
item.image = item.images[0];
for(let i=0;i<6;i++){
item.images.push(item.images[0])
}
} else {
item.image = "";
item.images = []
}
if (item.checkingFiles) {
item.checkImages = item.checkingFiles.split(',');
item.checkImage = item.images[0];
} else {
item.checkImage = "";
item.checkImages = []
}
if (item.checkResult == 1 && item.approveStatus == 100) {
item.checkResultName = "验收通过";
item.checkResultColor = 1;
} else {
item.checkResultName = "验收不通过";
item.checkResultColor = 2;
}
return item;
});
},
loadGroupData() {
this.$api.checked.groupByStatus(this.selProject.id).then(res => {
let cnt = 0;
let tmps = (res.data || []).map(it => {
return {
name: it.title,
value: it.cnt
}
});
tmps.forEach(it => {
cnt += it.value;
});
this.groupData = tmps;
this.groupTotal = cnt;
this.chart1Key++;
})
},
changeChart1(opt) {
if (this.$dpi() == '1K') {
opt.legend[0].left = 200
return opt
} else if (this.$dpi() == '2K') {
opt.legend[0].left = 360
return opt
} else {
opt.legend[0].left = 500
return opt
}
},
loadGroupByTechnician() {
this.$api.checked.groupByTechnician(this.selProject.id).then(res => {
this.technicianData = res;
this.chart2Key++;
})
},
renderChart2(opt) {
let is1K = this.$dpi() == '1K'
let is2K = this.$dpi() == '2K'
let option = {
grid: {
left: '5%',
right: '5%',
bottom: '0%',
top: '15%',
containLabel: true,
},
tooltip: {
trigger: 'axis',
valueFormatter: (v) => {
return v
},
textStyle: {
fontSize: is1K ? 12 : is2K ? 14 : 24,
},
},
legend: {
top: is1K ? '0%' : is2K ? '0%' : '0%',
left: 'center',
itemWidth: is1K ? 25 : is2K ? 30 : 40,
itemHeight: is1K ? 14 : is2K ? 20 : 20,
itemGap: is1K ? 20 : is2K ? 30 : 40,
textStyle: {
color: '#fff',
fontSize: is1K ? 14 : is2K ? 20 : 30,
},
},
xAxis: [
{
type: 'category',
data: this.technicianData.map((it) => it.name),
axisLabel: {
width: is1K ? 60 : is2K ? 140 : 220,
margin: 15,
fontSize: is1K ? 12 : is2K ? 14 : 22,
overflow: 'break',
color: '#a2c8f9',
},
splitLine: {
lineStyle: {
opacity: 0.1,
},
},
},
],
yAxis: [
{
type: 'value',
minInterval: 1,
axisLabel: {
formatter: '{value}',
color: '#2ec2b3',
fontSize: is1K ? 12 : is2K ? 14 : 24,
},
splitLine: {
lineStyle: {
opacity: 0.1,
},
},
},
],
series: [
{
name: '已验收',
type: 'bar',
barGap: '0%',
barWidth: '20%',
label: {
show: true,
position: 'top',
color: '#4DAAFC',
fontSize: is1K ? 12 : is2K ? 14 : 24,
},
lineStyle: {
color: '#7ddff2',
},
itemStyle: {
color: '#4974ff',
},
data: this.technicianData.map((it) => it.accepted),
},
{
name: '待验收',
type: 'bar',
barGap: '0%',
barWidth: '20%',
label: {
show: true,
position: 'top',
color: '#4DAAFC',
fontSize: is1K ? 12 : is2K ? 14 : 24,
},
lineStyle: {
color: '#006594',
},
itemStyle: {
color: '#52aef7',
},
data: this.technicianData.map((it) => it.toBe),
},
],
}
return option
},
}
}
</script>
@ -88,9 +477,134 @@ export default {
&.h66 {
height: calc(66% - 20px) !important;
}
&.h33 {
height: calc(33% - 20px) !important;
}
}
.chart1-group {
.chart-gif,
.chart-text {
left: 51px !important;
top: 63px !important;
}
}
.no-data {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.no-data-conten {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
}
.week-group {
.module-ctx {
padding: 0px;
.week-list {
max-height: 100%;
overflow-y: auto;
padding: 10px;
.week-item {
&:first-child {
margin-top: 0px;
}
}
}
}
}
.list-group {
.module-ctx {
padding: 0px;
.head-title-tab {
padding: 10px 0px;
position: relative;
top: 10px;
left: 10px;
}
.list-data {
height: calc(100% - 90px);
overflow-y: auto;
padding: 10px;
display: grid;
grid-template-columns: repeat(3, 1fr);
grid-template-rows: repeat(3, 1fr);
gap: 10px;
}
}
}
.week-item {
background-color: #0000001a;
border: solid 1px #99999988;
margin-top: 10px;
border-radius: 5px;
display: flex;
flex-flow: row;
align-items: center;
padding: 8px;
cursor: pointer;
.item-left {
width: 40%;
height: 100%;
}
.item-right {
color: #3da2ff;
font-size: 12px;
padding-left: 8px;
flex-grow: 1;
.item-right-row {
display: flex;
flex-flow: row;
line-height: 24px;
position: relative;
.item-label{
color: #32e1e4;
}
.check-state {
display: inline-block;
line-height: 20px;
padding: 2px 4px;
border-radius: 4px;
&.check-state-1 {
color: #09f509;
background: #01b24954;
}
&.check-state-2 {
color: #192c64;
background: #6abee9;
}
}
.check-date {
position: absolute;
right: 4px;
color: #fff;
}
}
}
}
}
</style>

15
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectCheckedMapper.xml
View File

@ -53,7 +53,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="checkType != null and checkType != ''"> and ppc.check_type = #{checkType}</if>
<if test="workingPosition != null and workingPosition != ''"> and ppc.working_position = #{workingPosition}</if>
<if test="workingPositionType != null and workingPositionType != ''"> and ppc.working_position_type = #{workingPositionType}</if>
<if test="checkResult != null and checkResult != ''"> and ppc.check_result = #{checkResult}</if>
<if test="checkResult != null and checkResult != ''">
<choose>
<when test="checkResult == '99'"> and approve_status=100 and check_result=1</when>
<when test="checkResult == '100'"> and not (approve_status=100 and check_result=1)</when>
<otherwise> and ppc.check_result = #{checkResult}</otherwise>
</choose>
</if>
<if test="technicianUser != null and technicianUser != ''"> and ppc.technician_user = #{technicianUser}</if>
<if test="superviseUser != null and superviseUser != ''"> and ppc.supervise_user = #{superviseUser}</if>
<if test="groupDeptUser != null and groupDeptUser != ''"> and ppc.group_dept_user = #{groupDeptUser}</if>
@ -64,6 +70,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='activeTags == "jxz"'> and (ppc.approve_status != '100' or ppc.check_result is null or ppc.check_result != '1')</if>
<if test='activeTags == "jwc"'> and ppc.approve_status = '100' and ppc.check_result = '1'</if>
</if>
<if test="remark!=null and remark='lastWeek'">
and ppc.checking_date BETWEEN
DATE_FORMAT(CURDATE() - INTERVAL (WEEKDAY(CURDATE()) ) DAY, '%Y-%m-%d 00:00:00')
AND
DATE_FORMAT(CURDATE() - INTERVAL (WEEKDAY(CURDATE()) - 6) DAY, '%Y-%m-%d 23:59:59')
</if>
and ppc.is_del = '0'
</where>
order by ppc.id

24
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml
View File

@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="cfgid != null "> and cfgid = #{cfgid}</if>
<if test="appId != null "> and app_id = #{appId}</if>
<if test="workerId != null and workerId != ''"> and workerId = #{workerId}</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(attendance_time) = date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull(attendance_time,attendance_out_time)) = date(#{attendanceTime})</if>
</where>
order by id desc LIMIT 1
</select>
@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="scanPhoto != null and scanPhoto != ''"> and scanPhoto = #{scanPhoto}</if>
<if test="isDel != null "> and is_del = #{isDel}</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(attendance_time) = date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull(attendance_time,attendance_out_time)) = date(#{attendanceTime})</if>
</where>
order by id desc
</select>
@ -344,7 +344,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="groupByComanyOld" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
select companyTypeId,count(1) id from ( <include refid="selectSurProjectAttendanceDataVo"/> ) x2 where id in (
select min(id) from ( <include refid="selectSurProjectAttendanceDataVo"/> ) x1
where date(attendance_time)=#{attendanceTime}
where date(ifnull(attendance_time,attendance_out_time))=#{attendanceTime}
<if test="subDeptId!=null and subDeptId>0"> and project_id in (
SELECT id FROM pro_project_info WHERE is_del=0 AND deptid = #{subDeptId}
)
@ -363,7 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select g.companyTypeId,count(1) id from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE()
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=CURDATE()
and cfgid in (select id from attendance_cfg
<where>
<if test="projectId!=null and projectId>0">
@ -431,7 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sur_project_attendance_data d
left JOIN sur_project_attendance_user u on d.workerId = u.workerId and d.cfgid = u.cfgid
left join sur_project_attendance_group g on u.companyId = g.companyId and g.cfgid = u.cfgid
where d.cfgid=#{cfgid} and date(d.attendance_time) = #{date}
where d.cfgid=#{cfgid} and date(ifnull(d.attendance_time,d.attendance_out_time)) = #{date}
GROUP BY d.workerId
</select>
@ -442,7 +442,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sur_project_attendance_data d
left JOIN sur_project_attendance_user u on d.workerId = u.workerId and d.cfgid = u.cfgid
left join sys_dept sd on u.companyName = sd.dept_name
where d.cfgid=#{cfgid} and date(d.attendance_time) = #{date}
where d.cfgid=#{cfgid} and date(ifnull(d.attendance_time,d.attendance_out_time)) = #{date}
GROUP BY d.workerId
</select>
@ -558,7 +558,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ady.attendance_time) =date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull(ady.attendance_time,ady.attendance_out_time)) =date(#{attendanceTime})</if>
</select>
<select id="attendanceDataList" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
@ -575,7 +575,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="workerId != null and workerId != ''"> and ady.workerId = #{workerId}</if>
<if test="workerName != null and workerName != ''"> and ady.workerName like concat('%', #{workerName}, '%')</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ady.attendance_time) = date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull(ady.attendance_time,ady.attendance_out_time)) = date(#{attendanceTime})</if>
and ady.is_del=0
order by ady.id desc
</select>
@ -591,7 +591,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId!=null and deptId>0">
and sp.dis_dept_id=#{deptId}
</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ady.attendance_time) =date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull( ady.attendance_time, ady.attendance_out_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
@ -624,7 +624,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select '3' as type, d.companyTypeId,count(1) as total from sur_project_attendance_data_${year} d
where d.cfgid in (select cfg.id from attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
and d.is_del=0
and date(d.attendance_time) = date(now())
and date(ifnull(d.attendance_time,d.attendance_out_time)) = date(now())
group by d.companyTypeId
</select>
@ -632,7 +632,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.companyTypeId,count(1) as total from sur_project_attendance_data_${year} d
where d.cfgid in (select cfg.id from attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
and d.is_del=0
<if test="attendanceTime != null and attendanceTime != ''"> and date(d.attendance_time) = date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull(d.attendance_time,d.attendance_out_time)) = date(#{attendanceTime})</if>
<if test="workerName != null and workerName != ''"> and d.workerName like concat('%', #{workerName}, '%')</if>
group by d.companyTypeId
</select>
@ -665,7 +665,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getRealAttendance" resultMap="SurProjectAttendanceDataResult">
select * from sur_project_attendance_data_${year}
where date(attendance_time)=date(now()) or date(attendance_out_time)=date(now())
where date(ifnull(attendance_time,attendance_out_time))=date(now())
and is_del!=1
and projectid=#{prjId}
order by ifnull(attendance_time,attendance_out_time) DESC

14
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml
View File

@ -460,7 +460,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="sqlAttendanceData">
(
SELECT * FROM sur_project_attendance_data WHERE DATE(attendance_time)=date(#{createBy}) AND cfgid IN (
SELECT * FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=date(#{createBy}) AND cfgid IN (
SELECT id FROM attendance_cfg WHERE project_id=#{projectId} AND dept_id=#{subDeptId}
) ) xx
</sql>
@ -501,14 +501,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) cnt from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=date(#{createBy}) AND cfgid IN (
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=date(#{createBy}) AND cfgid IN (
SELECT id FROM attendance_cfg WHERE project_id=#{projectId} AND dept_id=#{subDeptId}
) group by workerid
)
</select>
<select id="queryAttendanceByUserIds" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
select workerid,attendance_type name,min(attendance_time) inTime,max(attendance_time) outTime from sur_project_attendance_data
where DATE(attendance_time)=date(#{createBy})
where DATE(ifnull(attendance_time,attendance_out_time))=date(#{createBy})
<if test="workerIds !=null and workerIds.size()>0">
and workerid in
<foreach collection="workerIds" item="item" index="index" open="(" close=")" separator=",">
@ -522,7 +522,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select u.* from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=date(#{createBy}) AND cfgid IN (
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=date(#{createBy}) AND cfgid IN (
SELECT id FROM attendance_cfg WHERE project_id=#{projectId} AND dept_id=#{subDeptId}
) group by workerid
)
@ -534,7 +534,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) cnt from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE() group by workerid
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=CURDATE() group by workerid
)
<if test="id==1">
and g.companyTypeId in (1)
@ -566,7 +566,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select u.* from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE()
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=CURDATE()
)
<if test="id==1">
@ -597,7 +597,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select u.* from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE() group by workerid
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=CURDATE() group by workerid
)
<if test="id==1">

20
yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceDataMapper.xml
View File

@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="cfgid != null "> and cfgid = #{cfgid}</if>
<if test="appId != null "> and app_id = #{appId}</if>
<if test="workerId != null and workerId != ''"> and workerId = #{workerId}</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(attendance_time) = date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull(attendance_time,attendance_out_time)) = date(#{attendanceTime})</if>
</where>
order by id desc LIMIT 1
</select>
@ -342,7 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="groupByComanyOld" parameterType="QuartzProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
select companyTypeId,count(1) id from ( <include refid="selectSurProjectAttendanceDataVo"/> ) x2 where id in (
select min(id) from ( <include refid="selectSurProjectAttendanceDataVo"/> ) x1
where date(attendance_time)=#{attendanceTime}
where date(ifnull(attendance_time,attendance_out_time))=#{attendanceTime}
<if test="subDeptId!=null and subDeptId>0"> and projectId in (
SELECT id FROM pro_project_info WHERE is_del=0 AND dis_dept_id = #{subDeptId}
)
@ -361,7 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select g.companyTypeId,count(1) id from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE()
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=CURDATE()
and cfgid in (select id from attendance_cfg
<where>
<if test="projectId!=null and projectId>0">
@ -429,7 +429,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sur_project_attendance_data d
left JOIN sur_project_attendance_user u on d.workerId = u.workerId and d.cfgid = u.cfgid
left join sur_project_attendance_group g on u.companyId = g.companyId and g.cfgid = u.cfgid
where d.cfgid=#{cfgid} and date(d.attendance_time) = #{date}
where d.cfgid=#{cfgid} and date(ifnull(d.attendance_time,d.attendance_out_time)) = #{date}
GROUP BY d.workerId
</select>
@ -440,7 +440,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sur_project_attendance_data d
left JOIN sur_project_attendance_user u on d.workerId = u.workerId and d.cfgid = u.cfgid
left join sys_dept sd on u.companyName = sd.dept_name
where d.cfgid=#{cfgid} and date(d.attendance_time) = #{date}
where d.cfgid=#{cfgid} and date(ifnull(d.attendance_time,d.attendance_out_time)) = #{date}
GROUP BY d.workerId
</select>
@ -476,7 +476,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ady.attendance_time) =date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull(ady.attendance_time,ady.attendance_out_time)) =date(#{attendanceTime})</if>
</select>
<select id="attendanceDataList" parameterType="QuartzProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
@ -493,7 +493,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="workerId != null and workerId != ''"> and ady.workerId = #{workerId}</if>
<if test="workerName != null and workerName != ''"> and ady.workerName like concat('%', #{workerName}, '%')</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ady.attendance_time) = date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull(ady.attendance_time,ady.attendance_out_time)) = date(#{attendanceTime})</if>
and ady.is_del=0
order by ady.id desc
</select>
@ -510,7 +510,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId!=null and deptId>0">
and sp.dis_dept_id=#{deptId}
</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ady.attendance_time) =date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(if(ady.attendance_time,ady.attendance_out_time)) =date(#{attendanceTime})</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.project_type = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0">
@ -546,7 +546,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select '3' as type, d.companyTypeId,count(1) as total from sur_project_attendance_data_${year} d
where d.cfgid in (select cfg.id from attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
and d.is_del=0
and date(d.attendance_time) = date(now())
and date(ifnull(d.attendance_time,d.attendance_out_time)) = date(now())
group by d.companyTypeId
</select>
@ -554,7 +554,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.companyTypeId,count(1) as total from sur_project_attendance_data_${year} d
where d.cfgid in (select cfg.id from attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
and d.is_del=0
<if test="attendanceTime != null and attendanceTime != ''"> and date(d.attendance_time) = date(#{attendanceTime})</if>
<if test="attendanceTime != null and attendanceTime != ''"> and date(ifnull(d.attendance_time,d.attendance_out_time)) = date(#{attendanceTime})</if>
<if test="workerName != null and workerName != ''"> and d.workerName like concat('%', #{workerName}, '%')</if>
group by d.companyTypeId
</select>

10
yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProjectAttendanceUserMapper.xml
View File

@ -472,14 +472,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) cnt from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=date(#{createBy}) AND cfgid IN (
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=date(#{createBy}) AND cfgid IN (
SELECT id FROM attendance_cfg WHERE project_id=#{projectId} AND dept_id=#{deptId}
) group by workerid
)
</select>
<select id="queryAttendanceByUserIds" parameterType="QuartzProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
select workerid,attendance_type name,min(attendance_time) inTime,max(attendance_time) outTime from sur_project_attendance_data
where DATE(attendance_time)=date(#{createBy})
where DATE(ifnull(attendance_time,attendance_out_time))=date(#{createBy})
<if test="workerIds !=null and workerIds.size()>0">
and workerid in
<foreach collection="workerIds" item="item" index="index" open="(" close=")" separator=",">
@ -493,7 +493,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select u.* from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=date(#{createBy}) AND cfgid IN (
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=date(#{createBy}) AND cfgid IN (
SELECT id FROM attendance_cfg WHERE project_id=#{projectId} AND dept_id=#{subDeptId}
) group by workerid
)
@ -505,7 +505,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) cnt from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE() group by workerid
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=CURDATE() group by workerid
)
<if test="id==1">
and g.companyTypeId in (1)
@ -535,7 +535,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select u.* from sur_project_attendance_user u, attendance_cfg c,view_sur_project_attendance_group g
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
and u.workerid in(
SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE() group by workerid
SELECT workerid FROM sur_project_attendance_data WHERE DATE(ifnull(attendance_time,attendance_out_time))=CURDATE() group by workerid
)
<if test="id==1">

12
yanzhu-ui-vue3/src/views/manage/projectChecked/index.vue
View File

@ -129,7 +129,7 @@
</el-table-column>
<el-table-column label="审核状态" align="center" prop="approveStatus">
<template #default="scope">
<dict-tag :options="project_check_status" :value="scope.row.approveStatus" />
<dict-tag :options="project_check_status" :value="scope.row.appStatus" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -292,7 +292,15 @@ const { queryParams, form, rules } = toRefs(data);
function getList() {
loading.value = true;
listProjectChecked(queryParams.value).then(response => {
projectCheckedList.value = response.rows;
projectCheckedList.value = (response.rows||[]).map(item=>{
if(item.checkResult){
item.appStatus=(item.checkResult==1 && item.approveStatus==100)?4:2
}else{
item.appStatus=1
}
return item;
});
total.value = response.total;
loading.value = false;
});