bug修复
This commit is contained in:
guo
parent
83dbd47d58
commit
cd869ac16e
@ -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;
|
||||
}
|
||||
|
||||
@ -3,8 +3,9 @@
|
||||
<mapper namespace="com.zhgd.xmgl.modules.bigdevice.mapper.GantryCraneCurrentDataMapper">
|
||||
<select id="getNewestGantryCraneCurrentData"
|
||||
resultType="com.zhgd.xmgl.modules.bigdevice.entity.GantryCraneCurrentData">
|
||||
SELECT a.*,b.field_acquisition_url,ti.team_name,wt.type_name as workerTypeName,if(b.sex=1,"男","女")
|
||||
gender,ei.enterprise_name,b.phone_number
|
||||
SELECT a.*,b.field_acquisition_url,ti.team_name,wt.type_name as workerTypeName,
|
||||
CASE b.sex WHEN 1 THEN "男" WHEN 2 THEN "女" ELSE '' END gender,
|
||||
ei.enterprise_name,b.phone_number
|
||||
from gantry_crane_current_data a LEFT JOIN worker_info b ON (a.project_sn=b.project_sn and
|
||||
a.driver_id_card=b.id_card)
|
||||
left join team_info ti on ti.id=b.team_id and ti.project_sn=b.project_sn
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
<if test="param.endTime != null and param.endTime != ''">
|
||||
AND a.end_time <= CONCAT(DATE_FORMAT(#{param.endTime}, '%Y-%m-%d'), ' 23:59:59')
|
||||
</if>
|
||||
order by a.add_time desc
|
||||
</select>
|
||||
<select id="selectLifterWorkCycleList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" parameterType="map">
|
||||
SELECT a.*, b.dev_name
|
||||
|
||||
@ -135,4 +135,10 @@ public class BridgeErectMachineData implements Serializable {
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "风速等级")
|
||||
private java.lang.String windSpeedLevel;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "状态：0正常1报警")
|
||||
private java.lang.Integer alarmStatus;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -23,16 +23,25 @@
|
||||
</select>
|
||||
|
||||
<select id="selectNewestData" resultType="com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineData">
|
||||
select *
|
||||
from bridge_erect_machine_data
|
||||
where 1 = 1
|
||||
select bemd.*,
|
||||
if((select count(*) from bridge_erect_machine_alarm where 1=1
|
||||
and add_time>=current_date
|
||||
<if test="projectSn != null and projectSn != ''">
|
||||
and project_sn = #{projectSn}
|
||||
and bemd.project_sn = project_sn
|
||||
</if>
|
||||
<if test="devSn != null and devSn != ''">
|
||||
and dev_sn = #{devSn}
|
||||
and bemd.dev_sn = bemd.dev_sn
|
||||
</if>
|
||||
order by create_date desc
|
||||
)>0,1,0) alarmStatus
|
||||
from bridge_erect_machine_data bemd
|
||||
where 1 = 1
|
||||
<if test="projectSn != null and projectSn != ''">
|
||||
and bemd.project_sn = #{projectSn}
|
||||
</if>
|
||||
<if test="devSn != null and devSn != ''">
|
||||
and bemd.dev_sn = #{devSn}
|
||||
</if>
|
||||
order by bemd.create_date desc
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
|
||||
@ -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<IPage<WorkerInfo>> selectWorkerInfoList(@RequestBody Map<String, Object> map) {
|
||||
|
||||
@ -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{" +
|
||||
|
||||
@ -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 @@
|
||||
<if test="param.selectType == '12'.toString()">
|
||||
and a.vaccine_status = 3
|
||||
</if>
|
||||
<if test="param.workerInfos != null and param.workerInfos != ''">
|
||||
and FIND_IN_SET(a.id, #{param.workerInfos})
|
||||
</if>
|
||||
<choose>
|
||||
<when test="param.orderBy == '1'.toString()">
|
||||
order by a.exit_date desc
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user