1.出价记录内容缺失

2.出价添加提交后修改
出价添加提交后对话框不消失，可以重复出价
期间忘了js需要关掉启动导致浪费了很多时间
3.标的列表号牌选择
标的列表号牌选择  只选择线下用户管理列表中的号牌
目前显示的线下用户管理列表中的和小程序里交了保证金已审批的用户
4.支付记录内容修改
付款时间倒序排列
去掉开始时间，结束时间搜索，增加付款时间搜索
增加标的物搜索
5.未成功报名记录加一个时间

krock-core-common/src/main/java/com/ydw/yunbuyer/common/utils/date/CreatedTools.java

@@ -1,5 +1,7 @@
 package com.ydw.yunbuyer.common.utils.date;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -27,4 +29,19 @@ public class CreatedTools {
 		return 0l;
 	}
 
+	/**
+	 *  由于时间格式是 yyyyMMddHHmmss 20220422164658
+	 *  暂时使用笨拙的方式进行转换后期有好的方法在进行替换
+	 * @param created
+	 * @return
+	 */
+	public static String getCreatedDate(String created){
+		if (StringUtils.isBlank(created)){
+			return "";
+		}
+		StringBuffer str = new StringBuffer();
+		str.append(created).insert(12,":").insert(10,":").insert(8," ")
+				.insert(6,"-").insert(4,"-");
+		return str.toString();
+	}
 }

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/UnpaidController.java

@@ -4,6 +4,7 @@ import com.ydw.yunbuyer.api.pm.api.PmItemApi;
 import com.ydw.yunbuyer.api.pm.api.pay.PayApi;
 import com.ydw.yunbuyer.api.user.api.PersionApi;
 import com.ydw.yunbuyer.api.user.entity.Persion;
+import com.ydw.yunbuyer.common.utils.date.CreatedTools;
 import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +49,7 @@ public class UnpaidController extends ProjBaseAction {
 		for (Map<String, Object> map : list) {
 			Persion persion = persionApi.get(map.get("user_id").toString());
 			map.put("user_name", persion.getName());
+			map.put("created", CreatedTools.getCreatedDate(String.valueOf(map.get("created"))));
 		}
 		pagePackage.getPage().setList(list);
 

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/pay_record/list.html

@@ -102,26 +102,19 @@ Ext.onReady(function() {
 						labelWidth : 80,
 						labelAlign : 'right'
 					},{
+                        xtype : "textfield",
+                        fieldLabel : "标的物名称",
+                        name : "srh.item_name",
+                        labelAlign : 'right'
+                    },{
 						xtype : "container",
 						layout : "hbox",
 						items : [ 
 							{
-								format: 'Y-m-d H:i:s',
+								format: 'Y-m-d',
 								xtype : "datefield",
-								fieldLabel : "开始时间",
-								name : "srh.created1",
-								labelAlign : 'right'
-							}
-						]
-					},{
-						xtype : "container",
-						layout : "hbox",
-						items : [ 
-							{
-								format: 'Y-m-d H:i:s',
-								xtype : "datefield",
-								fieldLabel : "结束时间",
-								name : "srh.created2",
+								fieldLabel : "付款时间",
+								name : "srh.created",
 								labelAlign : 'right'
 							}
 						]

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_user/add_price.js

@@ -68,7 +68,9 @@ function add_price(item_id) {
 										success : function(response) {
 											console.log(response);
 											var json = Ext.JSON.decode(response.responseText);
-											add_form_panel_win.close();
+											// add_form_panel_win.close();
+											form.findField("price").setValue("");
+											form.findField("user_id").setValue("");
 											Ext.Msg.alert("提示", json.res);
 										},
 										failure : function(response) {

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/unpaid/list.html

@@ -126,6 +126,12 @@
 				flex : 1,
 				align : 'center'
 			},{
+                text : '付款时间',
+                tooltip : '付款时间',
+                align : 'center',
+                dataIndex : 'created',
+                flex : 1.5,
+            },{
 				xtype : "actioncolumn",
 				align : "center",
 				text : '操作',

krock-pm/krock-service-pm/src/main/java/com/ydw/yunbuyer/serv_pm/service/PmItemServiceApiImpl.java

@@ -10,6 +10,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import javax.transaction.Transactional;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.ClientProtocolException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -695,25 +697,18 @@ public class PmItemServiceApiImpl extends BaseApiImpl<PmItem> implements PmItemA
 		Page page = pagePackage.getPage();
 		String sql = "select t.kid,t.created,t.status_pay,t.business_type,t.money,t.user_id,t1.item_name from t_pay_no t "
 				+ " LEFT JOIN t_pm_item t1 on t.table_id=t1.kid "
-				+ " where t.status_pay=? and t.business_type=? and (t.created>=? and t.created<=?)";
+				+ " where t.status_pay=? and t.business_type=? ";
 		NeParamList params = NeParamList.makeParams();
-		String created1 = srh.getString("created1");
-		String created2 = srh.getString("created2");
-		long creat1 = 0;
-		long creat2 = 0;
-		try {
-			creat1 = DateTools.getstrDate3(created1);
-			creat2 = DateTools.getstrDate3(created2);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
 		params.add(srh.getString("status_pay"));
 		params.add(srh.getString("business_type"));
-		params.add(creat1);
-		params.add(creat2);
+		if (StringUtils.isNotBlank(srh.getString("item_name"))){
+			sql +=" and t1.item_name like '%"+srh.getString("item_name")+"%'";
+		}
+		if (StringUtils.isNotBlank(srh.getString("created"))){
+			sql +=" and t1.created like '%"+srh.getString("created").replace("-","")+"%'";
+		}
+		sql+=" ORDER BY t.created desc ";
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
-		System.out.println(JsonTools.toJson(page));
-
 		pagePackage.setData(list);
 		return pagePackage;
 	}
@@ -957,7 +952,7 @@ public class PmItemServiceApiImpl extends BaseApiImpl<PmItem> implements PmItemA
 
 		JSONObject srh = pagePackage.getSrh();
 		String sql = "SELECT t1.item_name,t.* FROM t_pay_no t LEFT JOIN t_pm_item t1 on t.table_id=t1.kid where (t1.item_name like '%"
-				+ srh.getString("item_name") + "%') group by t.table_id,t.user_id,t.status_pay ";
+				+ srh.getString("item_name") + "%') group by t.table_id,t.user_id,t.status_pay ORDER BY t.created desc ";
 		List<Map<String, Object>> list = jt.queryForList(sql);
 		List<String> l = new LinkedList<String>();
 		for (int i = 0; i < list.size(); i++) {

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/PmItemDaoImpl.java

@@ -770,38 +770,21 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
 				+ " LEFT JOIN t_pm_item t1 on t.table_id=t1.kid "
 				+ " where t.status_pay=? and t.business_type=? ";
 		NeParamList params = NeParamList.makeParams();
-		String created1 = srh.getString("created1");
-		String created2 = srh.getString("created2");
-		long creat1 = 0;
-		long creat2 = 0;
-		try {
-			if (StringUtils.isNotBlank(created1)){
-				creat1 = DateTools.getstrDate3(created1);
-			}
-			if (StringUtils.isNotBlank(created2)){
-				creat2 = DateTools.getstrDate3(created2);
-			}
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
 		params.add(srh.getString("status_pay"));
 		params.add(srh.getString("business_type"));
-		if (creat1>0 && creat2>0){
-			sql+=" and (t.created>=? and t.created<=?) ";
-			params.add(creat1);
-			params.add(creat2);
-		}else if (creat1>0){
-			sql+=" and t.created>=? ";
-			params.add(creat1);
-		}else if (creat2>0){
-			sql+=" and  t.created<=? ";
-			params.add(creat2);
+		if (StringUtils.isNotBlank(srh.getString("item_name"))){
+			sql +=" and t1.item_name like '%"+srh.getString("item_name")+"%'";
+		}
+		if (StringUtils.isNotBlank(srh.getString("created"))){
+			sql +=" and t1.created like '%"+srh.getString("created").replace("-","")+"%'";
 		}
+		sql+=" ORDER BY t.created desc ";
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
 		pagePackage.setData(list);
 		return pagePackage;
 	}
 
+
 	@Override
 	public void auto_start() {
 		long time_opening = System.currentTimeMillis();
@@ -979,7 +962,7 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
 
 		JSONObject srh = pagePackage.getSrh();
 		String sql = "SELECT t1.item_name,t.* FROM t_pay_no t LEFT JOIN t_pm_item t1 on t.table_id=t1.kid where (t1.item_name like '%"
-				+ srh.getString("item_name") + "%') group by t.table_id,t.user_id,t.status_pay ";
+				+ srh.getString("item_name") + "%') group by t.table_id,t.user_id,t.status_pay ORDER BY t.created desc ";
 		List<Map<String, Object>> list = jt.queryForList(sql);
 		List<String> l = new LinkedList<String>();
 		for (int i = 0; i < list.size(); i++) {
@@ -1008,15 +991,6 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
 		return list;
 	}
 
-	public static void main(String[] args) {
-		List<String> list = new ArrayList<String>();
-		list.add("1");
-		list.add("2");
-		list.add("3");
-		list.add("4");
-		list.remove(0);
-	}
-
 	@Override
 	public void set_price(@RequestBody t_pm_item pm_item) {
 		BigDecimal price_start = pm_item.getPrice_start();