From 27df1993ecba74d139965d06991d05e741b94130 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Fri, 7 Jul 2023 15:58:47 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/MaterialDetailsMapper.xml | 5 +- .../xml/ProjectOperationsAnalysisMapper.xml | 52 +++++++++++++++---- .../video/controller/VideoItemController.java | 2 + .../entity/vo/PersonnelSituationVO.java | 3 ++ .../worker/mapper/xml/WorkerInfoMapper.xml | 17 +++--- .../mapper/xml/WorkerWagesPaymentMapper.xml | 4 +- 6 files changed, 61 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialDetailsMapper.xml b/src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialDetailsMapper.xml index 972b3a27c..05fd54be0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialDetailsMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialDetailsMapper.xml @@ -54,13 +54,14 @@ - SELECT i.worker_name worker_name,i.person_sn,day1, day2, day3, - day4, day5, day6, day7, day8, day9, day10, day11, day12, day13, day14, day15, day16, - day17, day18, day19, day20, day21, day22, day23, day24, day25, day26, day27, day28, - day29, day30, day31,p.project_name,i.id_card_big_photo_url,ei.enterprise_name + SELECT i.worker_name worker_name,i.person_sn, + IFNULL(day1,0) day1, + IFNULL(day2,0) day2, + IFNULL(day3,0) day3, + IFNULL(day4,0) day4, + IFNULL(day5,0) day5, + IFNULL(day6,0) day6, + IFNULL(day7,0) day7, + IFNULL(day8,0) day8, + IFNULL(day9,0) day9, + IFNULL(day10,0) day10, + IFNULL(day11,0) day11, + IFNULL(day12,0) day12, + IFNULL(day13,0) day13, + IFNULL(day14,0) day14, + IFNULL(day15,0) day15, + IFNULL(day16,0) day16, + IFNULL(day17,0) day17, + IFNULL(day18,0) day18, + IFNULL(day19,0) day19, + IFNULL(day20,0) day20, + IFNULL(day21,0) day21, + IFNULL(day22,0) day22, + IFNULL(day23,0) day23, + IFNULL(day24,0) day24, + IFNULL(day25,0) day25, + IFNULL(day26,0) day26, + IFNULL(day27,0) day27, + IFNULL(day28,0) day28, + IFNULL(day29,0) day29, + IFNULL(day30,0) day30, + IFNULL(day31,0) day31, + p.project_name,i.id_card_big_photo_url,ei.enterprise_name from worker_info i INNER JOIN project p on i.project_sn=p.project_sn - INNER JOIN worker_month_attendance_statistics s on i.person_sn=s.person_sn + LEFT JOIN worker_month_attendance_statistics s on (i.person_sn=s.person_sn + + AND s.query_time=#{queryTime} + + + AND s.query_time=#{time} + + ) LEFT JOIN team_info tm on tm.id=i.team_id LEFT JOIN worker_type t on t.id=tm.worker_type_id LEFT JOIN department_info d on d.id=i.department_id @@ -69,9 +105,6 @@ AND i.person_type=#{personType} - - AND s.query_time=#{time} - AND i.team_id = #{groupId} @@ -81,9 +114,6 @@ AND i.worker_name like concat ('%',#{workerName},'%') - - AND s.query_time=#{queryTime} - AND i.person_sn=#{personSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java index 40ca71ec3..a6972b995 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.video.controller; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.tree.TreeNode; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonnelSituationVO.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonnelSituationVO.java index 3e135f029..fe64db381 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonnelSituationVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonnelSituationVO.java @@ -16,6 +16,9 @@ public class PersonnelSituationVO { @ApiModelProperty(value = "今日出勤") private Long todayAtte; + @ApiModelProperty(value = "今日劳务人员出勤人数") + private Long todayWorkerAtte; + @ApiModelProperty(value = "在场") private Long bePresent; diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index aebb0feaa..1ef95a217 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -2271,21 +2271,24 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerWagesPaymentMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerWagesPaymentMapper.xml index 9c422b3c0..84d0f8dce 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerWagesPaymentMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerWagesPaymentMapper.xml @@ -143,7 +143,7 @@ LEFT JOIN (SELECT DISTINCT wp.project_sn FROM worker_wages_payment wp JOIN project p1 on wp.project_sn=p1.project_sn - where wp.pay_month = #{param.payMonth}) t ON t.project_sn = p.project_sn + where wp.pay_month = #{payMonth}) t ON t.project_sn = p.project_sn where 1=1 and p.project_sn in @@ -159,7 +159,7 @@ ifnull(sum(if(wp.pay_status = 0 or wp.pay_status is null, 1, 0)), 0) unpaidUserNum from worker_info a LEFT JOIN worker_wages_payment wp ON (a.person_sn = wp.person_sn and a.project_sn = wp.project_sn and - wp.pay_month = #{param.payMonth}) + wp.pay_month = #{payMonth}) where a.inService_type = 1 and a.project_sn in