Strona główna Odkrywaj Pomoc
Zaloguj się
ytf
/
krock
Obserwuj 1
Polub 0
Forkuj 0
Files Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

修改小问题

ytf 3 lat temu
rodzic
0456d9eeb2
commit
2961f3c9a5
8 zmienionych plików z 35 dodań i 13 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 17 4
      krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line/list.html
  2. 1 2
      krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/edit.js
  3. 3 0
      krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/list.html
  4. 1 1
      krock-pm/krock-service-pm/src/main/java/com/ydw/yunbuyer/serv_pm/service/PmItemServiceApiImpl.java
  5. 0 1
      krock-pm/krock-service-pm/src/main/java/com/ydw/yunbuyer/serv_pm/service/PmVerifyServiceApiImpl.java
  6. 1 1
      krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/PmItemDaoImpl.java
  7. 0 1
      krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/PmVerifyDaoImpl.java
  8. 12 3
      krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxSubmitDaoImpl.java

+ 17 - 4
krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line/list.html
Wyświetl plik 

@@ -1,13 +1,18 @@
1 
 <!DOCTYPE html>
 1 
 <!DOCTYPE html>
2 
 <html>
 2 
 <html>
3 
 <head>
 3 
 <head>
4 
-    <title>用户列表</title>
4 
+    <title>线下报名列表</title>
5 
     <meta charset="UTF-8">
 5 
     <meta charset="UTF-8">
6 
     <link rel="stylesheet" href="https://yun.eqbidding.com/extjs/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
 6 
     <link rel="stylesheet" href="https://yun.eqbidding.com/extjs/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
7 
     <script src="https://yun.eqbidding.com/extjs/extjs6.0/ext-all.js"></script>
 7 
     <script src="https://yun.eqbidding.com/extjs/extjs6.0/ext-all.js"></script>
8 
     <script src="https://yun.eqbidding.com/extjs/extjs6.0/classic/locale/locale-zh_CN.js"></script>
 8 
     <script src="https://yun.eqbidding.com/extjs/extjs6.0/classic/locale/locale-zh_CN.js"></script>
9 
     <script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
 9 
     <script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
10 
     <script type="text/javascript" src="/web-cp-all/resource/js/jquery.js"></script>
 10 
     <script type="text/javascript" src="/web-cp-all/resource/js/jquery.js"></script>
11 
+    <style>
12 
+        .custom-grid-row{
13 
+            height:30px;
14 
+        }
15 
+    </style>
11 
     <script type="text/javascript">
 16 
     <script type="text/javascript">
12 
         var dataStore;
 17 
         var dataStore;
13 
         var searchFormPanel;
 18 
         var searchFormPanel;
 
@@ -126,6 +131,12 @@
126
131
127 
             listGridPanel = Ext.create('Ext.grid.Panel', {
 132 
             listGridPanel = Ext.create('Ext.grid.Panel', {
128 
                 title : '线下报名列表',
 133 
                 title : '线下报名列表',
134 
+                viewConfig:{
135 
+                    getRowClass:function(){
136 
+                        // 在这里添加自定样式 改变这个表格的行高
137 
+                        return 'custom-grid-row';
138 
+                    }
139 
+                },
129 
                 dockedItems : [
 140 
                 dockedItems : [
130 
                     {
 141 
                     {
131 
                         xtype : 'pagingtoolbar',
 142 
                         xtype : 'pagingtoolbar',
 
@@ -196,7 +207,7 @@
196 
                             if(val == undefined || val == ''){
 207 
                             if(val == undefined || val == ''){
197 
                                 return '没有相关图片信息!';
 208 
                                 return '没有相关图片信息!';
198 
                             }else{
 209 
                             }else{
199 
-                                return '<img style="width:100%;height:100%;"  onclick="enlarge(\''+val+'\')" src="https://www.eqbidding.com/web-cp-all/img_pm/img/'+val+'" />';
210 
+                                return '<img style="width:100%;height:26px;"  onclick="enlarge(\''+val+'\')" src="https://www.eqbidding.com/web-cp-all/img_pm/img/'+val+'" />';
200 
                             }
 211 
                             }
201 
                         }
 212 
                         }
202 
                     },{
 213 
                     },{
 
@@ -240,6 +251,8 @@
240
251
241 
                                 }
 252 
                                 }
242 
                             },{
 253 
                             },{
254 
+                                xtype : 'container'
255 
+                            },{
243 
                                 xtype : 'button',
 256 
                                 xtype : 'button',
244 
                                 tooltip : '驳回',
 257 
                                 tooltip : '驳回',
245 
                                 icon : jcapp.getIcon("user_cross.png"),
 258 
                                 icon : jcapp.getIcon("user_cross.png"),
 
@@ -257,9 +270,9 @@
257 
                         ]
 270 
                         ]
258 
                     }
 271 
                     }
259 
                 ],
 272 
                 ],
260 
-                viewConfig:{
273 
+                /*viewConfig:{
261 
                     enableTextSelection:true
 274 
                     enableTextSelection:true
262 
-                }
275 
+                }*/
263 
             });
 276 
             });
264
277
265 
             searchFormPanel.render(Ext.getBody());
 278 
             searchFormPanel.render(Ext.getBody());

+ 1 - 2
krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/edit.js
Wyświetl plik 

@@ -45,9 +45,8 @@ var edit_form_panel = Ext.create("Ext.form.Panel", {
45 
 						waitMsg : "保存中...",
 45 
 						waitMsg : "保存中...",
46 
 						submitEmptyText: false,
 46 
 						submitEmptyText: false,
47 
 						success : function(form, action) {
 47 
 						success : function(form, action) {
48 
-
49 
 							Ext.Msg.alert("提示", "保存成功！");
 48 
 							Ext.Msg.alert("提示", "保存成功！");
50 
-							edit_form_panel_win.close();
49 
+							// edit_form_panel_win.close();
51 
 						},
 50 
 						},
52 
 						failure : function(form, action) {
 51 
 						failure : function(form, action) {
53 
 							Ext.Msg.alert("提示", "操作失败！");
 52 
 							Ext.Msg.alert("提示", "操作失败！");

+ 3 - 0
krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/list.html
Wyświetl plik 

@@ -184,12 +184,15 @@
184 
                             handler : function(grid, rowIndex, colIndex) {
 184 
                             handler : function(grid, rowIndex, colIndex) {
185 
                                 var rec = grid.getStore().getAt(rowIndex);
 185 
                                 var rec = grid.getStore().getAt(rowIndex);
186 
                                 if(rec.get('bid_opening')=='已开拍'){
 186 
                                 if(rec.get('bid_opening')=='已开拍'){
187 
+                                    Ext.Msg.alert("提示", "已开拍不能设置");
187 
                                     return ;
 188 
                                     return ;
188 
                                 }
 189 
                                 }
189 
                                 if(rec.get('bid_opening')=='已中止'){
 190 
                                 if(rec.get('bid_opening')=='已中止'){
191 
+                                    Ext.Msg.alert("提示", "已中止不能设置");
190 
                                     return ;
 192 
                                     return ;
191 
                                 }
 193 
                                 }
192 
                                 if(rec.get('bid_opening')=='已结束'){
 194 
                                 if(rec.get('bid_opening')=='已结束'){
195 
+                                    Ext.Msg.alert("提示", "已结束不能设置");
193 
                                     return ;
 196 
                                     return ;
194 
                                 }
 197 
                                 }
195 
                                 set_price(rec.get('kid'));
 198 
                                 set_price(rec.get('kid'));

+ 1 - 1
krock-pm/krock-service-pm/src/main/java/com/ydw/yunbuyer/serv_pm/service/PmItemServiceApiImpl.java
Wyświetl plik 

@@ -62,7 +62,7 @@ public class PmItemServiceApiImpl extends BaseApiImpl<PmItem> implements PmItemA
62 
 		JSONObject srh = pagePackage.getSrh();
 62 
 		JSONObject srh = pagePackage.getSrh();
63 
 		Map<String, String> sort_param = pagePackage.getSort_param();
 63 
 		Map<String, String> sort_param = pagePackage.getSort_param();
64 
 		Page page = pagePackage.getPage();
 64 
 		Page page = pagePackage.getPage();
65 
-		String sql = "select t.* from t_pm_item t where t.status=0 and (t.item_name like ?) and (t.bid_opening=?) order by t.time_opening ";
65 
+		String sql = "select t.* from t_pm_item t where t.status=0 and (t.item_name like ?) and (t.bid_opening=?) order by t.created desc ";
66 
 		NeParamList params = NeParamList.makeParams();
 66 
 		NeParamList params = NeParamList.makeParams();
67 
 		params.addLike(srh.getString("item_name"));
 67 
 		params.addLike(srh.getString("item_name"));
68 
 		params.add(srh.getString("bid_opening"));
 68 
 		params.add(srh.getString("bid_opening"));

+ 0 - 1
krock-pm/krock-service-pm/src/main/java/com/ydw/yunbuyer/serv_pm/service/PmVerifyServiceApiImpl.java
Wyświetl plik 

@@ -62,7 +62,6 @@ public class PmVerifyServiceApiImpl implements PmVerifyApi {
62 
 			pm_itemDb.setTime_end(project_itemDb.getTime_end());
 62 
 			pm_itemDb.setTime_end(project_itemDb.getTime_end());
63 
 			pm_itemDb.setUpdate_interval(project_itemDb.getUpdate_interval());
 63 
 			pm_itemDb.setUpdate_interval(project_itemDb.getUpdate_interval());
64 
 			pm_itemDb.setMoney_type(project_itemDb.getMoney_type());
 64 
 			pm_itemDb.setMoney_type(project_itemDb.getMoney_type());
65 
-			pm_itemDb.setAuctioneer(project_itemDb.getAuctioneer());
66 
 			pm_itemDb.setBid_from(project_itemDb.getBid_from());
 65 
 			pm_itemDb.setBid_from(project_itemDb.getBid_from());
67 
 			pm_itemDb.setPrice_start(project_itemDb.getPrice_start());
 66 
 			pm_itemDb.setPrice_start(project_itemDb.getPrice_start());
68 
 			pm_itemDb.setPrice_add(project_itemDb.getPrice_add());
 67 
 			pm_itemDb.setPrice_add(project_itemDb.getPrice_add());

+ 1 - 1
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/PmItemDaoImpl.java
Wyświetl plik 

@@ -62,7 +62,7 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
62 
 		JSONObject srh = pagePackage.getSrh();
 62 
 		JSONObject srh = pagePackage.getSrh();
63 
 		Map<String, String> sort_param = pagePackage.getSort_param();
 63 
 		Map<String, String> sort_param = pagePackage.getSort_param();
64 
 		Page page = pagePackage.getPage();
 64 
 		Page page = pagePackage.getPage();
65 
-		String sql = "select t.* from t_pm_item t where t.status=0 and (t.item_name like ?) and (t.bid_opening=?) order by t.time_opening ";
65 
+		String sql = "select t.* from t_pm_item t where t.status=0 and (t.item_name like ?) and (t.bid_opening=?) order by t.created desc ";
66 
 		NeParamList params = NeParamList.makeParams();
 66 
 		NeParamList params = NeParamList.makeParams();
67 
 		params.addLike(srh.getString("item_name"));
 67 
 		params.addLike(srh.getString("item_name"));
68 
 		params.add(srh.getString("bid_opening"));
 68 
 		params.add(srh.getString("bid_opening"));

+ 0 - 1
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/PmVerifyDaoImpl.java
Wyświetl plik 

@@ -63,7 +63,6 @@ public class PmVerifyDaoImpl implements PmVerifyDao {
63 
 			pm_itemDb.setTime_end(project_itemDb.getTime_end());
 63 
 			pm_itemDb.setTime_end(project_itemDb.getTime_end());
64 
 			pm_itemDb.setUpdate_interval(project_itemDb.getUpdate_interval());
 64 
 			pm_itemDb.setUpdate_interval(project_itemDb.getUpdate_interval());
65 
 			pm_itemDb.setMoney_type(project_itemDb.getMoney_type());
 65 
 			pm_itemDb.setMoney_type(project_itemDb.getMoney_type());
66 
-			pm_itemDb.setAuctioneer(project_itemDb.getAuctioneer());
67 
 			pm_itemDb.setBid_from(project_itemDb.getBid_from());
 66 
 			pm_itemDb.setBid_from(project_itemDb.getBid_from());
68 
 			pm_itemDb.setPrice_start(project_itemDb.getPrice_start());
 67 
 			pm_itemDb.setPrice_start(project_itemDb.getPrice_start());
69 
 			pm_itemDb.setPrice_add(project_itemDb.getPrice_add());
 68 
 			pm_itemDb.setPrice_add(project_itemDb.getPrice_add());

+ 12 - 3
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxSubmitDaoImpl.java
Wyświetl plik 

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
4 
 import java.util.List;
 4 
 import java.util.List;
5 
 import java.util.Map;
 5 
 import java.util.Map;
6
6
7 
+import com.ydw.yunbuyer.web.pm.dao.PmItemDao;
7 
 import org.apache.commons.lang3.StringUtils;
 8 
 import org.apache.commons.lang3.StringUtils;
8 
 import org.springframework.beans.factory.annotation.Autowired;
 9 
 import org.springframework.beans.factory.annotation.Autowired;
9 
 import org.springframework.stereotype.Repository;
 10 
 import org.springframework.stereotype.Repository;
 
@@ -32,6 +33,9 @@ public class WxSubmitDaoImpl extends BaseDaoImpl<t_pm_offline_apply> implements
32 
 	@Autowired
 33 
 	@Autowired
33 
 	private BaseMySQLService bs;
 34 
 	private BaseMySQLService bs;
34
35
36 
+	@Autowired
37 
+	private PmItemDao pmItemDao;
38 
+
35 
 	/**
 39 
 	/**
36 
 	 * 线下报名
 40 
 	 * 线下报名
37 
 	 *
41 
 	 * 
@@ -125,12 +129,14 @@ public class WxSubmitDaoImpl extends BaseDaoImpl<t_pm_offline_apply> implements
125 
 //		}
 129 
 //		}
126 
 		pm_offline_apply.setIs_pay(2);
 130 
 		pm_offline_apply.setIs_pay(2);
127 
 		bs.updateObjT(pm_offline_apply);
 131 
 		bs.updateObjT(pm_offline_apply);
128 
-		/*String sql = "select t.* from t_pm_item_submit t where t.status=0 " +
132 
+		String sql = "select t.* from t_pm_item_submit t where t.status=0 " +
129 
 				" and t.pm_item_id= '"+pm_offline_apply.getPm_item_id()+"' " +
 133 
 				" and t.pm_item_id= '"+pm_offline_apply.getPm_item_id()+"' " +
130 
 				" and t.pm_user_id= '"+pm_offline_apply.getPm_user_id()+"' ";
 134 
 				" and t.pm_user_id= '"+pm_offline_apply.getPm_user_id()+"' ";
131 
 		t_pm_item_submit pm_item_submit  = bs.findObj(sql, t_pm_item_submit.class);
 135 
 		t_pm_item_submit pm_item_submit  = bs.findObj(sql, t_pm_item_submit.class);
132 
-		pm_item_submit.setStatus(-100);
133 
-		bs.updateObjT(pm_item_submit);*/
136 
+		if (pm_item_submit != null){
137 
+			pm_item_submit.setStatus(-100);
138 
+			bs.updateObjT(pm_item_submit);
139 
+		}
134 
 	}
 140 
 	}
135
141
136 
 	@Override
 142 
 	@Override
 
@@ -194,6 +200,9 @@ public class WxSubmitDaoImpl extends BaseDaoImpl<t_pm_offline_apply> implements
194 
 		if (price.compareTo(pm_item.getPrice_start()) < 0) {
 200 
 		if (price.compareTo(pm_item.getPrice_start()) < 0) {
195 
 			return false;
 201 
 			return false;
196 
 		}
 202 
 		}
203 
+		//竞价时间
204 
+		long new_time_end = System.currentTimeMillis() + pm_item.getUpdate_interval() * 1000;
205 
+		pmItemDao.update_time_end(pm_item, new_time_end);
197 
 		String sql = "select t.* from t_pm_item_submit t where (t.pm_user_id=?) and (t.pm_item_id=?) and t.status=0 ";
 206 
 		String sql = "select t.* from t_pm_item_submit t where (t.pm_user_id=?) and (t.pm_item_id=?) and t.status=0 ";
198 
 		t_pm_item_submit pm_item_submit = bs.findObj(t_pm_item_submit.class, sql,
 207 
 		t_pm_item_submit pm_item_submit = bs.findObj(t_pm_item_submit.class, sql,
199 
 				new Object[] { offline_apply_id, pm_item_id });
 208 
 				new Object[] { offline_apply_id, pm_item_id });