|
|
@@ -133,7 +133,7 @@ type QueryAmountLogRsp struct {
|
|
|
// @Param pagesize query int false "每页条数"
|
|
|
// @Param pageflag query int false "分页标志 0-page从0开始 1-page从1开始"
|
|
|
// @Param accountID query string true "资金账户 - 格式:1,2,3"
|
|
|
-// @Param OperateType query string false "资金操作类型 - 格式:1,2,3" --改为使用 BUSINESSCODE
|
|
|
+// @Param operateType query string false "资金操作类型 - 格式:1,2,3"
|
|
|
// @Success 200 {object} QueryAmountLogRsp
|
|
|
// @Failure 500 {object} app.Response
|
|
|
// @Router /TaAccount/QueryAmountLog [get]
|
|
|
@@ -174,7 +174,7 @@ func QueryAmountLog(c *gin.Context) {
|
|
|
END AS OPERATETYPENAME`).
|
|
|
Where(fmt.Sprintf("TAACCOUNTLOG.AMOUNT <> 0 and TAACCOUNTLOG.ACCOUNTID in (%s)", req.AccountID)).Desc("TAACCOUNTLOG.AUTOID")
|
|
|
if len(req.OperateType) > 0 {
|
|
|
- s = s.And(fmt.Sprintf("TAACCOUNTLOG.BUSINESSCODE in (%s)", req.OperateType))
|
|
|
+ s = s.And(fmt.Sprintf("TAACCOUNTLOG.OPERATETYPE in (%s)", req.OperateType))
|
|
|
}
|
|
|
if err := s.Find(&datas); err != nil {
|
|
|
// 查询失败
|
|
|
@@ -251,7 +251,7 @@ type QueryHisAmountLogRsp struct {
|
|
|
// @Param pagesize query int false "每页条数"
|
|
|
// @Param pageflag query int false "分页标志 0-page从0开始 1-page从1开始"
|
|
|
// @Param accountID query string true "资金账户 - 格式:1,2,3"
|
|
|
-// @Param OperateType query string false "资金操作类型 - 格式:1,2,3"
|
|
|
+// @Param operateType query string false "资金操作类型 - 格式:1,2,3"
|
|
|
// @Param startDate query string false "开始时间 - 闭区间,格式:yyyy-MM-dd"
|
|
|
// @Param endDate query string false "结束时间 - 闭区间,格式:yyyy-MM-dd"
|
|
|
// @Success 200 {object} QueryHisAmountLogRsp
|
|
|
@@ -294,7 +294,7 @@ func QueryHisAmountLog(c *gin.Context) {
|
|
|
END AS OPERATETYPENAME`).
|
|
|
Where(fmt.Sprintf(`HIS_TAACCOUNTLOG.ISVALIDDATA = 1 and HIS_TAACCOUNTLOG.AMOUNT <> 0 and HIS_TAACCOUNTLOG.ACCOUNTID in (%s)`, req.AccountID)).Desc("HIS_TAACCOUNTLOG.AUTOID")
|
|
|
if len(req.OperateType) > 0 {
|
|
|
- s = s.And(fmt.Sprintf("HIS_TAACCOUNTLOG.BUSINESSCODE in (%s)", req.OperateType))
|
|
|
+ s = s.And(fmt.Sprintf("HIS_TAACCOUNTLOG.OPERATETYPE in (%s)", req.OperateType))
|
|
|
}
|
|
|
if len(req.StartDate) > 0 {
|
|
|
s = s.And(fmt.Sprintf("to_date(HIS_TAACCOUNTLOG.HISTRADEDATE,'yyyyMMdd') >= to_date('%s','yyyy-MM-dd')", req.StartDate))
|