From deb77238e9a7247b2fee94da8da143422b4a3c64 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sat, 15 Mar 2025 11:51:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=A4=B4bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/xmgl/modules/baotou/entity/RiskControlManual.java | 5 +++++ .../xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml | 4 ++-- .../modules/baotou/mapper/xml/RiskControlManualMapper.xml | 4 ++++ .../mapper/xml/XzSecurityQualityInspectionRecordMapper.xml | 6 ++++++ .../baotou/service/impl/ProjectGroupServiceImpl.java | 3 ++- .../basicdata/service/impl/SystemUserServiceImpl.java | 6 +++++- 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/RiskControlManual.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/RiskControlManual.java index 55f1c0eb3..bca7d4229 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/RiskControlManual.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/RiskControlManual.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; @@ -84,5 +85,9 @@ public class RiskControlManual implements Serializable { @ApiModelProperty(value = "1风险管控手册2重大危险源清单") private java.lang.Integer type; + @TableField(exist = false) + @ApiModelProperty(value = "上传人名称") + private java.lang.String uploaderName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml index 0394268fc..d5f037a8c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml @@ -105,8 +105,8 @@ ,count(distinct wi.id) as num from project_enterprise pe join enterprise_info ei on ei.id=pe.enterprise_id - left join device_unit du on find_in_set(ei.id,du.epc_contractor_ids) - left join enterprise_info ei1 on find_in_set(ei1.id,du.epc_contractor_ids) + join device_unit du on find_in_set(ei.id,du.epc_contractor_ids) + left join enterprise_info ei1 on find_in_set(ei1.id,du.construction_unit_ids) left join worker_info wi on ei.id = wi.enterprise_id and wi.inService_type = 1 where pe.project_sn=#{param.projectSn} and pe.enterprise_type_id=3 diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/RiskControlManualMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/RiskControlManualMapper.xml index c50c73793..eb273d26d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/RiskControlManualMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/RiskControlManualMapper.xml @@ -4,14 +4,18 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml index 0b7f3f975..a6a8b1b15 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml @@ -309,6 +309,12 @@ left join enterprise_info ei3 on ei3.id = t.construction_contractor_id left join device_unit du on du.id = t.device_unit_id WHERE t.project_sn = #{param.projectSn} + + and t.device_unit_id = #{param.deviceUnitId} + + + and t.project_group_id = #{param.projectGroupId} + and t.instance_id in filterEpcContractorIds = projectGroupUnitList.stream() .map(ProjectGroupUnit::getEpcContractorId).distinct().filter(Objects::nonNull).collect(Collectors.toList()); projectGroupUnitList = projectGroupUnitList.stream() - .filter(o -> StrUtil.isBlank(epcContractorIds) || StrUtil.split(epcContractorIds, ",").contains(o.getEpcContractorId() + "")).collect(Collectors.toList()); + .filter(o -> o.getEpcContractorId() == null + || (StrUtil.isBlank(epcContractorIds) || StrUtil.split(epcContractorIds, ",").contains(o.getEpcContractorId() + ""))).collect(Collectors.toList()); List constructionUnitIds = projectGroupUnitList.stream() .flatMap(projectGroupUnit -> Arrays.stream(StringUtils.split(projectGroupUnit.getConstructionUnitIds(), ","))) .distinct().filter(Objects::nonNull).collect(Collectors.toList()); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index e764f6a88..2d7c55d06 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -528,10 +528,14 @@ public class SystemUserServiceImpl extends ServiceImpl workerInfoList = workerInfoService.selectWorkerInfoList(new MapBuilder().put("id", result.get("workerId")).build()); String postWorkTypeName = ""; + Long enterpriseId = null; if (CollUtil.isNotEmpty(workerInfoList.getRecords())) { - postWorkTypeName = workerInfoList.getRecords().get(0).getPostWorkTypeName(); + WorkerInfo workerInfo = workerInfoList.getRecords().get(0); + postWorkTypeName = workerInfo.getPostWorkTypeName(); + enterpriseId = workerInfo.getEnterpriseId(); } result.put("postWorkTypeName", postWorkTypeName); + result.put("enterpriseId", enterpriseId); return result; }