From 74d2d6abaa381c1733291ed8b398b7c52095327a Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 16 May 2024 14:11:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E7=A7=8D=E4=BD=9C=E4=B8=9Abug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...erousEngineeringAcceptanceServiceImpl.java | 4 +- .../xz/special/entity/XzGasAnalyze.java | 2 + .../xz/special/entity/XzGroundSafet.java | 5 +++ .../xz/special/entity/XzHighJobSafe.java | 5 +++ .../xz/special/entity/XzHoistSafetyWork.java | 37 ++++++++++++++----- .../xz/special/entity/XzLimitSpaceSafe.java | 5 +++ .../xz/special/entity/XzOpenCircuitSafe.java | 5 +++ .../entity/XzSpecialOperationFireSafety.java | 3 ++ .../entity/XzTemporaryElectricitySafe.java | 6 +++ .../mapper/xml/XzGroundSafetMapper.xml | 1 - .../mapper/xml/XzHoistSafetyWorkMapper.xml | 3 +- .../XzSpecialOperationFireSafetyMapper.xml | 2 +- src/main/java/com/zhgd/xmgl/util/MapUtil.java | 16 ++++++++ 13 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/util/MapUtil.java diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java index f2e4a4136..62f0e1b12 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java @@ -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 getQueryWrapper(HashMap paramMap) { - paramMap.putIfAbsent("type", 1); String alias = "xdea."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzDangerousEngineeringAcceptance.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzDangerousEngineeringAcceptance::getCreateTime)); @@ -151,7 +151,7 @@ public class XzDangerousEngineeringAcceptanceServiceImpl extends ServiceImpl 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("有安全隐患未闭合，无法添加验收"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGasAnalyze.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGasAnalyze.java index fdc09a18d..358d7d9e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGasAnalyze.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGasAnalyze.java @@ -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; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java index d0e78903f..c8b60db48 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java @@ -224,4 +224,9 @@ public class XzGroundSafet implements Serializable { @ApiModelProperty(value = "星纵-气体分析列表") private List xzGasAnalyzeList; + + @TableField(exist = false) + @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") + private Integer engineeringState; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java index 515f99e5d..4d0131e01 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java @@ -223,4 +223,9 @@ public class XzHighJobSafe implements Serializable { @ApiModelProperty(value = "星纵-气体分析列表") private List xzGasAnalyzeList; + + @TableField(exist = false) + @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") + private Integer engineeringState; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java index f237457f1..134ea0b5d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java @@ -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 xzGasAnalyzeList; + @TableField(exist = false) + @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") + private Integer engineeringState; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java index 3d37a9d96..6ca2292bd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java @@ -228,4 +228,9 @@ public class XzLimitSpaceSafe implements Serializable { @ApiModelProperty(value = "星纵-气体分析列表") private List xzGasAnalyzeList; + + @TableField(exist = false) + @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") + private Integer engineeringState; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java index 671b7d882..089c3c2f9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java @@ -229,4 +229,9 @@ public class XzOpenCircuitSafe implements Serializable { @ApiModelProperty(value = "星纵-气体分析列表") private List xzGasAnalyzeList; + + @TableField(exist = false) + @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") + private Integer engineeringState; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java index b0f5d74a7..2e74e193b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java @@ -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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java index a5d364126..6fb93b60e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java @@ -280,4 +280,10 @@ public class XzTemporaryElectricitySafe implements Serializable { @ApiModelProperty(value = "星纵-气体分析列表") private List xzGasAnalyzeList; + + @TableField(exist = false) + @ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工") + private Integer engineeringState; + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml index aadc39269..35ef8311b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml @@ -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, diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml index f9bb950a8..a15ee323e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml @@ -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 @@ -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 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml index 18f1981cd..0f295d60a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzSpecialOperationFireSafetyMapper.xml @@ -33,7 +33,7 @@ and enterprise_id = #{param.engineeringId} AND `status` in (2, 3, 4) - AND type = 1 + AND type = 2 GROUP BY engineering_id) tp ON t.id = tp.engineering_id