生产线数据添加生产日期筛选条件

src/main/java/com/qlm/controller/common/CommonController.java

@@ -140,6 +140,10 @@ public class CommonController extends Controller{
 			String tableName = getPara("key");
 			String order = getPara("order");
 			String toolBarConfig = getPara("toolBarConfig");
+			String startdate = getPara("startdate");
+
+			String endDate = getPara("enddate");
+			String dateField = getPara("datefield");
 			String whereSql = "";
 			List<String> conditions = new ArrayList<String>();
 			if(!WxUtil.isNull(toolBarConfig)){
@@ -168,6 +172,26 @@ public class CommonController extends Controller{
 					
 				}
 			}
+			if(!WxUtil.isNull(dateField)){
+				if(!WxUtil.isNull(endDate)){
+					if(whereSql.length()>0){
+						whereSql+= " and ";
+					}else{
+						whereSql+= " where ";
+					}
+					whereSql += " "+dateField+" <= '"+endDate+"' ";
+				}
+
+				if(!WxUtil.isNull(startdate)){
+					if(whereSql.length()>0){
+						whereSql+= " and ";
+					}else{
+						whereSql+= " where ";
+					}
+					whereSql += "  "+dateField+" >= '"+startdate+"' ";
+				}
+			}
+
 			String paramConfig = getPara("paramConfig");
 			if(!WxUtil.isNull(paramConfig)){
 				String [] paramConfigs = paramConfig.split(";");

src/main/webapp/page/jinzai/upload.jsp

@@ -81,7 +81,19 @@
 									</div>
 								</div>
 							</div>
+							<div style="width: 100%;height: 10px;display: flex;"></div>
+							<div>
+								<label class="col-sm-1 control-label"><span class="text-danger"></span>生产日期：</label>
+								<div class="col-sm-2">
+									<input id="startdate" class="form-control form_datetime" placeholder="请输入开始日期"/>
 
+								</div>
+
+								<div class="col-sm-2">
+									<input id="enddate" class="form-control form_datetime" placeholder="请输入结束日期"/>
+
+								</div>
+							</div>
 							<button style="" type="button" id="searchBtn" class="btn btn-success" onclick="search();return false;">搜索</button>
 
 						</form>
@@ -121,6 +133,19 @@
 
 var table = null;
 $(document).ready(function(){
+	var doms = $(".form_datetime");
+	for(let i =0;i<doms.length;i++){
+		let dom = doms[i];
+		let id = dom.id;
+		console.log(id);
+		let end = {
+			elem : '#'+id,
+			format : 'YYYY-MM-DD',
+			istime : false,
+			istoday : true,
+		};
+		laydate(end);
+	}
 	table = $('#table').bootstrapTable("destroy");//通过AJAX必须先destroy不知道为啥
 	initTable();
 	lineData();
@@ -129,6 +154,8 @@ function queryParams(param){
 	let id = $("#id").val();
 	let task_no = $("#task_no").val();
 	let duo_code = $("#duo_code").val();
+	let startdate = $("#startdate").val();
+	let enddate = $("#enddate").val();
 
 	let lineName = $("#lineName").val();
 	param["key"] = 'jinzai_upload_master';
@@ -139,6 +166,14 @@ function queryParams(param){
 	if(id){
 		param['id'] = id;
 	}
+	if(startdate){
+		param['datefield'] = 'produce_date';
+		param['startdate'] = startdate;
+	}
+	if(enddate){
+		param['datefield'] = 'produce_date';
+		param['enddate'] = enddate;
+	}
 	if(task_no){
 		param['task_no'] = task_no;
 	}