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

安全履职分析bug修复

Browse Source
This commit is contained in:
GUO 2024-05-22 01:21:49 +08:00
parent 290d43f749
commit 2e48fa6a9b
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SafetyPerformanceAnalysisVo.java
View File

@ -27,6 +27,7 @@ public class SafetyPerformanceAnalysisVo {
private Integer jlNotPerformNum;
@ApiModelProperty("监理在职总数")
private Integer jlInServiceNum;
@ApiModelProperty(value = "企业名称")
private java.lang.String enterpriseName;
private List<SafetyPerformanceAnalysisVo> list;
}

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

@ -827,6 +827,7 @@
<select id="safetyPerformanceAnalysis"
resultType="com.zhgd.xmgl.modules.worker.entity.vo.SafetyPerformanceAnalysisVo">
select
t.enterprise_name,
count(*) as inServiceNum,
ifnull(sum(if(t1.person_sn is null,1,0)),0) as notPerformNum,
ifnull(sum(if(wi.job_type=50,1,0)),0) as xmjlInServiceNum,

18
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
View File

@ -1150,15 +1150,15 @@ status 状态码 String 1表示成功；其余表示失败
Integer jlNotPerformNum1 = one.getJlNotPerformNum();
Integer jlInServiceNum1 = one.getJlInServiceNum();
notPerformNum += notPerformNum1;
inServiceNum += notPerformNum1;
xmjlNotPerformNum += notPerformNum1;
xmjlInServiceNum += notPerformNum1;
aqyNotPerformNum += notPerformNum1;
aqyInServiceNum += notPerformNum1;
zlyNotPerformNum += notPerformNum1;
zlyInServiceNum += notPerformNum1;
jlNotPerformNum += notPerformNum1;
jlInServiceNum += notPerformNum1;
inServiceNum += inServiceNum1;
xmjlNotPerformNum += xmjlNotPerformNum1;
xmjlInServiceNum += xmjlInServiceNum1;
aqyNotPerformNum += aqyNotPerformNum1;
aqyInServiceNum += aqyInServiceNum1;
zlyNotPerformNum += zlyNotPerformNum1;
zlyInServiceNum += zlyInServiceNum1;
jlNotPerformNum += jlNotPerformNum1;
jlInServiceNum += jlInServiceNum1;
}
vo.setNotPerformNum(notPerformNum);
vo.setInServiceNum(inServiceNum);