From cd869ac16ec48d886a6fccae2e51203be586a31e Mon Sep 17 00:00:00 2001 From: guo Date: Wed, 31 Jan 2024 16:09:49 +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 --- .../modules/bigdevice/entity/TowerAlarm.java | 16 +++++++------- .../xml/GantryCraneCurrentDataMapper.xml | 5 +++-- .../mapper/xml/LifterWorkCycleMapper.xml | 1 + .../entity/BridgeErectMachineData.java | 6 ++++++ .../xml/BridgeErectMachineDataMapper.xml | 21 +++++++++++++------ .../controller/WorkerInfoController.java | 1 + .../modules/worker/entity/WorkerInfo.java | 5 ++++- .../worker/mapper/xml/WorkerInfoMapper.xml | 7 ++++++- 8 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TowerAlarm.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TowerAlarm.java index 77f244332..2d0e5e369 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TowerAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TowerAlarm.java @@ -218,15 +218,6 @@ public class TowerAlarm implements Serializable { @ApiModelProperty(value = "推送人id字符串数组") private java.lang.String pushPersonIds; - /** - * 推送人id字符串数组 - */ - @Excel(name = "推送人名称数组", width = 15) - @ApiModelProperty(value = "推送人名称数组") - @TableField(exist = false) - private java.lang.String pushPersonNames; - - /** * 要求整改时间 */ @@ -234,4 +225,11 @@ public class TowerAlarm implements Serializable { @ApiModelProperty(value = "要求整改时间") private java.lang.String requestRectificationDate; + /** + * 推送人id字符串数组 + */ + @Excel(name = "推送人名称数组", width = 15) + @ApiModelProperty(value = "推送人名称数组") + @TableField(exist = false) + private java.lang.String pushPersonNames; } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneCurrentDataMapper.xml index 3f6f40e5f..6676b0eee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneCurrentDataMapper.xml @@ -3,8 +3,9 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java index be60f6e05..34be07601 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java @@ -141,6 +141,7 @@ public class WorkerInfoController { @ApiImplicitParam(name = "belongingSection", value = "所属标段（部门）", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "orderBy", value = "排序：1退场时间倒序2进场日期倒序", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "workerInfos", value = "劳务人员id（多个，分割）", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/selectWorkerInfoList") public Result> selectWorkerInfoList(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java index 86b738023..8e79c07af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java @@ -351,7 +351,7 @@ public class WorkerInfo implements Serializable { private Integer reEntry; @TableField(exist = false) - @ApiModelProperty(value = "工种名称") + @ApiModelProperty(value = "班组名称") private String teamName; @ApiModelProperty(value = "部门名称") @@ -376,6 +376,9 @@ public class WorkerInfo implements Serializable { private java.lang.String codeStateName; @TableField(exist = false) private java.lang.String acidStatusName; + @TableField(exist = false) + @ApiModelProperty(value = "工种名称") + private String typeName; public String toExistString() { return "WorkerInfo{" + 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 7b30900a3..1b20e3edc 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 @@ -28,10 +28,12 @@ a.worker_classify = 2) or (TIMESTAMPDIFF(HOUR, a.nad_time, now()) >= 72 and a.worker_classify = 3) or (TIMESTAMPDIFF(HOUR, a.nad_time, now()) >= 168 and a.worker_classify = 1)) then '核酸已超时' - else '核酸未超时' end) as acid_status_name + else '核酸未超时' end) as acid_status_name, + wt.type_name from worker_info a LEFT JOIN team_info b ON a.team_id = b.id LEFT JOIN department_info c ON a.department_id = c.id + LEFT JOIN worker_type wt ON b.worker_type_id = wt.id LEFT JOIN dictionaries_record d ON a.job_type = d.id LEFT JOIN dictionaries_record e ON a.job_name = e.id LEFT JOIN enterprise_info en ON en.id = a.enterprise_id @@ -160,6 +162,9 @@ and a.vaccine_status = 3 + + and FIND_IN_SET(a.id, #{param.workerInfos}) + order by a.exit_date desc