Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

controllers/ermcp/qryMiddleGoods.go

@@ -72,4 +72,30 @@ func QueryMiddleGoodsDetail(c *gin.Context) {
 		//appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
 		appG.Response(http.StatusOK, e.SUCCESS, nil)
 	}
+}
+
+// 查询套保品种变更记录请求
+type QryMGChangeLogReq struct {
+	UserId uint32 `form:"userid" binding:"required"` //用户ID
+	MiddleGoodsId uint32 `form:"middlegoodsid" binding:"required"` // 套保品种ID
+}
+
+// 查询套保品种变更记录响应
+type QryMGChangeLogRsp models.ErmcpMiddleGoodsChangeLog
+
+// @Summary 查询套保品种变更记录(菜单:套保品种/商品详情/变更记录)
+// @Produce json
+// @Security ApiKeyAuth
+// @Param userid query int true  "所属机构ID"
+// @Param middlegoodsid query int true  "套保品种id"
+// @Success 200 {array} QryMGChangeLogRsp
+// @Failure 500 {object} app.Response
+// @Router /Ermcp/QueryMiddleGoodsChangeLog [get]
+// @Tags 企业风险管理(app)
+func QueryMiddleGoodsChangeLog(c *gin.Context) {
+	appG := app.GinUtils{Gin:app.Gin{C: c}}
+	var req QryMGChangeLogReq
+	appG.DoBindReq(&req)
+	m := models.ErmcpMiddleGoodsChangeLog{MIDDLEGOODSID: int(req.MiddleGoodsId)}
+	appG.DoGetDataEx(&m)
 }

global/app/ginUtils.go

@@ -17,6 +17,11 @@ type IGetData interface {
 	GetData()([]interface{}, error)
 }
 
+// 获取数据接口
+type IGetDataEx interface {
+	GetDataEx()(interface{}, error)
+}
+
 // 数据处理接口
 type ICalc interface {
 	Calc()
@@ -57,4 +62,20 @@ func (r *GinUtils) DoGetData(obj interface{}) {
 			r.Gin.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
 		}
 	}
+}
+
+// 处理数据获取, 参数obj为models结构体
+func (r *GinUtils) DoGetDataEx(modelObj interface{})  {
+	// 如果在参数绑定阶段有错误, 则不执行数据获取
+	if r.err != nil{
+		return
+	}
+	if v, ok := modelObj.(IGetDataEx); ok{
+		if d, err := v.GetDataEx(); err == nil{
+			r.Gin.Response(http.StatusOK, e.SUCCESS, d)
+		}else{
+			logger.GetLogger().Errorf("query fail, %v", err)
+			r.Gin.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
+		}
+	}
 }

models/ermcpMiddleGoods.go

@@ -94,11 +94,11 @@ func (r *ErmcpMiddleGoodsModel) buildSql() string {
 
 // 期货品种折算配置表
 type GoodsGroupConvert struct {
-	Convertratio    float64 `json:"convertratio"  xorm:"'Convertratio'"`       // 折算系数
-	SrcGoodsgroupid int32   `json:"srcgoodsgroupid"  xorm:"'SrcGoodsgroupid'"` // 源期货品种ID
+	Convertratio    float64 `json:"convertratio"  xorm:"'Convertratio'"`        // 折算系数
+	SrcGoodsgroupid int32   `json:"srcgoodsgroupid"  xorm:"'SrcGoodsgroupid'"`  // 源期货品种ID
 	DstGoodsgroupid int32   `json:"dstgoodsgroupid"  xorm:"'destgoodsgroupid'"` // 目标期货品种ID
-	Goodsgroupname  string  `json:"goodsgroupname"  xorm:"'Goodsgroupname'"`   // 期货品种名称
-	Outergroupcode  string  `json:"outergroupcode"  xorm:"'Outergroupcode'"`   // 期货品种代码
+	Goodsgroupname  string  `json:"goodsgroupname"  xorm:"'Goodsgroupname'"`    // 期货品种名称
+	Outergroupcode  string  `json:"outergroupcode"  xorm:"'Outergroupcode'"`    // 期货品种代码
 }
 
 func (r *GoodsGroupConvert) buildSql() string {
@@ -161,5 +161,43 @@ type ErmcpMiddleGoodsChangeLog struct {
 	UPDATETIME    string  `json:"updatetime"  xorm:"'UPDATETIME'"`       // 更新时间
 	APPLYSRC      int32   `json:"applysrc"  xorm:"'APPLYSRC'"`           // 操作来源 - 1:管理端 2:终端
 	APPLYID       int64   `json:"applyid"  xorm:"'APPLYID'"`             // 操作人
-	APPLYNAME     string  `json:"applyname"  xorm:"'-'"`                 // 操作人名称
+	APPLYNAME     string  `json:"applyname"`                             // 操作人名称
+}
+
+func (r *ErmcpMiddleGoodsChangeLog) buildSql() string {
+	sqlId := "SELECT LOGID," +
+		"       MIDDLEGOODSID," +
+		"       CHANGELOGTYPE," +
+		"       BEFOREVALUE," +
+		"       AFTERVALUE," +
+		"       LOGDATETIME," +
+		"       LOGREMARK," +
+		"       HANDLESTATUS," +
+		"       TRADEDATE," +
+		"       UPDATETIME," +
+		"       APPLYSRC," +
+		"       APPLYID" +
+		"  FROM ermcp_mgchangelog" +
+		" WHERE 1 = 1"
+	if r.MIDDLEGOODSID > 0 {
+		sqlId = sqlId + fmt.Sprintf(" and MIDDLEGOODSID=%v", r.MIDDLEGOODSID)
+	}
+	return sqlId
+}
+
+// 处理要转换的数据
+func (r *ErmcpMiddleGoodsChangeLog) Calc() {
+	r.APPLYNAME = mtpcache.GetUserNameByUserId(r.APPLYID)
+}
+
+// 获取套保变更操作数据
+func (r *ErmcpMiddleGoodsChangeLog) GetDataEx() (interface{}, error) {
+	sData := make([]ErmcpMiddleGoodsChangeLog, 0)
+	if err := db.GetEngine().SQL(r.buildSql()).Find(&sData); err != nil {
+		return nil, err
+	}
+	for i := range sData {
+		sData[i].Calc()
+	}
+	return sData, nil
 }

routers/router.go

@@ -327,6 +327,7 @@ func InitRouter() *gin.Engine {
 		ermcpR.GET("/QueryMiddleGoods", ermcp.QueryMiddleGoods)
 		ermcpR.GET("/QueryMiddleGoodsDetail", ermcp.QueryMiddleGoodsDetail)
 		ermcpR.GET("/QueryGGConvertConfig", ermcp.QueryGGConvertConfig)
+		ermcpR.GET("/QueryMiddleGoodsChangeLog", ermcp.QueryMiddleGoodsChangeLog)
 	}
 
 	return r