admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

安全履职的从职务取值

Browse Source
This commit is contained in:
guoshengxiong 2024-05-24 16:40:22 +08:00
parent b18a660601
commit 753ca35894
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
View File

@ -269,7 +269,6 @@ public class WorkerInfo implements Serializable {
*/ */
@Excel(name = "职务类型", width = 15) @Excel(name = "职务类型", width = 15)
@ApiModelProperty(value = "职务类型") @ApiModelProperty(value = "职务类型")
@Deprecated
private java.lang.String jobType; private java.lang.String jobType;
/** /**
* 职务 * 职务

37
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
View File

@ -830,14 +830,43 @@
t.enterprise_name, t.enterprise_name,
count(*) as inServiceNum, count(*) as inServiceNum,
ifnull(sum(if(t1.person_sn is null,1,0)),0) as notPerformNum, ifnull(sum(if(t1.person_sn is null,1,0)),0) as notPerformNum,
ifnull(sum(if(wi.job_name=50,1,0)),0) as xmjlInServiceNum, ifnull(sum(if(wi.job_name=28 or wi.job_name=29 or wi.job_name=50,1,0)),0) as xmjlInServiceNum,
ifnull(sum(if(wi.job_name=50 and t1.person_sn is null,1,0)),0) as xmjlNotPerformNum, ifnull(sum(if((wi.job_name=28 or wi.job_name=29 or wi.job_name=50) and t1.person_sn is null,1,0)),0) as
xmjlNotPerformNum,
ifnull(sum(if(wi.job_name=44,1,0)),0) as aqyInServiceNum, ifnull(sum(if(wi.job_name=44,1,0)),0) as aqyInServiceNum,
ifnull(sum(if(wi.job_name=44 and t1.person_sn is null,1,0)),0) as aqyNotPerformNum, ifnull(sum(if(wi.job_name=44 and t1.person_sn is null,1,0)),0) as aqyNotPerformNum,
ifnull(sum(if(wi.job_name=46,1,0)),0) as zlyInServiceNum, ifnull(sum(if(wi.job_name=46,1,0)),0) as zlyInServiceNum,
ifnull(sum(if(wi.job_name=46 and t1.person_sn is null,1,0)),0) as zlyNotPerformNum, ifnull(sum(if(wi.job_name=46 and t1.person_sn is null,1,0)),0) as zlyNotPerformNum,
ifnull(sum(if(wi.job_name=37,1,0)),0) as jlInServiceNum, ifnull(sum(if(wi.job_name=37
ifnull(sum(if(wi.job_name=37 and t1.person_sn is null,1,0)),0) as jlNotPerformNum or wi.job_name=52
or wi.job_name=53
or wi.job_name=54
or wi.job_name=55
or wi.job_name=56
or wi.job_name=57
or wi.job_name=58
or wi.job_name=59
or wi.job_name=60
or wi.job_name=61
or wi.job_name=62
or wi.job_name=63
or wi.job_name=64
or wi.job_name=65,1,0)),0) as jlInServiceNum,
ifnull(sum(if((wi.job_name=37
or wi.job_name=52
or wi.job_name=53
or wi.job_name=54
or wi.job_name=55
or wi.job_name=56
or wi.job_name=57
or wi.job_name=58
or wi.job_name=59
or wi.job_name=60
or wi.job_name=61
or wi.job_name=62
or wi.job_name=63
or wi.job_name=64
or wi.job_name=65) and t1.person_sn is null,1,0)),0) as jlNotPerformNum
from enterprise_info t from enterprise_info t
join worker_info wi on wi.enterprise_id=t.id join worker_info wi on wi.enterprise_id=t.id
left join (select person_sn from worker_attendance where project_sn=#{param.projectSn} left join (select person_sn from worker_attendance where project_sn=#{param.projectSn}