wangchuanjin 1 anno fa
parent
commit
57ffe39de9
2 ha cambiato i file con 11 aggiunte e 5 eliminazioni
  1. 6 1
      api/internal/service/network.go
  2. 5 4
      api/internal/service/network_test.go

+ 6 - 1
api/internal/service/network.go

@@ -363,10 +363,15 @@ func (n *network) List(in *types.NetWorkListReq) *types.Reply {
 	}
 	if in.Starttime != "" {
 		q += ` and a.create_time>=?`
-		args = append(args, in.Starttime)
+		args = append(args, in.Starttime+" 00:00:00")
 	}
 	if in.Endtime != "" {
 		q += ` and a.create_time<=?`
+		if in.Starttime == in.Endtime {
+			in.Endtime += " 23:59:59"
+		} else {
+			in.Endtime += " 00:00:00"
+		}
 		args = append(args, in.Endtime)
 	}
 	if in.Name != "" {

+ 5 - 4
api/internal/service/network_test.go

@@ -105,16 +105,17 @@ func TestNetWorkList(t *testing.T) {
 	initDb()
 	//类型;firstparty:甲方 supplier:供应商 adiffb:同甲异业 middleman:中间人 agency:招标代理机构
 	res := Network.List(&types.NetWorkListReq{
-		PositionId: 1205591997,
+		//PositionId: 1205591997,
+		PositionId: 935,
 		// Order_amount:       1,
 		// Monitorcount_start: 1,
 		// Monitorcount_end:   1,
 		//Monitor:      0,
 		//Project_matchme: 1,
-		// Starttime: "2024-04-23 16:00:00",
-		// Endtime:   "2024-04-23 19:00:00",
+		Starttime: "2024-04-23",
+		Endtime:   "2024-04-23",
 		//Type: "agency",
-		Name: "三亚市",
+		//Name: "三亚市",
 	})
 	for k, v := range res.Data.(map[string]interface{}) {
 		if k == "list" {