#627 update query param

plugin/dapp/collateralize/commands/cmd.go

@@ -391,23 +391,24 @@ func CollateralizeQuery(cmd *cobra.Command, args []string) {
 	}
 
 	if collateralizeID != "" {
-		if statusStr != "" {
-			params.FuncName = "CollateralizeRecordByStatus"
+		 if address != "" {
+			params.FuncName = "CollateralizeRecordByAddr"
 
-			req := &pkt.ReqCollateralizeRecordByStatus{
+			req := &pkt.ReqCollateralizeRecordByAddr{
 				CollateralizeId: collateralizeID,
 				Status: int32(status),
+				Addr: address,
 			}
 			params.Payload = types.MustPBToJSON(req)
 			var res pkt.RepCollateralizeRecords
 			ctx := jsonrpc.NewRPCCtx(rpcLaddr, "Chain33.Query", params, &res)
 			ctx.Run()
-		} else if address != "" {
-			params.FuncName = "CollateralizeRecordByAddr"
+		} else if statusStr != "" {
+			params.FuncName = "CollateralizeRecordByStatus"
 
-			req := &pkt.ReqCollateralizeRecordByAddr{
+			req := &pkt.ReqCollateralizeRecordByStatus{
 				CollateralizeId: collateralizeID,
-				Addr: address,
+				Status: int32(status),
 			}
 			params.Payload = types.MustPBToJSON(req)
 			var res pkt.RepCollateralizeRecords

plugin/dapp/collateralize/executor/query.go

@@ -100,7 +100,15 @@ func (c *Collateralize) Query_CollateralizeRecordByAddr(req *pty.ReqCollateraliz
 		return nil, err
 	}
 
-	ret.Records = records
+	if req.Status == 0 {
+		ret.Records = records
+	} else {
+		for _,record := range records {
+			if record.Status == req.Status {
+				ret.Records = append(ret.Records, record)
+			}
+		}
+	}
 	return ret, nil
 }
 

plugin/dapp/collateralize/proto/collateralize.proto

@@ -185,7 +185,8 @@ message RepCollateralizeIDs {
 message ReqCollateralizeRecordByAddr {
     string collateralizeId = 1;
     string addr            = 2;
-    int64  index           = 3;
+    int32 status           = 3;
+    int64  index           = 4;
 }
 
 // 根据状态和借贷ID混合查询具体借贷记录

plugin/dapp/issuance/commands/cmd.go

@@ -322,23 +322,24 @@ func IssuanceQuery(cmd *cobra.Command, args []string) {
 	}
 
 	if issuanceID != "" {
-		if statusStr != "" {
-			params.FuncName = "IssuanceRecordsByStatus"
+		if address != "" {
+			params.FuncName = "IssuanceRecordsByAddr"
 
-			req := &pkt.ReqIssuanceRecordsByStatus{
+			req := &pkt.ReqIssuanceRecordsByAddr{
 				IssuanceId: issuanceID,
 				Status: int32(status),
+				Addr: address,
 			}
 			params.Payload = types.MustPBToJSON(req)
 			var res pkt.RepIssuanceRecords
 			ctx := jsonrpc.NewRPCCtx(rpcLaddr, "Chain33.Query", params, &res)
 			ctx.Run()
-		} else if address != "" {
-			params.FuncName = "IssuanceRecordsByAddr"
+		} else if statusStr != "" {
+			params.FuncName = "IssuanceRecordsByStatus"
 
-			req := &pkt.ReqIssuanceRecordsByAddr{
+			req := &pkt.ReqIssuanceRecordsByStatus{
 				IssuanceId: issuanceID,
-				Addr: address,
+				Status: int32(status),
 			}
 			params.Payload = types.MustPBToJSON(req)
 			var res pkt.RepIssuanceRecords

plugin/dapp/issuance/executor/query.go

@@ -88,7 +88,16 @@ func (c *Issuance) Query_IssuanceRecordsByAddr(req *pty.ReqIssuanceRecordsByAddr
 		return nil, err
 	}
 
-	ret.Records = records
+	if req.Status == 0 {
+		ret.Records = records
+	} else {
+		for _,record := range records {
+			if record.Status == req.Status {
+				ret.Records = append(ret.Records, record)
+			}
+		}
+	}
+
 	return ret, nil
 }
 

plugin/dapp/issuance/proto/issuance.proto

@@ -166,7 +166,8 @@ message RepIssuanceIDs {
 message ReqIssuanceRecordsByAddr {
     string issuanceId = 1;
     string addr       = 2;
-    int64 index       = 3;
+    int32 status      = 3;
+    int64 index       = 4;
 }
 
 // 根据状态查询抵押记录