Index: forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java =================================================================== diff -u -r14535 -r14810 --- forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java (.../ServerTimeAction.java) (revision 14535) +++ forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java (.../ServerTimeAction.java) (revision 14810) @@ -3,9 +3,14 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Date; +import com.beust.jcommander.ParameterException; import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.time.DateUtils; +import org.apache.log4j.Logger; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.ParentPackage; @@ -24,6 +29,9 @@ @Namespace(value = "/system") @Action(value = "serverTimeAction") public class ServerTimeAction { + + private Logger logger = Logger.getLogger(this.getClass()); + public void getServerDateTime(){ try{ String dateformat = StrutsParamUtils.getPraramValue("dateformat", Constants.DATEFORMAT_YYYYMMDDHHMMSS); @@ -44,4 +52,24 @@ } StrutsResponseUtils.output(false); } + + + /** + * 获取当前月第一天 + */ + public void getFirstDay(){ + try{ + Date date = DateUtils.setDays(new Date(), 1); + String dateFormat = StrutsParamUtils.getPraramValue("dateFormat", ""); + if (StringUtils.isNotEmpty(dateFormat)){ + DateFormat df = new SimpleDateFormat(dateFormat); + String resultTime = df.format(date); + StrutsResponseUtils.output(true, resultTime); + } + } + catch(Exception e){ + logger.error(e,e); + StrutsResponseUtils.output(false, "获取时间失败!" + e.getMessage()); + } + } } Index: forgon-tools/src/main/java/com/forgon/tools/SqlBuilder.java =================================================================== diff -u -r12867 -r14810 --- forgon-tools/src/main/java/com/forgon/tools/SqlBuilder.java (.../SqlBuilder.java) (revision 12867) +++ forgon-tools/src/main/java/com/forgon/tools/SqlBuilder.java (.../SqlBuilder.java) (revision 14810) @@ -179,4 +179,15 @@ sb.append("))"); return sb.toString(); } + + /** + * 创建状态sql + * + * @param statusName 对应的状态名字(recyclingStatus,deliverStatus,returnStatus) + * @param status 需要过滤的状态 + * @return 返回拼接了条件状态的sql + */ + public static String createStatus(String statusName, String... status) { + return SqlBuilder.build_IN_Statement("po." + statusName, SqlBuilder.IN, status); + } }