温度SQL修改

src/main/java/com/chinaitop/depot/supervise/controller/depotStyleController.java

@@ -40,14 +40,18 @@ public class depotStyleController {
     @RequestMapping(value="/getAllPointChart", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     @ApiOperation(value="点图信息", notes = "查找所有的点图信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "type", value = "查看的类型", paramType = "query")
+            @ApiImplicitParam(name = "type", value = "查看的类型", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构Id", paramType = "query")
     })
-    public List<Map<String,Object>> getAllPointChart(String type, HttpServletRequest request) {
+    public List<Map<String,Object>> getAllPointChart(String type, String orgId, HttpServletRequest request) {
         Map<String,Object> map = new HashMap<>();
 
         String ss = request.getSession().getAttribute("userId")+"";
         Map<String,Object> newMap = new HashMap<>();
         map.put("type",type);
+        if(ParameterUtil.isnotnull(orgId)){
+            map.put("orgId",orgId);
+        }
         List<Map<String,Object>> list = null;
         if(ParameterUtil.isequal(type,"1")){//监控
             list = Service.getCameraPoint(map);

src/main/java/com/chinaitop/depot/supervise/mapper/DepotStyleMapper.xml

@@ -419,10 +419,10 @@
 	    hw.record_unite
     FROM
         basic_storehouse house
-    LEFT JOIN depot_style style ON style.indexid = house.storehouse_id
-    LEFT JOIN storage_foodbasicinfo hw ON house.storehouse_id = hw.house_id
-    LEFT JOIN basic_keeper_house bkh ON bkh.house_Id = house.storehouse_id
-    LEFT JOIN basic_keeper bk ON bk.id = bkh.keeper_Id
+    LEFT JOIN depot_style style ON style.indexid = house.storehouse_id AND style.org_id = #{orgId,jdbcType=VARCHAR}
+    LEFT JOIN storage_foodbasicinfo hw ON house.storehouse_id = hw.house_id AND hw.org_id = #{orgId,jdbcType=VARCHAR}
+    LEFT JOIN basic_keeper_house bkh ON bkh.house_Id = house.storehouse_id AND bkh.org_id = #{orgId,jdbcType=VARCHAR}
+    LEFT JOIN basic_keeper bk ON bk.id = bkh.keeper_Id AND bk.org_id = #{orgId,jdbcType=VARCHAR}
     LEFT JOIN (
         SELECT
             temp.inTemp,
@@ -442,15 +442,18 @@
                     temp2.storehouse
                 FROM
                     t_testdata temp2
+                WHERE temp2.org_id = #{orgId,jdbcType=VARCHAR}
                 GROUP BY
                     temp2.storehouse
             ) t
         WHERE
             temp.time = t.time
         AND temp.storehouse = t.storehouse
+        AND temp.org_id = #{orgId,jdbcType=VARCHAR}
     ) t3 ON house.storehouse_code = t3.storehouse
     WHERE 1=1
     AND style.type = #{type}
+    AND style.org_id = #{orgId,jdbcType=VARCHAR}
     GROUP BY house.storehouse_id
   </select>
   <select id="selectWorkingForHouse" parameterType="java.util.Map" resultType="java.util.HashMap">
@@ -468,7 +471,7 @@
     AND kc.DataID = fcbgz.stockdataid
     AND styles.type = '3'
     AND flow.`status`='0'
-    AND  flow.BillNo=kc.BizNo
+    AND flow.BillNo=kc.BizNo
     AND kc.DataID=fcbgz.stockdataid
     AND fcbgz.direction=1
     AND kc.UnitID = #{orgid}