修改查询粮油情三温sql

src/main/java/com/chinaitop/depot/storage/controller/StorageThreetempCheckController.java

@@ -5,6 +5,7 @@ import java.util.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -98,8 +99,18 @@ public class StorageThreetempCheckController {
         // 查询条件map
         Map<String, Object> map = new HashMap<>();
         // 仓房编码
-        if (ParameterUtil.isnotnull(houseId))
-            map.put("storehouse", houseId);
+        if (ParameterUtil.isnotnull(houseId)) {
+        	map.put("storehouse", houseId);
+        	if (!"".equals(houseId)) {
+        		String str = houseId.substring(0, 2).toString();
+        		if ("YG".equals(str)) {
+        			map.put("iLq_yq", "1");
+        		} else {
+        			map.put("iLq_yq", "0");
+        		}
+        	}
+        }
+        
         // 查询开始时间
         if (StringUtils.isNotBlank(searchStartDate))
             map.put("startDate", ParameterUtil.string2datetime(searchStartDate + " 00:00:00"));
@@ -183,8 +194,18 @@ public class StorageThreetempCheckController {
     })
     public List<Map<String, Object>> chartData(String houseId, String checkDate) {
         Map<String, Object> map = new HashMap<>();
-        if (StringUtils.isNotBlank(houseId))
-            map.put("storehouse", houseId);
+        if (StringUtils.isNotBlank(houseId)) {
+        	map.put("storehouse", houseId);
+        	if (!"".equals(houseId)) {
+        		String str = houseId.substring(0, 2).toString();
+        		if ("YG".equals(str)) {
+        			map.put("iLq_yq", "1");
+        		} else {
+        			map.put("iLq_yq", "0");
+        		}
+        	}
+        }
+        
         if(StringUtils.isNotBlank(checkDate)) {
             // 开始时间前推三天
             Date startDate = new Date((ParameterUtil.string2datetime(checkDate + " 00:00:00").getTime()/1000-3600*24*2)*1000);
@@ -252,13 +273,23 @@ public class StorageThreetempCheckController {
         Map<String, Object> threeTempMap = new HashMap<>();
         /* 参数对象 */
         Map<String, Object> parementMap = new HashMap<>();
-        if (StringUtils.isNotBlank(jsonMap.getString("houseId")))
-        	parementMap.put("storehouse", jsonMap.getString("houseId"));
+        if (StringUtils.isNotBlank(jsonMap.getString("houseId"))) {
+        	String store_code = ObjectUtils.toString(jsonMap.getString("houseId"), "");
+        	parementMap.put("storehouse", store_code);
+        	if (!"".equals(store_code)) {
+        		String str = store_code.substring(0, 2).toString();
+        		if ("YG".equals(str)) {
+        			parementMap.put("iLq_yq", "1");
+        		} else {
+        			parementMap.put("iLq_yq", "0");
+        		}
+        	}
+        }
         if(StringUtils.isNotBlank(jsonMap.getString("startDate"))) {
-        	parementMap.put("startDate", ParameterUtil.string2date(jsonMap.getString("startDate") + " 00:00:00"));
+        	parementMap.put("startDate", ParameterUtil.string2datetime(jsonMap.getString("startDate") + " 00:00:00"));
         }
         if(StringUtils.isNotBlank(jsonMap.getString("endDate"))) {
-        	parementMap.put("endDate", ParameterUtil.string2date(jsonMap.getString("endDate") + " 23:59:59"));
+        	parementMap.put("endDate", ParameterUtil.string2datetime(jsonMap.getString("endDate") + " 23:59:59"));
         }
         if(null != weekParams){
         	parementMap.put("weekParams",weekParams); //用于周粮情的判断，以区分智能仓房的三温检查
@@ -317,8 +348,19 @@ public class StorageThreetempCheckController {
             
             /* 参数对象 */
             Map<String, Object> parementMap = new HashMap<>();
-            if (StringUtils.isNotBlank(obj.getString("houseId")))
-            	parementMap.put("storehouse", obj.getString("houseId"));
+            if (StringUtils.isNotBlank(obj.getString("houseId"))) {
+            	String store_code = ObjectUtils.toString(obj.getString("houseId"), "");
+            	parementMap.put("storehouse", store_code);
+            	if (!"".equals(store_code)) {
+            		String str = store_code.substring(0, 2).toString();
+            		if ("YG".equals(str)) {
+            			parementMap.put("iLq_yq", "1");
+            		} else {
+            			parementMap.put("iLq_yq", "0");
+            		}
+            	}
+            }
+            
             if(StringUtils.isNotBlank(obj.getString("startDate"))) {
             	parementMap.put("startDate", ParameterUtil.string2date(obj.getString("startDate") + " 00:00:00"));
             }

src/main/java/com/chinaitop/depot/storage/mapper/StorageThreetempcheckMapper.xml

@@ -507,7 +507,10 @@
     FROM
         t_testdata
     <where>
-      iLq_yq = '0'
+      1=1 
+      <if test="iLq_yq != null">
+        AND iLq_yq = #{iLq_yq}
+      </if>
       <if test="storehouse != null">
         AND storehouse = #{storehouse}
       </if>