日历代码更新

src_jwapp/com/jw/app/business/calendar/CalendarBusinessImpl.java

@@ -42,6 +42,10 @@ public class CalendarBusinessImpl implements CalendarBusiness {
 				}
 			}
 		}
+		else{
+			//从当前时间开始去查找
+			query.put("START_TIME", new Date());
+		}
 		if (query.get("END_TIME") != null) {
 			try {
 				query.put("END_TIME", new Date(Long.valueOf(query.get("END_TIME").toString())));
@@ -145,6 +149,10 @@ public class CalendarBusinessImpl implements CalendarBusiness {
 				}
 			}
 		}
+		else{
+			//从当前时间开始去查找
+			query.put("START_TIME", new Date());
+		}
 		if (query.get("END_TIME") != null) {
 			try {
 				query.put("END_TIME", new Date(Long.valueOf(query.get("END_TIME").toString())));

src_jwapp/com/jw/app/business/userchoice/userchoiceDAO.xml

@@ -169,6 +169,9 @@ from UICM_UNIT f where 1=1
 		<if test="END_ORDER != null and END_ORDER != ''">
 			and f.ORDER_ID &lt;= #{END_ORDER}
      </if>
+     <if test="NOT_NULL != null and NOT_NULL != ''">
+			and f.${NOT_NULL} is NOT NULL
+     </if>
 		order by f.ORDER_ID,f.ID_NUMBER
 	</select>
 

src_standard/com/gaowj/standard/action/dataAction.java

@@ -2,20 +2,19 @@ package com.gaowj.standard.action;
 
 import java.sql.SQLException;
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSONObject;
-
+import com.gaowj.business.StandardBusiness;
 import com.gaowj.business.action.BasicAction;
 import com.gaowj.business.comp.BusinessManager;
 import com.gaowj.business.exception.BusinessException;
 import com.gaowj.business.util.Page;
 import com.gaowj.business.util.QueryParamUtil;
 import com.gaowj.business.util.RequestUtils;
-import com.gaowj.business.StandardBusiness;
+
+import net.sf.json.JSONObject;
 
 public class dataAction extends BasicAction{
 
@@ -246,4 +245,4 @@ public class dataAction extends BasicAction{
 		return "json";
 	}
 
-}
\ No newline at end of file
+}