From 16facda58311ecf8fd6ac91d31325250539786f3 Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Mon, 26 Jun 2023 09:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LifterCurrentDataController.java          |   2 +-
 .../TowerCurrentDataController.java           |   2 +-
 .../bigdevice/entity/LifterCurrentData.java   | 535 +++++++++++-------
 .../mapper/LifterCurrentDataMapper.java       |   2 +-
 .../mapper/xml/LifterCurrentDataMapper.xml    |   4 +-
 .../service/ILifterCurrentDataService.java    |   2 +-
 .../service/ITowerCurrentDataService.java     |   2 +-
 .../impl/LifterCurrentDataServiceImpl.java    |  24 +-
 .../impl/TowerCurrentDataServiceImpl.java     |   9 +-
 .../DeepExcavationCurrentDataServiceImpl.java |   1 +
 .../controller/ProgressItemController.java    |  41 +-
 .../entity/vo/ProgressItemOverdueListVo.java  |  15 +
 .../mapper/ProgressTaskAlarmMapper.java       |   4 +
 .../mapper/xml/ProgressTaskAlarmMapper.xml    |  18 +
 .../project/mapper/xml/ProjectMapper.xml      |  28 +-
 .../service/ProgressTaskAlarmService.java     |   7 +
 .../impl/ProgressTaskAlarmServiceImpl.java    |  22 +-
 .../ProjectOperationsAnalysisController.java  |  18 +-
 .../vo/WorkerMonthAttendanceStatisticsVo.java |  26 +-
 .../ProjectOperationsAnalysisMapper.java      |   2 +-
 .../xml/ProjectOperationsAnalysisMapper.xml   |  35 +-
 .../IProjectOperationsAnalysisService.java    |   2 +-
 .../ProjectOperationsAnalysisServiceImpl.java |  29 +-
 .../WorkerWagesPaymentController.java         |   2 +-
 .../worker/mapper/xml/WorkerInfoMapper.xml    |  46 +-
 .../mapper/xml/WorkerSafeEducationMapper.xml  |  10 +-
 .../mapper/xml/WorkerWagesPaymentMapper.xml   |  23 +-
 src/main/java/com/zhgd/xmgl/util/AqiUtil.java |  19 +-
 28 files changed, 611 insertions(+), 319 deletions(-)
 create mode 100644 src/main/java/com/zhgd/xmgl/modules/project/entity/vo/ProgressItemOverdueListVo.java

diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/LifterCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/LifterCurrentDataController.java
index 7acc790f8..5b829520b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/LifterCurrentDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/LifterCurrentDataController.java
@@ -71,7 +71,7 @@ public class LifterCurrentDataController {
     @ApiOperation(value = "查询升降机设备最新一条实时数据", notes = "查询升降机设备最新一条实时数据", httpMethod = "POST")
     @ApiImplicitParam(name = "devSn", value = "升降机设备编号", paramType = "query", required = true, dataType = "Integer")
     @PostMapping(value = "/getNewestLifterCurrentData")
-    public Result<EntityMap> getNewestLifterCurrentData(@RequestBody Map<String, Object> map) {
+    public Result<LifterCurrentData> getNewestLifterCurrentData(@RequestBody Map<String, Object> map) {
         return Result.success(lifterCurrentDataService.getNewestLifterCurrentData(map));
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerCurrentDataController.java
index 171b40637..ac5eb7e8b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerCurrentDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerCurrentDataController.java
@@ -82,7 +82,7 @@ public class TowerCurrentDataController {
     @ApiOperation(value = "查询塔机设备最新一条实时数据", notes = "查询塔机设备最新一条实时数据", httpMethod = "POST")
     @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "query", required = true, dataType = "Integer")
     @PostMapping(value = "/getNewestTowerCurrentData")
-    public Result<EntityMap> getNewestTowerCurrentData(@RequestBody Map<String, Object> map) {
+    public Result<TowerCurrentData> getNewestTowerCurrentData(@RequestBody Map<String, Object> map) {
         return Result.success(towerCurrentDataService.getNewestTowerCurrentData(map));
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/LifterCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/LifterCurrentData.java
index 956431d43..f6935f8b9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/LifterCurrentData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/LifterCurrentData.java
@@ -1,291 +1,420 @@
 package com.zhgd.xmgl.modules.bigdevice.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
 /**
  * @Description: 升降机实时数据
  * @author： pds
- * @date：   2020-12-16
+ * @date： 2020-12-16
  * @version： V1.0
  */
 @Data
 @TableName("lifter_current_data")
-@ApiModel(value="LifterCurrentData实体类",description="LifterCurrentData")
+@ApiModel(value = "LifterCurrentData实体类", description = "LifterCurrentData")
 public class LifterCurrentData implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**升降机实时数据*/
+    /**
+     * 升降机实时数据
+     */
     @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value="升降机实时数据")
-    private java.lang.Long id  ;
-    /**设备编号*/
+    @ApiModelProperty(value = "升降机实时数据")
+    private java.lang.Long id;
+    /**
+     * 设备编号
+     */
     @Excel(name = "设备编号", width = 15)
-    @ApiModelProperty(value="设备编号")
-    private java.lang.String devSn  ;
-    /**设备名称*/
+    @ApiModelProperty(value = "设备编号")
+    private java.lang.String devSn;
+    /**
+     * 设备名称
+     */
     @Excel(name = "设备名称", width = 15)
-    @ApiModelProperty(value="设备名称")
-    private java.lang.String devName  ;
-    /**项目sn*/
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String devName;
+    /**
+     * 项目sn
+     */
     @Excel(name = "项目sn", width = 15)
-    @ApiModelProperty(value="项目sn")
-    private java.lang.String projectSn  ;
-    /**准载,单位kg*/
+    @ApiModelProperty(value = "项目sn")
+    private java.lang.String projectSn;
+    /**
+     * 准载,单位kg
+     */
     @Excel(name = "准载,单位kg", width = 15)
-    @ApiModelProperty(value="准载,单位kg")
-    private java.lang.String maxLoad  ;
-    /**类型*/
+    @ApiModelProperty(value = "准载,单位kg")
+    private java.lang.String maxLoad;
+    /**
+     * 类型
+     */
     @Excel(name = "类型", width = 15)
-    @ApiModelProperty(value="类型")
-    private java.lang.String type  ;
-    /**开始运行高度*/
+    @ApiModelProperty(value = "类型")
+    private java.lang.String type;
+    /**
+     * 开始运行高度
+     */
     @Excel(name = "开始运行高度", width = 15)
-    @ApiModelProperty(value="开始运行高度")
-    private java.lang.String height  ;
-    /**停止运行高度*/
+    @ApiModelProperty(value = "开始运行高度")
+    private java.lang.String height;
+    /**
+     * 停止运行高度
+     */
     @Excel(name = "停止运行高度", width = 15)
-    @ApiModelProperty(value="停止运行高度")
-    private java.lang.String stopHeight  ;
-    /**停止工作时间*/
+    @ApiModelProperty(value = "停止运行高度")
+    private java.lang.String stopHeight;
+    /**
+     * 停止工作时间
+     */
     @Excel(name = "停止工作时间", width = 15)
-    @ApiModelProperty(value="停止工作时间")
-    private java.lang.String stopTime  ;
-    /**实时标志，0为历史数据，1为实时数据*/
+    @ApiModelProperty(value = "停止工作时间")
+    private java.lang.String stopTime;
+    /**
+     * 实时标志，0为历史数据，1为实时数据
+     */
     @Excel(name = "实时标志，0为历史数据，1为实时数据", width = 15)
-    @ApiModelProperty(value="实时标志，0为历史数据，1为实时数据")
-    private java.lang.String realFlag  ;
-    /**开始工作时间*/
+    @ApiModelProperty(value = "实时标志，0为历史数据，1为实时数据")
+    private java.lang.String realFlag;
+    /**
+     * 开始工作时间
+     */
     @Excel(name = "开始工作时间", width = 15)
-    @ApiModelProperty(value="开始工作时间")
-    private java.lang.String startTime  ;
-    /**本次运行载重 ,单位kg*/
+    @ApiModelProperty(value = "开始工作时间")
+    private java.lang.String startTime;
+    /**
+     * 本次运行载重 ,单位kg
+     */
     @Excel(name = "本次运行载重 ,单位kg", width = 15)
-    @ApiModelProperty(value="本次运行载重 ,单位kg")
-    private java.lang.String loading  ;
-    /**本次运行最大载重百分比*/
+    @ApiModelProperty(value = "本次运行载重 ,单位kg")
+    private java.lang.String loading;
+    /**
+     * 本次运行最大载重百分比
+     */
     @Excel(name = "本次运行最大载重百分比", width = 15)
-    @ApiModelProperty(value="本次运行最大载重百分比")
-    private java.lang.String loadRatio  ;
-    /**制动距离*/
+    @ApiModelProperty(value = "本次运行最大载重百分比")
+    private java.lang.String loadRatio;
+    /**
+     * 制动距离
+     */
     @Excel(name = "制动距离", width = 15)
-    @ApiModelProperty(value="制动距离")
-    private java.lang.String brakingDistance  ;
-    /**接收创建时间*/
+    @ApiModelProperty(value = "制动距离")
+    private java.lang.String brakingDistance;
+    /**
+     * 接收创建时间
+     */
     @Excel(name = "接收创建时间", width = 15)
-    @ApiModelProperty(value="接收创建时间")
-    private java.lang.String reciveTime  ;
-    /**运行状态 1：上升 2：下降 必传参数*/
+    @ApiModelProperty(value = "接收创建时间")
+    private java.lang.String reciveTime;
+    /**
+     * 运行状态 1：上升 2：下降 必传参数
+     */
     @Excel(name = "运行状态 1：上升 2：下降 必传参数", width = 15)
-    @ApiModelProperty(value="运行状态 1：上升 2：下降 必传参数")
-    private java.lang.Integer runningState  ;
-    /**是否在线 0:在线,1:不在线*/
+    @ApiModelProperty(value = "运行状态 1：上升 2：下降 必传参数")
+    private java.lang.Integer runningState;
+    /**
+     * 是否在线 0:在线,1:不在线
+     */
     @Excel(name = "是否在线 0:在线,1:不在线", width = 15)
-    @ApiModelProperty(value="是否在线 0:在线,1:不在线")
-    private java.lang.Integer isOnline  ;
-    /**驾驶员身份证号*/
+    @ApiModelProperty(value = "是否在线 0:在线,1:不在线")
+    private java.lang.Integer isOnline;
+    /**
+     * 驾驶员身份证号
+     */
     @Excel(name = "驾驶员身份证号", width = 15)
-    @ApiModelProperty(value="驾驶员身份证号")
-    private java.lang.String driverIdCard  ;
-    /**驾驶员证书编号*/
+    @ApiModelProperty(value = "驾驶员身份证号")
+    private java.lang.String driverIdCard;
+    /**
+     * 驾驶员证书编号
+     */
     @Excel(name = "驾驶员证书编号", width = 15)
-    @ApiModelProperty(value="驾驶员证书编号")
-    private java.lang.String driverLicence  ;
-    /**驾驶员姓名*/
+    @ApiModelProperty(value = "驾驶员证书编号")
+    private java.lang.String driverLicence;
+    /**
+     * 驾驶员姓名
+     */
     @Excel(name = "驾驶员姓名", width = 15)
-    @ApiModelProperty(value="驾驶员姓名")
-    private java.lang.String driverName  ;
-    /**高度比*/
+    @ApiModelProperty(value = "驾驶员姓名")
+    private java.lang.String driverName;
+    /**
+     * 高度比
+     */
     @Excel(name = "高度比", width = 15)
-    @ApiModelProperty(value="高度比")
-    private java.lang.String heightRatio  ;
-    /**倾斜度*/
+    @ApiModelProperty(value = "高度比")
+    private java.lang.String heightRatio;
+    /**
+     * 倾斜度
+     */
     @Excel(name = "倾斜度", width = 15)
-    @ApiModelProperty(value="倾斜度")
-    private java.lang.String biasAngle  ;
-    /**倾斜百分比*/
+    @ApiModelProperty(value = "倾斜度")
+    private java.lang.String biasAngle;
+    /**
+     * 倾斜百分比
+     */
     @Excel(name = "倾斜百分比", width = 15)
-    @ApiModelProperty(value="倾斜百分比")
-    private java.lang.String biasRatio  ;
-    /**人数*/
+    @ApiModelProperty(value = "倾斜百分比")
+    private java.lang.String biasRatio;
+    /**
+     * 人数
+     */
     @Excel(name = "人数", width = 15)
-    @ApiModelProperty(value="人数")
-    private java.lang.Integer peopleNumber  ;
-    /**运行速度*/
+    @ApiModelProperty(value = "人数")
+    private java.lang.Integer peopleNumber;
+    /**
+     * 运行速度
+     */
     @Excel(name = "运行速度", width = 15)
-    @ApiModelProperty(value="运行速度")
-    private java.lang.String speed  ;
-    /**楼层数*/
+    @ApiModelProperty(value = "运行速度")
+    private java.lang.String speed;
+    /**
+     * 楼层数
+     */
     @Excel(name = "楼层数", width = 15)
-    @ApiModelProperty(value="楼层数")
-    private java.lang.Integer floorNum  ;
-    /**风速*/
+    @ApiModelProperty(value = "楼层数")
+    private java.lang.Integer floorNum;
+    /**
+     * 风速
+     */
     @Excel(name = "风速", width = 15)
-    @ApiModelProperty(value="风速")
-    private java.lang.String windSpeed  ;
-    /**倾角X*/
+    @ApiModelProperty(value = "风速")
+    private java.lang.String windSpeed;
+    /**
+     * 倾角X
+     */
     @Excel(name = "倾角X", width = 15)
-    @ApiModelProperty(value="倾角X")
-    private java.lang.String dipAngleX  ;
-    /**倾角Y*/
+    @ApiModelProperty(value = "倾角X")
+    private java.lang.String dipAngleX;
+    /**
+     * 倾角Y
+     */
     @Excel(name = "倾角Y", width = 15)
-    @ApiModelProperty(value="倾角Y")
-    private java.lang.String dipAngleY  ;
-    /**前门状态，1关，2开*/
+    @ApiModelProperty(value = "倾角Y")
+    private java.lang.String dipAngleY;
+    /**
+     * 前门状态，1关，2开
+     */
     @Excel(name = "前门状态，1关，2开", width = 15)
-    @ApiModelProperty(value="前门状态，1关，2开")
-    private java.lang.Integer frontDoorState  ;
-    /**后门状态，1关，2开*/
+    @ApiModelProperty(value = "前门状态，1关，2开")
+    private java.lang.Integer frontDoorState;
+    /**
+     * 后门状态，1关，2开
+     */
     @Excel(name = "后门状态，1关，2开", width = 15)
-    @ApiModelProperty(value="后门状态，1关，2开")
-    private java.lang.Integer backDoorState  ;
-    /**无任何外设故障 0:有外设故障 1: 无任何外设故障*/
+    @ApiModelProperty(value = "后门状态，1关，2开")
+    private java.lang.Integer backDoorState;
+    /**
+     * 无任何外设故障 0:有外设故障 1: 无任何外设故障
+     */
     @Excel(name = "无任何外设故障 0:有外设故障 1: 无任何外设故障", width = 15)
-    @ApiModelProperty(value="无任何外设故障 0:有外设故障 1: 无任何外设故障")
-    private java.lang.Integer noError  ;
-    /**身份识别模块故障 0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "无任何外设故障 0:有外设故障 1: 无任何外设故障")
+    private java.lang.Integer noError;
+    /**
+     * 身份识别模块故障 0:无故障 1: 有故障
+     */
     @Excel(name = "身份识别模块故障 0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="身份识别模块故障 0:无故障 1: 有故障")
-    private java.lang.Integer idError  ;
-    /**人数识别装置故障  0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "身份识别模块故障 0:无故障 1: 有故障")
+    private java.lang.Integer idError;
+    /**
+     * 人数识别装置故障  0:无故障 1: 有故障
+     */
     @Excel(name = "人数识别装置故障  0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="人数识别装置故障  0:无故障 1: 有故障")
-    private java.lang.Integer peopleCntError  ;
-    /**载重传感器故障   0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "人数识别装置故障  0:无故障 1: 有故障")
+    private java.lang.Integer peopleCntError;
+    /**
+     * 载重传感器故障   0:无故障 1: 有故障
+     */
     @Excel(name = "载重传感器故障   0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="载重传感器故障   0:无故障 1: 有故障")
-    private java.lang.Integer weightError  ;
-    /**速度传感器故障  0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "载重传感器故障   0:无故障 1: 有故障")
+    private java.lang.Integer weightError;
+    /**
+     * 速度传感器故障  0:无故障 1: 有故障
+     */
     @Excel(name = "速度传感器故障  0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="速度传感器故障  0:无故障 1: 有故障")
-    private java.lang.Integer speedError  ;
-    /**高度传感器故障  0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "速度传感器故障  0:无故障 1: 有故障")
+    private java.lang.Integer speedError;
+    /**
+     * 高度传感器故障  0:无故障 1: 有故障
+     */
     @Excel(name = "高度传感器故障  0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="高度传感器故障  0:无故障 1: 有故障")
-    private java.lang.Integer heightError  ;
-    /**楼层传感器故障  0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "高度传感器故障  0:无故障 1: 有故障")
+    private java.lang.Integer heightError;
+    /**
+     * 楼层传感器故障  0:无故障 1: 有故障
+     */
     @Excel(name = "楼层传感器故障  0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="楼层传感器故障  0:无故障 1: 有故障")
-    private java.lang.Integer floorError  ;
-    /**倾角X传感器故障  0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "楼层传感器故障  0:无故障 1: 有故障")
+    private java.lang.Integer floorError;
+    /**
+     * 倾角X传感器故障  0:无故障 1: 有故障
+     */
     @Excel(name = "倾角X传感器故障  0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="倾角X传感器故障  0:无故障 1: 有故障")
-    private java.lang.Integer obliguityXError  ;
-    /**倾角Y传感器故障  0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "倾角X传感器故障  0:无故障 1: 有故障")
+    private java.lang.Integer obliguityXError;
+    /**
+     * 倾角Y传感器故障  0:无故障 1: 有故障
+     */
     @Excel(name = "倾角Y传感器故障  0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="倾角Y传感器故障  0:无故障 1: 有故障")
-    private java.lang.Integer obliguityYError  ;
-    /**风速传感器故障  0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "倾角Y传感器故障  0:无故障 1: 有故障")
+    private java.lang.Integer obliguityYError;
+    /**
+     * 风速传感器故障  0:无故障 1: 有故障
+     */
     @Excel(name = "风速传感器故障  0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="风速传感器故障  0:无故障 1: 有故障")
-    private java.lang.Integer windSpeedError  ;
-    /**GPS模块故障  0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "风速传感器故障  0:无故障 1: 有故障")
+    private java.lang.Integer windSpeedError;
+    /**
+     * GPS模块故障  0:无故障 1: 有故障
+     */
     @Excel(name = "GPS模块故障  0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="GPS模块故障  0:无故障 1: 有故障")
-    private java.lang.Integer gpsError  ;
-    /**楼层呼叫装置故障  0:无故障 1: 有故障*/
+    @ApiModelProperty(value = "GPS模块故障  0:无故障 1: 有故障")
+    private java.lang.Integer gpsError;
+    /**
+     * 楼层呼叫装置故障  0:无故障 1: 有故障
+     */
     @Excel(name = "楼层呼叫装置故障  0:无故障 1: 有故障", width = 15)
-    @ApiModelProperty(value="楼层呼叫装置故障  0:无故障 1: 有故障")
-    private java.lang.Integer wirelessError  ;
-    /**无任何预警 0:有预警 1: 无任何预警*/
+    @ApiModelProperty(value = "楼层呼叫装置故障  0:无故障 1: 有故障")
+    private java.lang.Integer wirelessError;
+    /**
+     * 无任何预警 0:有预警 1: 无任何预警
+     */
     @Excel(name = "无任何预警 0:有预警 1: 无任何预警", width = 15)
-    @ApiModelProperty(value="无任何预警 0:有预警 1: 无任何预警")
-    private java.lang.Integer noPreAlarm  ;
-    /**载重预警 0:正常 1:预警*/
+    @ApiModelProperty(value = "无任何预警 0:有预警 1: 无任何预警")
+    private java.lang.Integer noPreAlarm;
+    /**
+     * 载重预警 0:正常 1:预警
+     */
     @Excel(name = "载重预警 0:正常 1:预警", width = 15)
-    @ApiModelProperty(value="载重预警 0:正常 1:预警")
-    private java.lang.Integer weightPreAlarm  ;
-    /**速度预警 0:正常 1:预警*/
+    @ApiModelProperty(value = "载重预警 0:正常 1:预警")
+    private java.lang.Integer weightPreAlarm;
+    /**
+     * 速度预警 0:正常 1:预警
+     */
     @Excel(name = "速度预警 0:正常 1:预警", width = 15)
-    @ApiModelProperty(value="速度预警 0:正常 1:预警")
-    private java.lang.Integer speedPreAlarm  ;
-    /**高度预警 0:正常 1:预警*/
+    @ApiModelProperty(value = "速度预警 0:正常 1:预警")
+    private java.lang.Integer speedPreAlarm;
+    /**
+     * 高度预警 0:正常 1:预警
+     */
     @Excel(name = "高度预警 0:正常 1:预警", width = 15)
-    @ApiModelProperty(value="高度预警 0:正常 1:预警")
-    private java.lang.Integer heightPreAlarm  ;
-    /**倾角X预警  0:正常 1:预警*/
+    @ApiModelProperty(value = "高度预警 0:正常 1:预警")
+    private java.lang.Integer heightPreAlarm;
+    /**
+     * 倾角X预警  0:正常 1:预警
+     */
     @Excel(name = "倾角X预警  0:正常 1:预警", width = 15)
-    @ApiModelProperty(value="倾角X预警  0:正常 1:预警")
-    private java.lang.Integer obliguityXPreAlarm  ;
-    /**倾角Y预警  0:正常 1:预警*/
+    @ApiModelProperty(value = "倾角X预警  0:正常 1:预警")
+    private java.lang.Integer obliguityXPreAlarm;
+    /**
+     * 倾角Y预警  0:正常 1:预警
+     */
     @Excel(name = "倾角Y预警  0:正常 1:预警", width = 15)
-    @ApiModelProperty(value="倾角Y预警  0:正常 1:预警")
-    private java.lang.Integer obliguityYPreAlarm  ;
-    /**风速预警  0:正常 1:预警*/
+    @ApiModelProperty(value = "倾角Y预警  0:正常 1:预警")
+    private java.lang.Integer obliguityYPreAlarm;
+    /**
+     * 风速预警  0:正常 1:预警
+     */
     @Excel(name = "风速预警  0:正常 1:预警", width = 15)
-    @ApiModelProperty(value="风速预警  0:正常 1:预警")
-    private java.lang.Integer windSpeedPreAlarm  ;
-    /**无任何报警 0:有报警 1: 无任何报警*/
+    @ApiModelProperty(value = "风速预警  0:正常 1:预警")
+    private java.lang.Integer windSpeedPreAlarm;
+    /**
+     * 无任何报警 0:有报警 1: 无任何报警
+     */
     @Excel(name = "无任何报警 0:有报警 1: 无任何报警", width = 15)
-    @ApiModelProperty(value="无任何报警 0:有报警 1: 无任何报警")
-    private java.lang.Integer noAlarm  ;
-    /**人数报警 0:正常 1:报警*/
+    @ApiModelProperty(value = "无任何报警 0:有报警 1: 无任何报警")
+    private java.lang.Integer noAlarm;
+    /**
+     * 人数报警 0:正常 1:报警
+     */
     @Excel(name = "人数报警 0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="人数报警 0:正常 1:报警")
-    private java.lang.Integer peopleCntAlarm  ;
-    /**载重报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "人数报警 0:正常 1:报警")
+    private java.lang.Integer peopleCntAlarm;
+    /**
+     * 载重报警  0:正常 1:报警
+     */
     @Excel(name = "载重报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="载重报警  0:正常 1:报警")
-    private java.lang.Integer weightAlarm  ;
-    /**速度报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "载重报警  0:正常 1:报警")
+    private java.lang.Integer weightAlarm;
+    /**
+     * 速度报警  0:正常 1:报警
+     */
     @Excel(name = "速度报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="速度报警  0:正常 1:报警")
-    private java.lang.Integer speedAlarm  ;
-    /**高度报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "速度报警  0:正常 1:报警")
+    private java.lang.Integer speedAlarm;
+    /**
+     * 高度报警  0:正常 1:报警
+     */
     @Excel(name = "高度报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="高度报警  0:正常 1:报警")
-    private java.lang.Integer heightAlarm  ;
-    /**倾角X报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "高度报警  0:正常 1:报警")
+    private java.lang.Integer heightAlarm;
+    /**
+     * 倾角X报警  0:正常 1:报警
+     */
     @Excel(name = "倾角X报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="倾角X报警  0:正常 1:报警")
-    private java.lang.Integer obliguityXAlarm  ;
-    /**倾角Y报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "倾角X报警  0:正常 1:报警")
+    private java.lang.Integer obliguityXAlarm;
+    /**
+     * 倾角Y报警  0:正常 1:报警
+     */
     @Excel(name = "倾角Y报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="倾角Y报警  0:正常 1:报警")
-    private java.lang.Integer obliguityYAlarm  ;
-    /**风速报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "倾角Y报警  0:正常 1:报警")
+    private java.lang.Integer obliguityYAlarm;
+    /**
+     * 风速报警  0:正常 1:报警
+     */
     @Excel(name = "风速报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="风速报警  0:正常 1:报警")
-    private java.lang.Integer windSpeedAlarm  ;
-    /**1号电机报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "风速报警  0:正常 1:报警")
+    private java.lang.Integer windSpeedAlarm;
+    /**
+     * 1号电机报警  0:正常 1:报警
+     */
     @Excel(name = "1号电机报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="1号电机报警  0:正常 1:报警")
-    private java.lang.Integer motor1Alarm  ;
-    /**2号电机报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "1号电机报警  0:正常 1:报警")
+    private java.lang.Integer motor1Alarm;
+    /**
+     * 2号电机报警  0:正常 1:报警
+     */
     @Excel(name = "2号电机报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="2号电机报警  0:正常 1:报警")
-    private java.lang.Integer motor2Alarm  ;
-    /**3号电机报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "2号电机报警  0:正常 1:报警")
+    private java.lang.Integer motor2Alarm;
+    /**
+     * 3号电机报警  0:正常 1:报警
+     */
     @Excel(name = "3号电机报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="3号电机报警  0:正常 1:报警")
-    private java.lang.Integer motor3Alarm  ;
-    /**防冲顶报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "3号电机报警  0:正常 1:报警")
+    private java.lang.Integer motor3Alarm;
+    /**
+     * 防冲顶报警  0:正常 1:报警
+     */
     @Excel(name = "防冲顶报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="防冲顶报警  0:正常 1:报警")
-    private java.lang.Integer topAlarm  ;
-    /**防坠器报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "防冲顶报警  0:正常 1:报警")
+    private java.lang.Integer topAlarm;
+    /**
+     * 防坠器报警  0:正常 1:报警
+     */
     @Excel(name = "防坠器报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="防坠器报警  0:正常 1:报警")
-    private java.lang.Integer fallAlarm  ;
-    /**下限位报警  0:正常 1:报警*/
+    @ApiModelProperty(value = "防坠器报警  0:正常 1:报警")
+    private java.lang.Integer fallAlarm;
+    /**
+     * 下限位报警  0:正常 1:报警
+     */
     @Excel(name = "下限位报警  0:正常 1:报警", width = 15)
-    @ApiModelProperty(value="下限位报警  0:正常 1:报警")
-    private java.lang.Integer bottomAlarm  ;
+    @ApiModelProperty(value = "下限位报警  0:正常 1:报警")
+    private java.lang.Integer bottomAlarm;
 
     @TableField(exist = false)
-    @ApiModelProperty(value="是否有报警，0否，1是")
+    @ApiModelProperty(value = "是否有报警，0否，1是")
     private java.lang.Integer isAlarm;
 
     @TableField(exist = false)
-    @ApiModelProperty(value="报警类型")
-    private java.lang.String alarmType  ;
+    @ApiModelProperty(value = "报警类型")
+    private java.lang.String alarmType;
+    @TableField(exist = false)
+    private java.lang.String fieldAcquisitionUrl;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/LifterCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/LifterCurrentDataMapper.java
index 063ccc13b..b93493076 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/LifterCurrentDataMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/LifterCurrentDataMapper.java
@@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface LifterCurrentDataMapper extends BaseMapper<LifterCurrentData> {
 
-    EntityMap getNewestLifterCurrentData(Map<String, Object> map);
+    LifterCurrentData getNewestLifterCurrentData(Map<String, Object> map);
 
     List<LifterCurrentData> getTodayLifterCurrentDataList(Map<String, Object> map);
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterCurrentDataMapper.xml
index 689e4b209..38293d174 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterCurrentDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterCurrentDataMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.bigdevice.mapper.LifterCurrentDataMapper">
-    <select id="getNewestLifterCurrentData" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
+    <select id="getNewestLifterCurrentData" resultType="com.zhgd.xmgl.modules.bigdevice.entity.LifterCurrentData">
         <!--SELECT a.*,b.field_acquisition_url
         from lifter_current_data a LEFT JOIN worker_info b ON (a.project_sn=b.project_sn and a.driver_id_card=b.id_card)
         WHERE a.dev_sn=#{devSn}
@@ -73,4 +73,4 @@
         </if>
         order by a.recive_time desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ILifterCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ILifterCurrentDataService.java
index b71b42eae..1d7c826f2 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ILifterCurrentDataService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ILifterCurrentDataService.java
@@ -19,7 +19,7 @@ public interface ILifterCurrentDataService extends IService<LifterCurrentData> {
 
     void saveLifterCurrentData(LifterCurrentData lifterCurrentData);
 
-    EntityMap getNewestLifterCurrentData(Map<String, Object> map);
+    LifterCurrentData getNewestLifterCurrentData(Map<String, Object> map);
 
     Map<String, Object> getLifterNewestCurrentDataAndAlarm(Map<String, Object> map);
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerCurrentDataService.java
index 082e0e4f7..2479d13f3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerCurrentDataService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerCurrentDataService.java
@@ -20,7 +20,7 @@ public interface ITowerCurrentDataService extends IService<TowerCurrentData> {
 
     void saveTowerCurrentData(TowerCurrentData towerCurrentData);
 
-    EntityMap getNewestTowerCurrentData(Map<String, Object> map);
+    TowerCurrentData getNewestTowerCurrentData(Map<String, Object> map);
 
     List<TowerCurrentData> getTodayTowerCurrentDataList(Map<String, Object> map);
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterCurrentDataServiceImpl.java
index 76842241d..0f3eb4c83 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterCurrentDataServiceImpl.java
@@ -122,29 +122,29 @@ public class LifterCurrentDataServiceImpl extends ServiceImpl<LifterCurrentDataM
     }
 
     @Override
-    public EntityMap getNewestLifterCurrentData(Map<String, Object> map) {
-        EntityMap data = lifterCurrentDataMapper.getNewestLifterCurrentData(map);
-        if (data != null && StringUtils.isNotEmpty(MapUtils.getString(data, "driverIdCard"))) {
-            WorkerInfo info = workerInfoMapper.selectWorkWorkerInfoWithIDCard(MapUtils.getString(data, "driverIdCard"), MapUtils.getString(data, "projectSn"));
+    public LifterCurrentData getNewestLifterCurrentData(Map<String, Object> map) {
+        LifterCurrentData currentData = lifterCurrentDataMapper.getNewestLifterCurrentData(map);
+        if (currentData != null && StringUtils.isNotEmpty(currentData.getDriverIdCard())) {
+            WorkerInfo info = workerInfoMapper.selectWorkWorkerInfoWithIDCard(currentData.getDriverIdCard(), currentData.getProjectSn());
             if (info != null) {
-                data.put("field_acquisition_url", info.getFieldAcquisitionUrl());
+                currentData.setFieldAcquisitionUrl(info.getFieldAcquisitionUrl());
             } else {
-                data.put("field_acquisition_url", "");
+                currentData.setFieldAcquisitionUrl("");
             }
         }
-        return data;
+        return currentData;
     }
 
     @Override
     public Map<String, Object> getLifterNewestCurrentDataAndAlarm(Map<String, Object> map) {
         Map<String, Object> data = new HashMap<>();
-        EntityMap currentData = lifterCurrentDataMapper.getNewestLifterCurrentData(map);
-        if (currentData != null && StringUtils.isNotEmpty(MapUtils.getString(currentData, "driverIdCard"))) {
-            WorkerInfo info = workerInfoMapper.selectWorkWorkerInfoWithIDCard(MapUtils.getString(currentData, "driverIdCard"), MapUtils.getString(currentData, "projectSn"));
+        LifterCurrentData currentData = lifterCurrentDataMapper.getNewestLifterCurrentData(map);
+        if (currentData != null && StringUtils.isNotEmpty(currentData.getDriverIdCard())) {
+            WorkerInfo info = workerInfoMapper.selectWorkWorkerInfoWithIDCard(currentData.getDriverIdCard(), currentData.getProjectSn());
             if (info != null) {
-                currentData.put("field_acquisition_url", info.getFieldAcquisitionUrl());
+                currentData.setFieldAcquisitionUrl(info.getFieldAcquisitionUrl());
             } else {
-                currentData.put("field_acquisition_url", "");
+                currentData.setFieldAcquisitionUrl("");
             }
         }
         /*if(currentData!=null){
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java
index 2b2718f35..60a2e7428 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java
@@ -1,5 +1,7 @@
 package com.zhgd.xmgl.modules.bigdevice.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -134,7 +136,7 @@ public class TowerCurrentDataServiceImpl extends ServiceImpl<TowerCurrentDataMap
     }
 
     @Override
-    public EntityMap getNewestTowerCurrentData(Map<String, Object> map) {
+    public TowerCurrentData getNewestTowerCurrentData(Map<String, Object> map) {
         EntityMap data = towerCurrentDataMapper.getNewestTowerCurrentData(map);
         if (data != null && StringUtils.isNotEmpty(MapUtils.getString(data, "driverIdCard"))) {
             WorkerInfo info = workerInfoMapper.selectWorkWorkerInfoWithIDCard(MapUtils.getString(data, "driverIdCard"), MapUtils.getString(data, "projectSn"));
@@ -144,7 +146,8 @@ public class TowerCurrentDataServiceImpl extends ServiceImpl<TowerCurrentDataMap
                 data.put("field_acquisition_url", "");
             }
         }
-        return data;
+        TowerCurrentData towerCurrentData = BeanUtil.toBean(data, TowerCurrentData.class);
+        return towerCurrentData;
     }
 
     @Override
@@ -174,7 +177,7 @@ public class TowerCurrentDataServiceImpl extends ServiceImpl<TowerCurrentDataMap
     @Override
     public Map<String, Object> getTowerNewestCurrentDataAndAlarm(Map<String, Object> map) {
         Map<String, Object> data = new HashMap<>();
-        EntityMap currentData = getNewestTowerCurrentData(map);
+        TowerCurrentData currentData = getNewestTowerCurrentData(map);
         /*if(currentData!=null){
             QueryWrapper<TowerAlarm> queryWrapper=new QueryWrapper<>();
             queryWrapper.lambda().eq(TowerAlarm::getProjectSn, MapUtils.getString(currentData,"projectSn"))
diff --git a/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationCurrentDataServiceImpl.java
index fa5c969e6..2e3cfebe8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationCurrentDataServiceImpl.java
@@ -35,6 +35,7 @@ import com.zhgd.xmgl.modules.highformwork.entity.vo.NumberDifferentTypesAlarmsRa
 import com.zhgd.xmgl.util.JxlExcelUtils;
 import com.zhgd.xmgl.util.MessageUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.nullness.Opt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressItemController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressItemController.java
index 8fbdb80ba..f52dc7fd7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressItemController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressItemController.java
@@ -1,29 +1,58 @@
 package com.zhgd.xmgl.modules.project.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.xmgl.modules.project.entity.vo.ProgressItemOverdueListVo;
+import com.zhgd.xmgl.modules.project.service.ProgressTaskAlarmService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.jcodings.util.Hash;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 
 
 /**
  * @Title: Controller
- * @Description: 进度管理-临时
+ * @Description: 进度管理
  * @author： qpy
  * @date： 2023-02-03
  */
 @RestController
 @RequestMapping("/xmgl/progressItem")
 @Slf4j
-@Api(tags = "进度管理-临时")
+@Api(tags = "进度管理")
 public class ProgressItemController {
+    @Autowired
+    private ProgressTaskAlarmService progressTaskAlarmService;
+
+    /**
+     * 按人员查询进度预警列表
+     *
+     * @return
+     */
     @PostMapping(value = "/selectPersonOverdueProgressItemNumList")
     public Result<List<Object>> selectPersonOverdueProgressItemNumList() {
+        /**
+         * 人员姓名
+         * 超期任务数
+         */
         return Result.success(Collections.emptyList());
     }
-}
\ No newline at end of file
+
+    /**
+     * 按任务查询进度预警列表
+     *
+     * @return
+     */
+    @PostMapping(value = "selectProgressItemOverdueList")
+    @ApiImplicitParam(name = "projectSn", required = true, value = "项目sn", paramType = "query")
+    public Result<List<ProgressItemOverdueListVo>> selectProgressItemOverdueList(@RequestBody HashMap<String, Object> map) {
+        return Result.success(progressTaskAlarmService.selectProgressItemOverdueList(map));
+    }
+
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/ProgressItemOverdueListVo.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/ProgressItemOverdueListVo.java
new file mode 100644
index 000000000..84d343e8b
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/ProgressItemOverdueListVo.java
@@ -0,0 +1,15 @@
+package com.zhgd.xmgl.modules.project.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+@Data
+public class ProgressItemOverdueListVo {
+    @ApiModelProperty(value = "任务")
+    private String subitemProjectName;
+    @ApiModelProperty(value = "负责人")
+    private String personChargeName;
+    @ApiModelProperty(value = "超期天数")
+    private Integer overdueDayNum;
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressTaskAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressTaskAlarmMapper.java
index 2a69dc0b3..6402cede4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressTaskAlarmMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressTaskAlarmMapper.java
@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.project.entity.ProgressTaskAlarm;
 import com.zhgd.xmgl.modules.project.entity.qo.ProgressTaskAlarmQO;
+import com.zhgd.xmgl.modules.project.entity.vo.ProgressItemOverdueListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -27,5 +29,7 @@ public interface ProgressTaskAlarmMapper extends BaseMapper<ProgressTaskAlarm> {
     int insertOrUpdateBatch(@Param("entities") List<ProgressTaskAlarm> entities);
 
     Page<ProgressTaskAlarm> selectPageDetails(Page<ProgressTaskAlarm> page, @Param("progressTaskAlarmQo") ProgressTaskAlarmQO progressTaskAlarmQo);
+
+    Page<ProgressItemOverdueListVo> selectProgressItemOverdueList(Page<ProgressItemOverdueListVo> page, HashMap<String, Object> map);
 }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressTaskAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressTaskAlarmMapper.xml
index 2fcee2020..ed538112b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressTaskAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressTaskAlarmMapper.xml
@@ -63,5 +63,23 @@
             and su.real_name like concat('%', #{progressTaskAlarmQo.dutyUserName}, '%')
         </if>
     </select>
+
+    <select id="selectProgressItemOverdueList"
+            resultType="com.zhgd.xmgl.modules.project.entity.vo.ProgressItemOverdueListVo">
+        SELECT
+        pt.task_name as subitemProjectName,
+        su.real_name as personChargeName,
+        TIMESTAMPDIFF(DAY, pt.finish_date,pta.create_date) as overdueDayNum
+        FROM
+        progress_task_alarm pta
+        JOIN progress_task pt ON pt.id = pta.task_id
+        LEFT JOIN system_user su ON su.user_id = pt.duty_user_id
+        <where>
+            <if test="map.projectSn != null and map.projectSn != ''">
+                pt.project_sn = #{map.projectSn}
+            </if>
+        </where>
+        order by pta.create_date desc
+    </select>
 </mapper>
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
index b01f4dbf1..3d25f6e47 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
@@ -4,17 +4,21 @@
     <select id="selectProjectPage" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
         SELECT a.*, b.company_name, c.province province_name, d.city city_name, e.area area_name
         FROM project a
-                 INNER JOIN company b ON a.company_sn = b.company_sn
-                 LEFT JOIN system_provinces c ON a.provinces_code = c.provinceid
-                 LEFT JOIN system_cities d ON a.city_code = d.cityid
-                 LEFT JOIN system_areas e ON a.area_code = e.areaid
-        WHERE b.headquarters_sn = #{param.headquartersSn}
-        <if test="param.companySn != null and param.companySn != ''">
-            and a.company_sn = #{param.companySn}
-        </if>
-        <if test="param.projectName != null and param.projectName != ''">
-            and a.project_name like CONCAT(CONCAT('%', #{param.projectName}), '%')
-        </if>
+        INNER JOIN company b ON a.company_sn = b.company_sn
+        LEFT JOIN system_provinces c ON a.provinces_code = c.provinceid
+        LEFT JOIN system_cities d ON a.city_code = d.cityid
+        LEFT JOIN system_areas e ON a.area_code = e.areaid
+        <where>
+            <if test="param.headquartersSn != null and param.headquartersSn != ''">
+                b.headquarters_sn = #{param.headquartersSn}
+            </if>
+            <if test="param.companySn != null and param.companySn != ''">
+                and a.company_sn = #{param.companySn}
+            </if>
+            <if test="param.projectName != null and param.projectName != ''">
+                and a.project_name like CONCAT(CONCAT('%', #{param.projectName}), '%')
+            </if>
+        </where>
     </select>
     <select id="getProjectInfoById" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" parameterType="map">
         SELECT a.*, b.company_name, c.province province_name, d.city city_name, e.area area_name
@@ -675,4 +679,4 @@
                  LEFT JOIN video_item vi ON vi.video_id = pvc.id
         GROUP BY p.project_sn
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskAlarmService.java
index e15bd2b7e..7ab24fa0f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskAlarmService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskAlarmService.java
@@ -1,9 +1,14 @@
 package com.zhgd.xmgl.modules.project.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhgd.xmgl.modules.project.entity.ProgressTaskAlarm;
 import com.zhgd.xmgl.modules.project.entity.qo.ProgressTaskAlarmQO;
+import com.zhgd.xmgl.modules.project.entity.vo.ProgressItemOverdueListVo;
+
+import java.util.HashMap;
+import java.util.List;
 
 
 /**
@@ -14,5 +19,7 @@ import com.zhgd.xmgl.modules.project.entity.qo.ProgressTaskAlarmQO;
  */
 public interface ProgressTaskAlarmService extends IService<ProgressTaskAlarm> {
     Page<ProgressTaskAlarm> selectPageDetails(Page<ProgressTaskAlarm> page, ProgressTaskAlarmQO progressTaskAlarmQo);
+
+    List<ProgressItemOverdueListVo> selectProgressItemOverdueList(HashMap<String, Object> map);
 }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java
index ac7a287ce..a5bf8cfa9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java
@@ -1,18 +1,20 @@
 package com.zhgd.xmgl.modules.project.service.impl;
 
-import cn.hutool.core.text.CharSequenceUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.xmgl.modules.project.entity.ProgressTaskAlarm;
 import com.zhgd.xmgl.modules.project.entity.qo.ProgressTaskAlarmQO;
+import com.zhgd.xmgl.modules.project.entity.vo.ProgressItemOverdueListVo;
 import com.zhgd.xmgl.modules.project.mapper.ProgressTaskAlarmMapper;
 import com.zhgd.xmgl.modules.project.service.ProgressTaskAlarmService;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+
 
 /**
  * 进度甘特图-报警信息(ProgressTaskAlarm)表服务实现类
@@ -27,7 +29,19 @@ public class ProgressTaskAlarmServiceImpl extends ServiceImpl<ProgressTaskAlarmM
 
     @Override
     public Page<ProgressTaskAlarm> selectPageDetails(Page<ProgressTaskAlarm> page, ProgressTaskAlarmQO progressTaskAlarmQo) {
-        return progressTaskAlarmMapper.selectPageDetails(page,progressTaskAlarmQo);
+        return progressTaskAlarmMapper.selectPageDetails(page, progressTaskAlarmQo);
+    }
+
+    @Override
+    public List<ProgressItemOverdueListVo> selectProgressItemOverdueList(HashMap<String, Object> map) {
+        //String projectSn, Integer pageNo, Integer pageSize
+        map.putIfAbsent("pageNo", 1);
+        map.putIfAbsent("pageSize", 20);
+        Integer pageNo = MapUtils.getInteger(map, "pageNo");
+        Integer pageSize = MapUtils.getInteger(map, "pageSize");
+        Page<ProgressItemOverdueListVo> page = new Page<>(pageNo, pageSize);
+        Page<ProgressItemOverdueListVo> ps = progressTaskAlarmMapper.selectProgressItemOverdueList(page, map);
+        return ps.getRecords();
     }
 }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/controller/ProjectOperationsAnalysisController.java b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/controller/ProjectOperationsAnalysisController.java
index 6795461cb..173fa1a4e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/controller/ProjectOperationsAnalysisController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/controller/ProjectOperationsAnalysisController.java
@@ -73,15 +73,17 @@ public class ProjectOperationsAnalysisController {
     @ApiOperation(value = " 查询考勤统计列表", notes = "查询考勤统计列表", httpMethod = "GET")
     @GetMapping(value = "/selectAttendanceDetailByPage")
     public  Result<Page<WorkerMonthAttendanceStatisticsVo>> selectAttendanceDetailByPage(@RequestParam(name = "workerName", required = false) String workerName,
-                                                     @RequestParam(name = "projectSn", required = true) String projectSn,
-                                                     @RequestParam(name = "personType", required = false) String personType,
-                                                     @RequestParam(name = "groupId", required = false) Long groupId,
-                                                     @RequestParam(name = "workerTypeId", required = false) Long workerTypeId,
-                                                     @RequestParam(name = "time", required = false) String time,
-                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+                                                                                         @RequestParam(name = "projectSn", required = false) String projectSn,
+                                                                                         @RequestParam(name = "personType", required = false) String personType,
+                                                                                         @RequestParam(name = "groupId", required = false) Long groupId,
+                                                                                         @RequestParam(name = "workerTypeId", required = false) Long workerTypeId,
+                                                                                         @RequestParam(name = "time", required = false) String time,
+                                                                                         @RequestParam(name = "queryTime", required = false) String queryTime,
+                                                                                         @RequestParam(name = "personSn", required = false) String personSn,
+                                                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         Result<Page<WorkerMonthAttendanceStatisticsVo>> result = new Result<>();
-        Page<WorkerMonthAttendanceStatisticsVo> list= projectOperationsAnalysisService.selectAttendanceDetailByPage(workerName,projectSn,groupId,workerTypeId,time,pageNo,pageSize,personType);
+        Page<WorkerMonthAttendanceStatisticsVo> list = projectOperationsAnalysisService.selectAttendanceDetailByPage(workerName, projectSn, groupId, workerTypeId, time, queryTime, personSn, pageNo, pageSize, personType);
         result.setResult(list);
         result.setSuccess(true);
         result.setCode(200);
diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/entity/vo/WorkerMonthAttendanceStatisticsVo.java b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/entity/vo/WorkerMonthAttendanceStatisticsVo.java
index 5dfc83b17..f41e4b9bc 100644
--- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/entity/vo/WorkerMonthAttendanceStatisticsVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/entity/vo/WorkerMonthAttendanceStatisticsVo.java
@@ -132,14 +132,24 @@ public class WorkerMonthAttendanceStatisticsVo {
     private java.lang.Integer day28  ;
     /**day29*/
     @Excel(name = "day29", width = 15)
-    @ApiModelProperty(value="day29")
-    private java.lang.Integer day29  ;
-    /**day30*/
+    @ApiModelProperty(value = "day29")
+    private java.lang.Integer day29;
+    /**
+     * day30
+     */
     @Excel(name = "day30", width = 15)
-    @ApiModelProperty(value="day30")
-    private java.lang.Integer day30  ;
-    /**day31*/
+    @ApiModelProperty(value = "day30")
+    private java.lang.Integer day30;
+    /**
+     * day31
+     */
     @Excel(name = "day31", width = 15)
-    @ApiModelProperty(value="day31")
-    private java.lang.Integer day31  ;
+    @ApiModelProperty(value = "day31")
+    private java.lang.Integer day31;
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+    @ApiModelProperty(value = "身份证头像")
+    private String idCardBigPhotoUrl;
+    @ApiModelProperty(value = "企业名称")
+    private String enterpriseName;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/ProjectOperationsAnalysisMapper.java b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/ProjectOperationsAnalysisMapper.java
index c8fa94280..def3e8f23 100644
--- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/ProjectOperationsAnalysisMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/ProjectOperationsAnalysisMapper.java
@@ -23,7 +23,7 @@ public interface ProjectOperationsAnalysisMapper extends BaseMapper<ProjectOpera
 
     List<ProjectOperationsAnalysis> getAllDetails();
 
-    Page<WorkerMonthAttendanceStatisticsVo> selectAttendanceDetailByPage(Page<WorkerMonthAttendanceStatisticsVo> page, @Param("workerName") String workerName, @Param("projectSn") String projectSn, @Param("groupId") Long groupId, @Param("workerTypeId") Long workerTypeId, @Param("time") String time, @Param("personType")String personType );
+    Page<WorkerMonthAttendanceStatisticsVo> selectAttendanceDetailByPage(Page<WorkerMonthAttendanceStatisticsVo> page, @Param("workerName") String workerName, @Param("projectSn") String projectSn, @Param("groupId") Long groupId, @Param("workerTypeId") Long workerTypeId, @Param("time") String time, @Param("queryTime") String queryTime, @Param("personSn") String personSn, @Param("personType") String personType);
 
     Page<TodayAttendance> selectWorkerTodayAttendancePageList(Page<TodayAttendance> page, @Param("projectSn") String projectSn);
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/xml/ProjectOperationsAnalysisMapper.xml b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/xml/ProjectOperationsAnalysisMapper.xml
index 7caa6b21c..09090643f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/xml/ProjectOperationsAnalysisMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/mapper/xml/ProjectOperationsAnalysisMapper.xml
@@ -47,19 +47,40 @@
         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
+        day29, day30, 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 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
-        where i.project_sn=#{projectSn}
-        <if test="personType!=null and personType!=''">AND i.person_type=#{personType}</if>
-        <if test="time!=null and time!=''">AND s.query_time=#{time}</if>
-        <if test="groupId!=null and groupId!=''">AND i.team_id = #{groupId}</if>
-        <if test="workerTypeId!=null and workerTypeId!=''">AND t.id = #{workerTypeId}</if>
-        <if test="workerName!=null and workerName!=''">AND i.worker_name like concat ('%',#{workerName},'%')</if>
+        LEFT JOIN enterprise_info ei on ei.id=tm.enterprise_id
+        where 1=1
+        <if test="projectSn != null and projectSn != ''">
+            AND i.project_sn=#{projectSn}
+        </if>
+        <if test="personType != null and personType != ''">
+            AND i.person_type=#{personType}
+        </if>
+        <if test="time != null and time != ''">
+            AND s.query_time=#{time}
+        </if>
+        <if test="groupId != null and groupId != ''">
+            AND i.team_id = #{groupId}
+        </if>
+        <if test="workerTypeId != null and workerTypeId != ''">
+            AND t.id = #{workerTypeId}
+        </if>
+        <if test="workerName != null and workerName != ''">
+            AND i.worker_name like concat ('%',#{workerName},'%')
+        </if>
+        <if test="queryTime != null and queryTime != ''">
+            AND s.query_time=#{queryTime}
+        </if>
+        <if test="personSn != null and personSn != ''">
+            AND i.person_sn=#{personSn}
+        </if>
+        order by s.query_time desc
     </select>
     <select id="selectWorkerTodayAttendancePageList"
             resultType="com.zhgd.xmgl.modules.realnamestatistics.entity.vo.TodayAttendance">
diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/IProjectOperationsAnalysisService.java b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/IProjectOperationsAnalysisService.java
index 885c137bb..526002387 100644
--- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/IProjectOperationsAnalysisService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/IProjectOperationsAnalysisService.java
@@ -29,7 +29,7 @@ public interface IProjectOperationsAnalysisService extends IService<ProjectOpera
 
     List<WorkerType> getAllWorkerType(String projectSn);
 
-    Page<WorkerMonthAttendanceStatisticsVo> selectAttendanceDetailByPage(String workerName, String projectSn, Long groupId, Long workerTypeId, String time, Integer pageNo, Integer pageSize, String personnelType);
+    Page<WorkerMonthAttendanceStatisticsVo> selectAttendanceDetailByPage(String workerName, String projectSn, Long groupId, Long workerTypeId, String time, String queryTime, String personSn, Integer pageNo, Integer pageSize, String personnelType);
 
     Page<TodayAttendance> selectWorkerTodayAttendancePageList(String projectSn, Integer pageNo, Integer pageSize, String personType);
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/impl/ProjectOperationsAnalysisServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/impl/ProjectOperationsAnalysisServiceImpl.java
index 4a671ca6d..6ffa8dac0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/impl/ProjectOperationsAnalysisServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/realnamestatistics/service/impl/ProjectOperationsAnalysisServiceImpl.java
@@ -13,7 +13,8 @@ import com.zhgd.xmgl.modules.realnamestatistics.entity.vo.WorkerMonthAttendanceS
 import com.zhgd.xmgl.modules.realnamestatistics.mapper.ProjectOperationsAnalysisMapper;
 import com.zhgd.xmgl.modules.realnamestatistics.service.IProjectOperationsAnalysisService;
 import com.zhgd.xmgl.modules.realnamestatistics.service.IProjectTotalStatisticsService;
-import com.zhgd.xmgl.modules.worker.entity.*;
+import com.zhgd.xmgl.modules.worker.entity.TeamInfo;
+import com.zhgd.xmgl.modules.worker.entity.WorkerType;
 import com.zhgd.xmgl.modules.worker.service.ITeamInfoService;
 import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService;
 import com.zhgd.xmgl.modules.worker.service.IWorkerTypeService;
@@ -64,14 +65,14 @@ public class ProjectOperationsAnalysisServiceImpl extends ServiceImpl<ProjectOpe
             for (ProjectOperationsAnalysis projectOperationsAnalysis : analysisList) {
                 String projectSn = projectOperationsAnalysis.getProjectSn();
                 //查询今日打卡的劳务人员和管理人员
-                Integer labourAttendance=baseMapper.getLabourAttendance(projectSn);
-                Integer manageAttendance=baseMapper.getManageAttendance(projectSn);
+                Integer labourAttendance = baseMapper.getLabourAttendance(projectSn);
+                Integer manageAttendance = baseMapper.getManageAttendance(projectSn);
                 projectOperationsAnalysis.setLabourAttendanceNum(labourAttendance);
                 projectOperationsAnalysis.setManageAttendanceNum(manageAttendance);
                 //查询项目已培训和未培训人员
-                Integer educated=baseMapper.getEducated(projectSn);
+                Integer educated = baseMapper.getEducated(projectSn);
                 projectOperationsAnalysis.setEducated(educated);
-                projectOperationsAnalysis.setNotEducated(projectOperationsAnalysis.getTotalWorkerNum()-educated);
+                projectOperationsAnalysis.setNotEducated(projectOperationsAnalysis.getTotalWorkerNum() - educated);
             }
             List<ProjectOperationsAnalysis> list = baseMapper.selectList(null);
             for (ProjectOperationsAnalysis projectOperationsAnalysis : list) {
@@ -92,7 +93,7 @@ public class ProjectOperationsAnalysisServiceImpl extends ServiceImpl<ProjectOpe
     public Map<String, Object> selectProjectOperationsAnalysisList(String projectName) {
         Map<String, Object> result = new HashMap<>();
         try {
-            List<ProjectOperationsAnalysis> list =baseMapper.selectAll(projectName);
+            List<ProjectOperationsAnalysis> list = baseMapper.selectAll(projectName);
             //查询统计数量
             List<ProjectTotalStatistics> statistics = projectTotalStatisticsService.list(null);
             HashMap<String, Object> dataMap = new HashMap<>();
@@ -135,13 +136,13 @@ public class ProjectOperationsAnalysisServiceImpl extends ServiceImpl<ProjectOpe
     @Override
     public Page<WorkerAttendanceVo> getWorkerAttendanceByDay(Integer pageNo, Integer pageSize, String personSn, String time) {
         Page<WorkerAttendanceVo> page = new Page<>(pageNo, pageSize);
-        return baseMapper.getWorkerAttendanceByDay(page, personSn,time);
+        return baseMapper.getWorkerAttendanceByDay(page, personSn, time);
     }
 
     @Override
-    public Page<WorkerMonthAttendanceStatisticsVo> selectAttendanceDetailByPage(String workerName, String projectSn, Long groupId, Long workerTypeId, String time, Integer pageNo, Integer pageSize, String personType) {
+    public Page<WorkerMonthAttendanceStatisticsVo> selectAttendanceDetailByPage(String workerName, String projectSn, Long groupId, Long workerTypeId, String time, String queryTime, String personSn, Integer pageNo, Integer pageSize, String personType) {
         Page<WorkerMonthAttendanceStatisticsVo> page = new Page<>(pageNo, pageSize);
-        return baseMapper.selectAttendanceDetailByPage(page, workerName, projectSn, groupId, workerTypeId, time, personType);
+        return baseMapper.selectAttendanceDetailByPage(page, workerName, projectSn, groupId, workerTypeId, time, queryTime, personSn, personType);
 
     }
 
@@ -150,11 +151,11 @@ public class ProjectOperationsAnalysisServiceImpl extends ServiceImpl<ProjectOpe
         Page<TodayAttendance> page = new Page<>(pageNo, pageSize);
         if (personType.equals("1")) {
             return baseMapper.selectWorkerTodayAttendancePageList(page, projectSn);
-        }else if (personType.equals("2")) {
+        } else if (personType.equals("2")) {
             return baseMapper.selectWorkerTodayAttendancePageListForMange(page, projectSn);
-        }else if(personType.equals("3")) {
+        } else if (personType.equals("3")) {
             return baseMapper.selectAllWorker(page, projectSn);
-        }else {
+        } else {
             return baseMapper.selectUnEducated(page, projectSn);
         }
     }
@@ -166,9 +167,9 @@ public class ProjectOperationsAnalysisServiceImpl extends ServiceImpl<ProjectOpe
     }
 
     @Override
-    public Page<TodayAttendance> selectWorkerTodayAcidList(String projectSn, Integer pageNo, Integer pageSize, String codeState,String workerClassify  ,String vaccineStatus,String noVaccine) {
+    public Page<TodayAttendance> selectWorkerTodayAcidList(String projectSn, Integer pageNo, Integer pageSize, String codeState, String workerClassify, String vaccineStatus, String noVaccine) {
         Page<WorkerAttendanceVo> page = new Page<>(pageNo, pageSize);
-        return baseMapper.selectWorkerTodayAcidList(page, codeState!=null?Integer.parseInt(codeState):null, projectSn, workerClassify!=null?Integer.parseInt(workerClassify):null,vaccineStatus!=null?Integer.parseInt(vaccineStatus):null,noVaccine!=null?Integer.parseInt(noVaccine):null);
+        return baseMapper.selectWorkerTodayAcidList(page, codeState != null ? Integer.parseInt(codeState) : null, projectSn, workerClassify != null ? Integer.parseInt(workerClassify) : null, vaccineStatus != null ? Integer.parseInt(vaccineStatus) : null, noVaccine != null ? Integer.parseInt(noVaccine) : null);
     }
 
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerWagesPaymentController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerWagesPaymentController.java
index 2f775129a..bc89b5011 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerWagesPaymentController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerWagesPaymentController.java
@@ -78,7 +78,7 @@ public class WorkerWagesPaymentController {
             @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "inserviceType", value = "在职状态  1在职  2离职", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "personType", value = "人员类型  1、劳务人员   2、管理人员", paramType = "query", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
     })
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 bad4328f4..865f16a43 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
@@ -350,11 +350,15 @@
         IFNULL(sum((CASE WHEN w1.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal,
         COUNT(distinct w1.team_id) total_team_num
         FROM worker_info w1
-        WHERE w1.project_sn = #{projectSn}
-        and w1.inService_type = 1
-        <if test="userEnterpriseId != null and userEnterpriseId != ''">
-            and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
-        </if>
+        <where>
+            <if test="projectSn != null and projectSn != ''">
+                w1.project_sn = #{projectSn}
+            </if>
+            and w1.inService_type = 1
+            <if test="userEnterpriseId != null and userEnterpriseId != ''">
+                and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
+            </if>
+        </where>
     </select>
     <select id="selectPresenceWorkerPersonTypeTotal" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT COUNT(1) totalPerson,
@@ -365,12 +369,16 @@
         from worker_info w1
         INNER JOIN worker_attendance_presence p ON w1.person_sn = p.person_sn
         Left JOIN team_info g ON (w1.project_sn = g.project_sn and w1.team_id = g.id)
-        WHERE w1.project_sn = #{projectSn}
-        and w1.inService_type = 1
-        <!--and p.create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00')-->
-        <if test="userEnterpriseId != null and userEnterpriseId != ''">
-            and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
-        </if>
+        <where>
+            <if test="projectSn != null and projectSn != ''">
+                w1.project_sn = #{projectSn}
+            </if>
+            and w1.inService_type = 1
+            <!--and p.create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00')-->
+            <if test="userEnterpriseId != null and userEnterpriseId != ''">
+                and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
+            </if>
+        </where>
     </select>
 
     <select id="selectSceneTotal" resultType="java.lang.Long" parameterType="java.lang.String">
@@ -902,12 +910,16 @@
         (SELECT DISTINCT w1.*
         from worker_info w1
         INNER JOIN worker_attendance p ON w1.person_sn = p.person_sn
-        WHERE w1.project_sn = #{projectSn}
-        and w1.inService_type = 1
-        and p.create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
-        <if test="userEnterpriseId != null and userEnterpriseId != ''">
-            and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
-        </if>
+        <where>
+            <if test="projectSn != null and projectSn != ''">
+                w1.project_sn = #{projectSn}
+            </if>
+            and w1.inService_type = 1
+            and p.create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
+            <if test="userEnterpriseId != null and userEnterpriseId != ''">
+                and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
+            </if>
+        </where>
         ) tp
     </select>
     <select id="selectYesterdayAttendanceWorkerPersonTypeTotal" resultType="java.util.Map">
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationMapper.xml
index 81b8c4cf8..c075df0ad 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationMapper.xml
@@ -165,10 +165,12 @@
     <select id="getProjectSafeEducationPersonToltal" resultType="int" parameterType="map">
         SELECT COUNT(DISTINCT w2.worker_id)
         from worker_safe_education w1
-                 INNER JOIN worker_safe_education_worker w2 ON w1.id = w2.edu_id
-                 INNER JOIN worker_info w3 ON w2.worker_id = w3.id
+        INNER JOIN worker_safe_education_worker w2 ON w1.id = w2.edu_id
+        INNER JOIN worker_info w3 ON w2.worker_id = w3.id
         WHERE w3.inService_type = 1
-          and w3.project_sn = #{projectSn}
+        <if test="projectSn != null and projectSn != ''">
+            and w3.project_sn = #{projectSn}
+        </if>
         <if test="userEnterpriseId != null and userEnterpriseId != ''">
             and FIND_IN_SET(w3.enterprise_id, #{userEnterpriseId})
         </if>
@@ -200,4 +202,4 @@
         order by edu_time desc
         limit 20
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
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 9bee91f18..a7356cbce 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
@@ -6,27 +6,32 @@
         SELECT a.id worker_id,a.worker_name,a.id_card,a.person_type,a.inService_type,
                b.team_name,c.department_name,
                en.enterprise_name,
-               wp.id,a.person_sn,a.project_sn,IFNULL(wp.pay_month,#{param.payMonth}) pay_month,wp.pay_gross,wp.pay_net,wp.balance_date,wp.pay_status,
-               wp.days,wp.work_hours,wp.bank_balance_date,a.pay_roll_bank_name,a.pay_roll_bank_number,
-               (CASE WHEN a.person_type=1 THEN b.team_name
+        wp.id,a.person_sn,a.project_sn,IFNULL(wp.pay_month,#{param.payMonth})
+        pay_month,wp.pay_gross,wp.pay_net,wp.balance_date,wp.pay_status,
+        wp.days,wp.work_hours,wp.bank_balance_date,a.pay_roll_bank_name,a.pay_roll_bank_number,
+        (CASE WHEN a.person_type=1 THEN b.team_name
         WHEN a.person_type=2 THEN c.department_name
         ELSE '' END) department_team_name
         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})
+        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})
         LEFT JOIN team_info b ON a.team_id=b.id
         LEFT JOIN department_info c ON a.department_id=c.id
         LEFT JOIN enterprise_info en ON en.id=a.enterprise_id
-        where a.project_sn=#{param.projectSn}
-        <if test="param.workerName!=null and param.workerName!=''">
+        where 1=1
+        <if test="param.projectSn != null and param.projectSn != ''">
+            and a.project_sn=#{param.projectSn}
+        </if>
+        <if test="param.workerName != null and param.workerName != ''">
             and a.worker_name like CONCAT(CONCAT('%',#{param.workerName}),'%')
         </if>
-        <if test="param.idCard!=null and param.idCard!=''">
+        <if test="param.idCard != null and param.idCard != ''">
             and a.id_card like CONCAT(CONCAT('%',#{param.idCard}),'%')
         </if>
-        <if test="param.enterpriseId!=null and param.enterpriseId!=''">
+        <if test="param.enterpriseId != null and param.enterpriseId != ''">
             and a.enterprise_id=#{param.enterpriseId}
         </if>
-        <if test="param.userEnterpriseId!=null and param.userEnterpriseId!=''">
+        <if test="param.userEnterpriseId != null and param.userEnterpriseId != ''">
             and  FIND_IN_SET(a.enterprise_id,#{param.userEnterpriseId})
         </if>
         <if test="param.inserviceType!=null and param.inserviceType!=''">
diff --git a/src/main/java/com/zhgd/xmgl/util/AqiUtil.java b/src/main/java/com/zhgd/xmgl/util/AqiUtil.java
index e452b4190..4e84458df 100644
--- a/src/main/java/com/zhgd/xmgl/util/AqiUtil.java
+++ b/src/main/java/com/zhgd/xmgl/util/AqiUtil.java
@@ -1,7 +1,9 @@
 package com.zhgd.xmgl.util;
 
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.gexin.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
@@ -163,13 +165,26 @@ public class AqiUtil {
         String result = "";
         try {
             Map<String, Object> param = new HashMap<>();
+            param.put("unescape", "1");
             param.put("appid", "79112751");
             param.put("appsecret", "EBqjU987");
-            param.put("version", "v1");
+            param.put("version", "v9");
             if (StringUtils.isNotEmpty(cityid)) {
                 param.put("cityid", cityid);
             }
-            result = HttpUtil.get("https://tianqiapi.com/api", param);
+            result = HttpUtil.get("https://v0.yiketianqi.com/api", param);
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONArray sevenDataArr = jsonObject.getJSONArray("data");
+            for (Object o : sevenDataArr) {
+                JSONObject jo = (JSONObject) o;
+                jo.put("cityid", jsonObject.get("cityid"));
+                jo.put("city", jsonObject.get("city"));
+                jo.put("cityEn", jsonObject.get("cityEn"));
+                jo.put("country", jsonObject.get("country"));
+                jo.put("countryEn", jsonObject.get("countryEn"));
+                jo.put("update_time", jsonObject.get("update_time"));
+            }
+            result = JSON.toJSONString(sevenDataArr);
             log.info(result);
         } catch (Exception e) {
             e.printStackTrace();