1

src/main/java/com/chinaitop/depot/grainSituationCard/service/impl/StorageSealedConfirmationImpl.java

@@ -9,6 +9,8 @@ import com.chinaitop.depot.grainSituationCard.model.StorageSealedConfirmationExa
 import com.chinaitop.depot.grainSituationCard.service.StorageSealedConfirmationService;
 import com.chinaitop.depot.param.BasicStorageAndTankParam;
 import com.chinaitop.depot.param.StorageSealedConfirmationPageParam;
+import com.chinaitop.depot.utils.ParameterUtil;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -59,6 +61,10 @@ public class StorageSealedConfirmationImpl implements StorageSealedConfirmationS
         if (!ObjectUtils.isEmpty(param.getWarehouseId())) {
             criteria.andWarehouseIdEqualTo(param.getWarehouseId());
         }
+        //粮情卡功能校验取数用到
+        if (!ObjectUtils.isEmpty(param.getApplyTime())) {
+        	criteria.andApplyTimeGreaterThanOrEqualTo(ParameterUtil.string2datetime(param.getApplyTime()));
+        }
         return confirmationMapper.selectByExample(example);
     }
 

src/main/java/com/chinaitop/depot/param/StorageSealedConfirmationPageParam.java

@@ -28,4 +28,7 @@ public class StorageSealedConfirmationPageParam extends PageParam {
 
     // 列表状态1:申请列表,2:审核列表,3:已审核列表
     private Integer auditState;
+
+    //申请时间
+    private String applyTime;
 }

src/main/java/com/chinaitop/depot/utils/ParameterUtil.java

@@ -0,0 +1,191 @@
+package com.chinaitop.depot.utils;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+import java.util.UUID;
+
+import org.apache.commons.lang.StringUtils;
+
+public class ParameterUtil {
+
+	public static String startTime = " 00:00:00";
+    public static String endTime = " 23:59:59";
+    
+    public static String getSysDateTime(){
+        String temp_str="";
+        Date dt = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        temp_str=sdf.format(dt);
+        System.out.println("获取当前时间"+temp_str);
+        return temp_str;
+    }
+    
+    public static String getDateYMDHMS(Date date) {
+    	String str = "";
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        str=sdf.format(date);
+        System.out.println("获取当前时间"+str);
+        return str;
+    }
+
+    public static String getDateYMD(Date date) {
+    	String str = "";
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        str=sdf.format(date);
+        System.out.println("获取当前时间"+str);
+        return str;
+    }
+    
+    public static String getSysDate(){
+        String temp_str="";
+        Date dt = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        temp_str=sdf.format(dt);
+        return temp_str;
+    }
+
+    public static Date string2datetime(String dateTime){
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = null;
+        try {
+            date = dateFormat.parse(dateTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+    public static Date string2date(String dateTime){
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = null;
+        try {
+            date = dateFormat.parse(dateTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    public static String date2string(Date date){
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+        String str=sdf.format(date);
+        return str;
+    }
+
+    /**
+     * 获取指定时间的时间戳
+     * @param datatime
+     * @return
+     */
+    public static String getTimeStamp(String datatime){
+        long timeStamp = 0;
+        SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date date = format.parse(datatime);
+            timeStamp = date.getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return String.valueOf(timeStamp);
+    }
+
+    /*
+     * 将时间戳转换为时间
+     */
+    public static String stampToDate(String s){
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long lt = new Long(s);
+        Date date = new Date(lt);
+        res = simpleDateFormat.format(date);
+        return res;
+    }
+
+    public static void main(String[] args) {
+//        System.out.println(stampToDate("1504689208643"));
+//        System.out.println(getTimeStamp(getSysDateTime()));
+        String a = null;
+        System.out.println(StringUtils.isNotBlank(a));
+    }
+    public static String getBHS(String BHS){
+        String[] str = BHS.split(",");
+        StringBuffer sb = new StringBuffer();
+        for(int i=0;i<str.length;i++){
+            sb.append("'").append(str[i]).append("'").append(",");
+        }
+        String s=sb.toString();
+        String t=s.substring(0,s.length()-1);
+        return t;
+    }
+
+    //判断字段值是为空 不为空返回ture
+    public static boolean isnotnull(Object name){
+        return (null!=name&&!"".equals(name) && !"null".equals(name) && "null" != name);
+    }
+    
+    //判断字段值是为空,为空返回ture
+    public static boolean isnull(Object name){
+        return (null==name || "".equals(name) || "null".equals(name) || "null" == name);
+    }
+
+    //判断字段值是相等  相等返回ture
+    public static boolean isequal(Object name,Object value){
+        if(name==value||name.equals(value)){
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 判断list和str数组是否全等
+     * @param list
+     * @param str
+     * @return
+     */
+    public static boolean isAllequal(List<String> list,String[] str){
+        boolean isbz = true;
+        for(int z=0;z<str.length;z++){
+            if(!isequal(list.get(z),str[z])){
+                isbz = false;
+                break;
+            }
+        }
+        return !isbz || !(str.length == list.size());
+    }
+
+    //判断字段值是否在某个集合里  在返回ture
+    public static boolean isallequal(Object name,String[] value){
+        for(int i=0;i<value.length;i++){
+            if(name==value[i]||name.equals(value[i])){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 从properties得到路径
+     * @param filePath
+     * @return
+     */
+    public static Properties readProperties(String filePath) {
+        Properties props = new Properties();
+        try {
+            InputStream in = new BufferedInputStream(ParameterUtil.class.getResourceAsStream(filePath));
+            props.load(in);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return props;
+    }
+    
+    public static String getUuid() {
+    	String uuid = UUID.randomUUID().toString().trim().replaceAll("-", "");
+    	return uuid;
+    }
+
+}