包头bug修改

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;
+
 
 }

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)
+        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)
+        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

src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/RiskControlManualMapper.xml

@@ -4,14 +4,18 @@
     <select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.RiskControlManual">
         select * from (
         select t.*
+        ,su.real_name as uploader_name
         from risk_control_manual t
+        left join system_user su on su.user_id=t.uploader
         )t
         ${ew.customSqlSegment}
     </select>
     <select id="queryById" resultType="com.zhgd.xmgl.modules.baotou.entity.RiskControlManual">
         select * from (
         select t.*
+        ,su.real_name as uploader_name
         from risk_control_manual t
+        left join system_user su on su.user_id=t.uploader
         )t
         where t.id = #{id}
     </select>

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}
+        <if test="param.deviceUnitId != null and param.deviceUnitId != ''">
+            and t.device_unit_id = #{param.deviceUnitId}
+        </if>
+        <if test="param.projectGroupId != null and param.projectGroupId != ''">
+            and t.project_group_id = #{param.projectGroupId}
+        </if>
         <if test="param.instanceIds != null and param.instanceIds != '' and param.instanceIds.size > 0">
             and t.instance_id in
             <foreach item="item" index="index" collection="param.instanceIds"

src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectGroupServiceImpl.java

@@ -190,7 +190,8 @@ public class ProjectGroupServiceImpl extends ServiceImpl<ProjectGroupMapper, Pro
         List<Long> 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<String> constructionUnitIds = projectGroupUnitList.stream()
                 .flatMap(projectGroupUnit -> Arrays.stream(StringUtils.split(projectGroupUnit.getConstructionUnitIds(), ",")))
                 .distinct().filter(Objects::nonNull).collect(Collectors.toList());

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java

@@ -528,10 +528,14 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         }
         IPage<WorkerInfo> workerInfoList = workerInfoService.selectWorkerInfoList(new MapBuilder<String, Object>().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;
     }