浏览代码

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

ytf 3 年之前
父节点
当前提交
e7e99ecf0a

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

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

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

+ 8 - 15
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() {
102
 						labelWidth : 80,
102
 						labelWidth : 80,
103
 						labelAlign : 'right'
103
 						labelAlign : 'right'
104
 					},{
104
 					},{
105
+                        xtype : "textfield",
106
+                        fieldLabel : "标的物名称",
107
+                        name : "srh.item_name",
108
+                        labelAlign : 'right'
109
+                    },{
105
 						xtype : "container",
110
 						xtype : "container",
106
 						layout : "hbox",
111
 						layout : "hbox",
107
 						items : [ 
112
 						items : [ 
108
 							{
113
 							{
109
-								format: 'Y-m-d H:i:s',
114
+								format: 'Y-m-d',
110
 								xtype : "datefield",
115
 								xtype : "datefield",
111
-								fieldLabel : "开始时间",
112
-								name : "srh.created1",
113
-								labelAlign : 'right'
114
-							}
115
-						]
116
-					},{
117
-						xtype : "container",
118
-						layout : "hbox",
119
-						items : [ 
120
-							{
121
-								format: 'Y-m-d H:i:s',
122
-								xtype : "datefield",
123
-								fieldLabel : "结束时间",
124
-								name : "srh.created2",
116
+								fieldLabel : "付款时间",
117
+								name : "srh.created",
125
 								labelAlign : 'right'
118
 								labelAlign : 'right'
126
 							}
119
 							}
127
 						]
120
 						]

+ 3 - 1
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) {
68
 										success : function(response) {
68
 										success : function(response) {
69
 											console.log(response);
69
 											console.log(response);
70
 											var json = Ext.JSON.decode(response.responseText);
70
 											var json = Ext.JSON.decode(response.responseText);
71
-											add_form_panel_win.close();
71
+											// add_form_panel_win.close();
72
+											form.findField("price").setValue("");
73
+											form.findField("user_id").setValue("");
72
 											Ext.Msg.alert("提示", json.res);
74
 											Ext.Msg.alert("提示", json.res);
73
 										},
75
 										},
74
 										failure : function(response) {
76
 										failure : function(response) {

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

@@ -126,6 +126,12 @@
126
 				flex : 1,
126
 				flex : 1,
127
 				align : 'center'
127
 				align : 'center'
128
 			},{
128
 			},{
129
+                text : '付款时间',
130
+                tooltip : '付款时间',
131
+                align : 'center',
132
+                dataIndex : 'created',
133
+                flex : 1.5,
134
+            },{
129
 				xtype : "actioncolumn",
135
 				xtype : "actioncolumn",
130
 				align : "center",
136
 				align : "center",
131
 				text : '操作',
137
 				text : '操作',

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

@@ -10,6 +10,8 @@ import java.util.LinkedList;
10
 import java.util.List;
10
 import java.util.List;
11
 import java.util.Map;
11
 import java.util.Map;
12
 import javax.transaction.Transactional;
12
 import javax.transaction.Transactional;
13
+
14
+import org.apache.commons.lang3.StringUtils;
13
 import org.apache.http.client.ClientProtocolException;
15
 import org.apache.http.client.ClientProtocolException;
14
 import org.springframework.beans.factory.annotation.Autowired;
16
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.jdbc.core.JdbcTemplate;
17
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -695,25 +697,18 @@ public class PmItemServiceApiImpl extends BaseApiImpl<PmItem> implements PmItemA
695
 		Page page = pagePackage.getPage();
697
 		Page page = pagePackage.getPage();
696
 		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 "
698
 		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 "
697
 				+ " LEFT JOIN t_pm_item t1 on t.table_id=t1.kid "
699
 				+ " LEFT JOIN t_pm_item t1 on t.table_id=t1.kid "
698
-				+ " where t.status_pay=? and t.business_type=? and (t.created>=? and t.created<=?)";
700
+				+ " where t.status_pay=? and t.business_type=? ";
699
 		NeParamList params = NeParamList.makeParams();
701
 		NeParamList params = NeParamList.makeParams();
700
-		String created1 = srh.getString("created1");
701
-		String created2 = srh.getString("created2");
702
-		long creat1 = 0;
703
-		long creat2 = 0;
704
-		try {
705
-			creat1 = DateTools.getstrDate3(created1);
706
-			creat2 = DateTools.getstrDate3(created2);
707
-		} catch (ParseException e) {
708
-			e.printStackTrace();
709
-		}
710
 		params.add(srh.getString("status_pay"));
702
 		params.add(srh.getString("status_pay"));
711
 		params.add(srh.getString("business_type"));
703
 		params.add(srh.getString("business_type"));
712
-		params.add(creat1);
713
-		params.add(creat2);
704
+		if (StringUtils.isNotBlank(srh.getString("item_name"))){
705
+			sql +=" and t1.item_name like '%"+srh.getString("item_name")+"%'";
706
+		}
707
+		if (StringUtils.isNotBlank(srh.getString("created"))){
708
+			sql +=" and t1.created like '%"+srh.getString("created").replace("-","")+"%'";
709
+		}
710
+		sql+=" ORDER BY t.created desc ";
714
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
711
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
715
-		System.out.println(JsonTools.toJson(page));
716
-
717
 		pagePackage.setData(list);
712
 		pagePackage.setData(list);
718
 		return pagePackage;
713
 		return pagePackage;
719
 	}
714
 	}
@@ -957,7 +952,7 @@ public class PmItemServiceApiImpl extends BaseApiImpl<PmItem> implements PmItemA
957
 
952
 
958
 		JSONObject srh = pagePackage.getSrh();
953
 		JSONObject srh = pagePackage.getSrh();
959
 		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 '%"
954
 		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 '%"
960
-				+ srh.getString("item_name") + "%') group by t.table_id,t.user_id,t.status_pay ";
955
+				+ srh.getString("item_name") + "%') group by t.table_id,t.user_id,t.status_pay ORDER BY t.created desc ";
961
 		List<Map<String, Object>> list = jt.queryForList(sql);
956
 		List<Map<String, Object>> list = jt.queryForList(sql);
962
 		List<String> l = new LinkedList<String>();
957
 		List<String> l = new LinkedList<String>();
963
 		for (int i = 0; i < list.size(); i++) {
958
 		for (int i = 0; i < list.size(); i++) {

+ 8 - 34
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 {
770
 				+ " LEFT JOIN t_pm_item t1 on t.table_id=t1.kid "
770
 				+ " LEFT JOIN t_pm_item t1 on t.table_id=t1.kid "
771
 				+ " where t.status_pay=? and t.business_type=? ";
771
 				+ " where t.status_pay=? and t.business_type=? ";
772
 		NeParamList params = NeParamList.makeParams();
772
 		NeParamList params = NeParamList.makeParams();
773
-		String created1 = srh.getString("created1");
774
-		String created2 = srh.getString("created2");
775
-		long creat1 = 0;
776
-		long creat2 = 0;
777
-		try {
778
-			if (StringUtils.isNotBlank(created1)){
779
-				creat1 = DateTools.getstrDate3(created1);
780
-			}
781
-			if (StringUtils.isNotBlank(created2)){
782
-				creat2 = DateTools.getstrDate3(created2);
783
-			}
784
-		} catch (ParseException e) {
785
-			e.printStackTrace();
786
-		}
787
 		params.add(srh.getString("status_pay"));
773
 		params.add(srh.getString("status_pay"));
788
 		params.add(srh.getString("business_type"));
774
 		params.add(srh.getString("business_type"));
789
-		if (creat1>0 && creat2>0){
790
-			sql+=" and (t.created>=? and t.created<=?) ";
791
-			params.add(creat1);
792
-			params.add(creat2);
793
-		}else if (creat1>0){
794
-			sql+=" and t.created>=? ";
795
-			params.add(creat1);
796
-		}else if (creat2>0){
797
-			sql+=" and  t.created<=? ";
798
-			params.add(creat2);
775
+		if (StringUtils.isNotBlank(srh.getString("item_name"))){
776
+			sql +=" and t1.item_name like '%"+srh.getString("item_name")+"%'";
777
+		}
778
+		if (StringUtils.isNotBlank(srh.getString("created"))){
779
+			sql +=" and t1.created like '%"+srh.getString("created").replace("-","")+"%'";
799
 		}
780
 		}
781
+		sql+=" ORDER BY t.created desc ";
800
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
782
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
801
 		pagePackage.setData(list);
783
 		pagePackage.setData(list);
802
 		return pagePackage;
784
 		return pagePackage;
803
 	}
785
 	}
804
 
786
 
787
+
805
 	@Override
788
 	@Override
806
 	public void auto_start() {
789
 	public void auto_start() {
807
 		long time_opening = System.currentTimeMillis();
790
 		long time_opening = System.currentTimeMillis();
@@ -979,7 +962,7 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
979
 
962
 
980
 		JSONObject srh = pagePackage.getSrh();
963
 		JSONObject srh = pagePackage.getSrh();
981
 		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 '%"
964
 		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 '%"
982
-				+ srh.getString("item_name") + "%') group by t.table_id,t.user_id,t.status_pay ";
965
+				+ srh.getString("item_name") + "%') group by t.table_id,t.user_id,t.status_pay ORDER BY t.created desc ";
983
 		List<Map<String, Object>> list = jt.queryForList(sql);
966
 		List<Map<String, Object>> list = jt.queryForList(sql);
984
 		List<String> l = new LinkedList<String>();
967
 		List<String> l = new LinkedList<String>();
985
 		for (int i = 0; i < list.size(); i++) {
968
 		for (int i = 0; i < list.size(); i++) {
@@ -1008,15 +991,6 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
1008
 		return list;
991
 		return list;
1009
 	}
992
 	}
1010
 
993
 
1011
-	public static void main(String[] args) {
1012
-		List<String> list = new ArrayList<String>();
1013
-		list.add("1");
1014
-		list.add("2");
1015
-		list.add("3");
1016
-		list.add("4");
1017
-		list.remove(0);
1018
-	}
1019
-
1020
 	@Override
994
 	@Override
1021
 	public void set_price(@RequestBody t_pm_item pm_item) {
995
 	public void set_price(@RequestBody t_pm_item pm_item) {
1022
 		BigDecimal price_start = pm_item.getPrice_start();
996
 		BigDecimal price_start = pm_item.getPrice_start();