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

特种作业bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-05-16 14:11:36 +08:00
parent 6a2ada7070
commit 74d2d6abaa
13 changed files with 79 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java
View File

@ -25,6 +25,7 @@ import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService
import com.zhgd.xmgl.modules.xz.special.service.*;
import com.zhgd.xmgl.modules.xz.special.service.impl.XzSpecialOperationFireSafetyServiceImpl;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapUtil;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.springframework.beans.factory.annotation.Autowired;
@ -104,7 +105,6 @@ public class XzDangerousEngineeringAcceptanceServiceImpl extends ServiceImpl<XzD
}
private QueryWrapper<XzDangerousEngineeringAcceptance> getQueryWrapper(HashMap<String, Object> paramMap) {
paramMap.putIfAbsent("type", 1);
String alias = "xdea.";
QueryWrapper<XzDangerousEngineeringAcceptance> queryWrapper = QueryGenerator.initPageQueryWrapper(XzDangerousEngineeringAcceptance.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzDangerousEngineeringAcceptance::getCreateTime));
@ -151,7 +151,7 @@ public class XzDangerousEngineeringAcceptanceServiceImpl extends ServiceImpl<XzD
}
List<XzSecurityQualityInspectionRecord> notCloseList = xzSecurityQualityInspectionRecords.stream().filter(xzSecurityQualityInspectionRecord ->
xzSecurityQualityInspectionRecord.getStatus() != 5 && xzSecurityQualityInspectionRecord.getStatus() != 6 && xzSecurityQualityInspectionRecord.getType() == type).collect(Collectors.toList());
xzSecurityQualityInspectionRecord.getStatus() != 5 && xzSecurityQualityInspectionRecord.getStatus() != 6 && Objects.equals(xzSecurityQualityInspectionRecord.getType(), type)).collect(Collectors.toList());
if (CollUtil.isNotEmpty(notCloseList)) {
throw new OpenAlertException("有安全隐患未闭合，无法添加验收");
}

2
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGasAnalyze.java
View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Date;
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 lombok.Data;
@ -75,4 +76,5 @@ public class XzGasAnalyze implements Serializable {
*/
@ApiModelProperty(value = "更新时间")
private java.util.Date updateDate;
}

5
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java
View File

@ -224,4 +224,9 @@ public class XzGroundSafet implements Serializable {
@ApiModelProperty(value = "星纵-气体分析列表")
private List<XzGasAnalyze> xzGasAnalyzeList;
@TableField(exist = false)
@ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工")
private Integer engineeringState;
}

5
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java
View File

@ -223,4 +223,9 @@ public class XzHighJobSafe implements Serializable {
@ApiModelProperty(value = "星纵-气体分析列表")
private List<XzGasAnalyze> xzGasAnalyzeList;
@TableField(exist = false)
@ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工")
private Integer engineeringState;
}

37
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java
View File

@ -119,7 +119,6 @@ public class XzHoistSafetyWork implements Serializable {
@Excel(name = "作业级别", width = 15)
@ApiModelProperty(value = "作业级别")
private String jobLevel;
/**
* 作业实施时间开始
*/
@ -158,7 +157,25 @@ public class XzHoistSafetyWork implements Serializable {
private String workTicketCode;
@ApiModelProperty(value = "最终验收状态1进行中2已闭合")
private Integer finalAcceptanceStatus;
/**
* 司索人
*/
@Excel(name = "司索人", width = 15)
@ApiModelProperty(value = "司索人")
private Long siSuoPerson;
/**
* 作业负责人
*/
@Excel(name = "作业负责人", width = 15)
@ApiModelProperty(value = "作业负责人")
private java.lang.Long assignmentPersonInCharge;
/**
* 作业负责人名称
*/
@TableField(exist = false)
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private java.lang.String assignmentPersonInChargeName;
/**
* 作业申请单位名称
*/
@ -174,14 +191,6 @@ public class XzHoistSafetyWork implements Serializable {
@ApiModelProperty(value = "作业单位名称")
private String operatingUnitName;
/**
* 作业负责人名称
*/
@TableField(exist = false)
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@ -213,6 +222,10 @@ public class XzHoistSafetyWork implements Serializable {
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
@TableField(exist = false)
@Excel(name = "司索人名称", width = 15)
@ApiModelProperty(value = "司索人名称")
private String siSuoPersonName;
@TableField(exist = false)
@ApiModelProperty(value = "安全隐患总数")
@ -223,4 +236,8 @@ public class XzHoistSafetyWork implements Serializable {
@ApiModelProperty(value = "星纵-气体分析列表")
private List<XzGasAnalyze> xzGasAnalyzeList;
@TableField(exist = false)
@ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工")
private Integer engineeringState;
}

5
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java
View File

@ -228,4 +228,9 @@ public class XzLimitSpaceSafe implements Serializable {
@ApiModelProperty(value = "星纵-气体分析列表")
private List<XzGasAnalyze> xzGasAnalyzeList;
@TableField(exist = false)
@ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工")
private Integer engineeringState;
}

5
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java
View File

@ -229,4 +229,9 @@ public class XzOpenCircuitSafe implements Serializable {
@ApiModelProperty(value = "星纵-气体分析列表")
private List<XzGasAnalyze> xzGasAnalyzeList;
@TableField(exist = false)
@ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工")
private Integer engineeringState;
}

3
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java
View File

@ -227,5 +227,8 @@ public class XzSpecialOperationFireSafety implements Serializable {
@ApiModelProperty(value = "安全隐患总数")
private Integer hiddenDangerNum;
@TableField(exist = false)
@ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工")
private Integer engineeringState;
}

6
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java
View File

@ -280,4 +280,10 @@ public class XzTemporaryElectricitySafe implements Serializable {
@ApiModelProperty(value = "星纵-气体分析列表")
private List<XzGasAnalyze> xzGasAnalyzeList;
@TableField(exist = false)
@ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工")
private Integer engineeringState;
}

1
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml
View File

@ -5,7 +5,6 @@
t.*,
ei2.enterprise_name as operatingUnitName,
su.real_name as assignmentPersonInChargeName,
wi1.worker_name as jobPersonName,
wi2.worker_name as safetyInformantName,
wi3.worker_name as acceptTheInformantName,
wi4.worker_name as guardianName,

3
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml
View File

@ -5,9 +5,9 @@
t.*,
ei1.enterprise_name as jobApplicationUnitName,
ei2.enterprise_name as operatingUnitName,
su.real_name as assignmentPersonInChargeName,
wi2.worker_name as safetyInformantName,
wi3.worker_name as acceptTheInformantName,
wi4.worker_name as guardianName,
IFNULL(tp.hidden_danger_num, 0) hidden_danger_num
</sql>
<sql id="selectTable">
@ -16,6 +16,7 @@
from xz_hoist_safety_work t
left join enterprise_info ei1 on t.job_application_unit = ei1.id
left join enterprise_info ei2 on t.operating_unit = ei2.id
left join system_user su on su.user_id=t.assignment_person_in_charge
left join worker_info wi2 on t.safety_informant = wi2.id
left join worker_info wi3 on t.accept_the_informant = wi3.id
left join worker_info wi4 on t.guardian = wi4.id

2
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml
View File

@ -33,7 +33,7 @@
and enterprise_id = #{param.engineeringId}
</if>
AND `status` in (2, 3, 4)
AND type = 1
AND type = 2
GROUP BY engineering_id) tp ON t.id = tp.engineering_id
</sql>
<select id="queryList" resultType="com.zhgd.xmgl.modules.xz.special.entity.XzSpecialOperationFireSafety">

16
src/main/java/com/zhgd/xmgl/util/MapUtil.java Normal file
View File

@ -0,0 +1,16 @@
package com.zhgd.xmgl.util;
import jodd.util.StringUtil;
import org.apache.commons.collections.MapUtils;
import java.util.HashMap;
import java.util.Map;
public class MapUtil {
public static void putIfNotBlank(Map<String, Object> map, String key, Object value) {
String v = MapUtils.getString(map, key);
if (StringUtil.isBlank(v)) {
map.put(key, value);
}
}
}