风险点,危险点导入bug修改

监督统计bug修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/ddd/safetyControl/application/service/riskStatistics/impl/RiskStatisticsManageServiceImpl.java

@@ -283,7 +283,7 @@ public class RiskStatisticsManageServiceImpl implements RiskStatisticsManageServ
                         rowData.get(21) == null || StrUtil.isBlank(rowData.get(21).toString()) ||
                         rowData.get(22) == null || StrUtil.isBlank(rowData.get(22).toString()) ||
                         rowData.get(24) == null || StrUtil.isBlank(rowData.get(24).toString())) {
-                    sbMsg.append("第" + index + "条数据，参数缺失；\n");
+                    sbMsg.append("第" + index + "条数据为空或缺失；号,请检查后重新上传\n");
                     continue;
                 }
 
@@ -788,7 +788,7 @@ public class RiskStatisticsManageServiceImpl implements RiskStatisticsManageServ
                         rowData.get(10) == null || StrUtil.isBlank(rowData.get(10).toString()) ||
                         rowData.get(12) == null || StrUtil.isBlank(rowData.get(12).toString())
                 ) {
-                    sbMsg.append("第" + index + "条数据，参数缺失；\n");
+                    sbMsg.append("第" + index + "条数据为空或缺失；号,请检查后重新上传\n");
                     continue;
                 }
 

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java

@@ -215,12 +215,14 @@ public class THazardWorkPlanCheckServiceImpl extends SuperServiceImpl<THazardWor
                 if (ids == null || ids.size() == 0) {
                     //存入当前机构
                     ids.add(finalOrgId);
+
                 }
             }
+            //tHazardWorkPlanCheckParam.setOrgIdList(ids);
+            tHazardWorkPlanCheckParam.setOrgIdList(ids);
             hazardWorkPlanCheckComplianceStatisticsVO = this.baseMapper.selectCheckComplianceStatistics(tHazardWorkPlanCheckParam).get(0);
             hazardWorkPlanCheckComplianceStatisticsVO.setOrgId(item);
             hazardWorkPlanCheckComplianceStatisticsVO.setOrgName(sysOrgService.getById(item).getOrgName());
-            tHazardWorkPlanCheckParam.setOrgIdList(ids);
             hazardWorkPlanCheckComplianceStatisticsVOS.add(hazardWorkPlanCheckComplianceStatisticsVO);
         });