增加星标厂，修改首页大屏接口

@@ -26,5 +26,7 @@ public interface ScreenMapper {
                                         @Param("dataViewName3a24") String dataViewName3a24, @Param("dataViewName2119") String dataViewName2119);
 
     List<Map<String, Object>> getYhylqs(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("departIds") String departIds,
-                                        @Param("dataViewName3a24") String dataViewName3a24, @Param("dataViewName2119") String dataViewName2119);
+                                        @Param("dataViewName3a24") String dataViewName3a24, @Param("dataViewName2119") String dataViewName2119,
+                                        @Param("startMonth") String startMonth, @Param("endMonth") String endMonth,
+                                        @Param("dataViewName4411") String dataViewName4411);
 }

@@ -57,8 +57,8 @@
     <select id="getYhdlqs" resultType="java.util.HashMap">
         SELECT
             LEFT( v3.time, 7 ) time,
-            SUM( v3.DLHJ ) AS ydl,
-            v2.clsl,
+            ROUND(SUM( v3.DLHJ )/10000,2) AS ydl,
+            ROUND(v2.clsl/10000,2) AS clsl,
             ROUND(SUM( v3.DLHJ )/v2.clsl,4) AS dsdh
         FROM
             ${dataViewName3a24} v3
@@ -83,15 +83,15 @@
     <select id="getYhylqs" resultType="java.util.HashMap">
         SELECT
             LEFT( v3.time, 7 ) time,
-            ROUND(SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
+            ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
                 SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
                 SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
                 SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
                 SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
                 SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+
                 SUM( IFNULL( v3.CH3COOH, 0 ) )+SUM( IFNULL( v3.FESO4G, 0 ) )+SUM( IFNULL( v3.FESO4Y, 0 ) )+
-            SUM( IFNULL( v3.H2O2, 0 ) ),4) AS zyl,
-            ROUND(v2.clsl,2) AS clsl,
+                SUM( IFNULL( v3.H2O2, 0 ) ))/10000,4) AS zyl,
+            ROUND(v2.clsl/10000,2) AS clsl,
             ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
             SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
             SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
@@ -99,7 +99,9 @@
             SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
             SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+
             SUM( IFNULL( v3.CH3COOH, 0 ) )+SUM( IFNULL( v3.FESO4G, 0 ) )+SUM( IFNULL( v3.FESO4Y, 0 ) )+
-            SUM( IFNULL( v3.H2O2, 0 ) ))/v2.clsl,4) AS dsyh
+            SUM( IFNULL( v3.H2O2, 0 ) ))/v2.clsl,4) AS dsyh,
+            ROUND(v4.zyf/10000,2) AS zyf,
+            ROUND(v4.zyf/v2.clsl,2) AS dsyf
         FROM
             ${dataViewName3a24} v3
         LEFT JOIN
@@ -112,6 +114,18 @@
         </foreach>
         GROUP BY LEFT(v2119.time, 7) ) v2
         ON v2.time = LEFT( v3.time, 7 )
+        LEFT JOIN
+        ( SELECT
+            v4411.time,
+            ROUND(IFNULL(SUM(v4411.yyf),0),2) zyf
+        FROM ${dataViewName4411} v4411
+        WHERE v4411.time &gt;= #{startMonth} AND v4411.time &lt;= #{endMonth}
+            AND v4411.depart_id in
+            <foreach item="item" index="index" collection="departIds.split(',')" open="(" separator="," close=")">
+                '${item}'
+            </foreach>
+            GROUP BY v4411.time ) v4
+            ON v4.time = LEFT( v3.time, 7 )
         WHERE v3.time &gt;= #{startDate} AND v3.time &lt;= #{endDate}
         AND v3.depart_id in
         <foreach item="item" index="index" collection="departIds.split(',')" open="(" separator="," close=")">

@@ -266,12 +266,16 @@ public class ScreenDataServiceImpl implements IScreenDataService {
         List<Map<String, Object>> list = new ArrayList<>();
         String startDate = statisticsParams.getStartDate();
         String endDate = statisticsParams.getEndDate();
+        String startMonth = startDate.split("-")[0]+"-"+startDate.split("-")[1];
+        String endMonth = endDate.split("-")[0]+"-"+endDate.split("-")[1];
         String departIds = statisticsParams.getDepartIds();
         Map<String, Object> valueMap = new HashMap<>();
         List<String> monthList = getMonthsBetween(startDate,endDate);
         String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, startDate, endDate);
         String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,ReportConstant.fieldClsl, departIds, startDate, endDate);
-        List<Map<String, Object>> dataList = screenMapper.getYhylqs(startDate,endDate,departIds,dataViewName3a24,dataViewName2119);
+        String dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411, "", departIds, startMonth, endMonth);
+        List<Map<String, Object>> dataList = screenMapper.getYhylqs(startDate,endDate,departIds,dataViewName3a24,dataViewName2119,
+                startMonth,endMonth,dataViewName4411);
         if(dataList.size()>0){
             for (Map<String, Object> vMap : dataList) {
                 valueMap.put(vMap.get("time").toString(),vMap);
@@ -284,10 +288,14 @@ public class ScreenDataServiceImpl implements IScreenDataService {
                     map.put("dsyh",dataValueMap.get("dsyh"));
                     map.put("clsl",dataValueMap.get("clsl"));
                     map.put("zyl",dataValueMap.get("zyl"));
+                    map.put("zyf",dataValueMap.get("zyf"));
+                    map.put("dsyf",dataValueMap.get("dsyf"));
                 }else{
                     map.put("dsyh","");
                     map.put("clsl","");
                     map.put("zyl","");
+                    map.put("zyf","");
+                    map.put("dsyf","");
                 }
                 list.add(map);
             }
@@ -298,6 +306,8 @@ public class ScreenDataServiceImpl implements IScreenDataService {
                 map.put("dsyh","");
                 map.put("clsl","");
                 map.put("zyl","");
+                map.put("zyf","");
+                map.put("dsyf","");
                 list.add(map);
             }
         }

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.core.api.vo.Result;
+import com.skua.core.context.BaseContextHandler;
 import com.skua.modules.inspection.service.IInspectionUserWorkingGroupService;
 import com.skua.modules.inspection.vo.InspectionUserWorkingGroupVO;
 import io.swagger.annotations.Api;
@@ -77,6 +78,8 @@ public class InspectionUserWorkingGroupController {
             }
             if (StringUtils.isNotBlank(departId)){
                 queryWrapper.eq("iwg.depart_id",departId);
+            }else{
+                queryWrapper.in("iwg.depart_id", BaseContextHandler.getDeparts().split(","));
             }
             if (StringUtils.isNotBlank(moduleType)){
                 queryWrapper.eq("iwg.module_type",moduleType);

@@ -177,6 +177,12 @@ public class SysFactoryInfo {
      */
     @ApiModelProperty(value = "水厂类型")
     private String factoryType;
+
+    @Excel(name = "星标厂区", width = 15)
+    @ApiModelProperty(value = "星标厂区")
+    @Dict(dicCode = "factoryStar")
+    private String factoryStar;
+
     /**
      * 邮编
      */