隐患排查问题修改

@@ -62,6 +62,9 @@ public class APPDangerInspectionRecordController {
         if(dangerInspectionRecord.getDangerId() != null   && dangerInspectionRecord.getDangerId().length() > 0 ){
             queryWrapper.eq("danger_id", dangerInspectionRecord.getDangerId());
         }
+        if(StringUtils.isNotBlank(dangerInspectionRecord.getDepartId())){
+            queryWrapper.ge("depart_id", dangerInspectionRecord.getDepartId() ) ;
+        }
         if(StringUtils.isNotBlank(dangerInspectionRecord.getStartTime())){
             queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ;
         }

@@ -2,7 +2,6 @@ package com.skua.modules.dataAnalysis.service.impl;
 
 import com.skua.common.constant.ReportConstant;
 import com.skua.common.report.ReportViewUtil;
-import com.skua.core.util.ConvertUtils;
 import com.skua.core.util.DoubleOperaUtils;
 import com.skua.modules.dataAnalysis.mapper.FactoryOperateCenterMapper;
 import com.skua.modules.dataAnalysis.service.IFactoryOperateCenterService;
@@ -10,9 +9,7 @@ import com.skua.modules.dataAnalysis.vo.ArchivesWarnVO;
 import com.skua.modules.dataAnalysis.vo.EquipAlarmVO;
 import com.skua.modules.dataAnalysis.vo.EquipRunTimeVO;
 import com.skua.modules.dataAnalysis.vo.EquipWarnVO;
-import com.skua.modules.flow.service.FlowForThirdBusinessService;
 import com.skua.tool.util.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -28,6 +25,24 @@ public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterSer
 
     @Override
     public Map<String, Object> getData(String departId, String month) {
+        String tbMonth = DateUtils.getTbMonth(month);
+        String hbMonth = DateUtils.getHbMonth(month);
+        String year = month.substring(0,4);
+        String tbYear = String.valueOf(Integer.parseInt(year) - 1);
+        String dataViewName2119Year = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, year);
+        String dataViewName2119YearTb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, tbYear);
+        String dataViewName2119Month = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, month);
+        String dataViewName2119MonthTb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, tbMonth);
+        String dataViewName2119MonthHb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, hbMonth);
+
+        String field3a24 = "DLHJ,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
+                "YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
+        String dataViewName3a24Year = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, year);
+        String dataViewName3a24YearTb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, tbYear);
+        String dataViewName3a24Month = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, month);
+        String dataViewName3a24MonthTb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, tbMonth);
+        String dataViewName3a24MonthHb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, hbMonth);
+
         Map<String, Object> map = new HashMap<>();
         map.put("nclsl",new HashMap<>());
         Map<String, Object> nclslMap = new HashMap<>();