任务 #93848 增加排序

models/ermcp.go

@@ -51,6 +51,7 @@ type ErmcpSpotContractModel struct {
 	AUDITREMARK       string  `json:"auditremark"  xorm:"'AUDITREMARK'"`             // 审核意见
 	AUDITTIME         string  `json:"audittime"  xorm:"'AUDITTIME'"`                 // 审核时间
 	CREATETIME        string  `json:"createtime"  xorm:"'CREATETIME'"`               // 创建时间
+	UPDATETIME        string  `json:"updatetime"  xorm:"'UPDATETIME'"`               // 更新时间
 	SPOTGOODSMODELID  int32   `json:"spotgoodsmodelid"  xorm:"'SPOTGOODSMODELID'"`   // 现货型号ID
 	SPOTGOODSBRANDID  int32   `json:"spotgoodsbrandid"  xorm:"'SPOTGOODSBRANDID'"`   // 现货品牌ID
 	BRANDNAME         string  `json:"brandname"  xorm:"'brandname'"`                 // 品牌名称
@@ -90,6 +91,7 @@ func (r *ErmcpSpotContractModel) buildSql(nQueryType int32) string {
 		"       t.SPOTGOODSBRANDID," +
 		"       to_char(t.audittime, 'yyyy-mm-dd hh24:mi:ss') audittime," +
 		"       to_char(t.createtime, 'yyyy-mm-dd hh24:mi:ss') createtime," +
+		"       to_char(t.updatetime, 'yyyy-mm-dd hh24:mi:ss') updatetime," +
 		"       u1.accountname BuyUserName," +
 		"       u2.accountname SellUserName," +
 		"       g.deliverygoodscode," +
@@ -120,14 +122,18 @@ func (r *ErmcpSpotContractModel) buildSql(nQueryType int32) string {
 	// 合同状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
 	var status string
 	switch nQueryType {
-	case 1:
+	case 1: // 未提交
 		status = "0,4,6"
-	case 2:
+		str += " order by t.updatetime desc"
+	case 2: // 待审核
 		status = "1"
-	case 3:
+		str += " order by t.updatetime desc"
+	case 3: // 履约中
 		status = "2"
-	case 4:
+		str += " order by t.audittime desc"
+	case 4: // 已完成
 		status = "3,5"
+		str += " order by t.updatetime desc"
 	}
 
 	return fmt.Sprintf(str, status, r.USERID)

models/ermcpGGConvertconfig.go

@@ -27,6 +27,7 @@ type ErmcpGGConvertCfg struct {
 	DstCode          string  `json:"dstcode"  xorm:"'DstCode'"`                   // 目录品种代码
 	DstUnitid        uint32  `json:"dstunitid"  xorm:"'DstUnitid'"`               // 目标品种单位ID
 	DstUnitidName    string  `json:"dstunitidname"`                               // 目标品种单位名称
+	MODIFYTIME       string  `json:"modifytime"  xorm:"'MODIFYTIME'"`             // 修改时间
 }
 
 func (r *ErmcpGGConvertCfg) Calc() {
@@ -51,6 +52,7 @@ func (r *ErmcpGGConvertCfg) buildSql() string {
 	sqlId := "select t.srcgoodsgroupid," +
 		"       t.destgoodsgroupid," +
 		"       t.convertratio," +
+		"       to_char(t.modifytime,'yyyy-mm-dd hh24:mi:ss')  modifytime," +
 		"       ex1.exexchangecode srcExchangeCode," +
 		"       g1.goodsgroupname  srcName," +
 		"       g1.outergroupcode  srcCode," +
@@ -75,6 +77,7 @@ func (r *ErmcpGGConvertCfg) buildSql() string {
 	if r.Srcgoodsgroupid > 0 {
 		sqlId = sqlId + fmt.Sprintf("and t.Srcgoodsgroupid=%v", r.Srcgoodsgroupid)
 	}
+	sqlId += " order by t.destgoodsgroupid, t.modifytime desc"
 	return sqlId
 }
 

models/ermcpHedgePlan.go

@@ -29,7 +29,9 @@ type ErmcpHedgePlan struct {
 	Plantime          string  `json:"plantime"  xorm:"'Plantime'"`                   //计划时间
 	Hedgeplanstatus   int     `json:"hedgeplanstatus"  xorm:"'Hedgeplanstatus'"`     //套保计划状态 -  0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
 	Remark            string  `json:"remark"  xorm:"'Remark'"`                       //备注
-	CREATETIME        string `json:"createtime"  xorm:"'CREATETIME'"`                //创建时间
+	CREATETIME        string  `json:"createtime"  xorm:"'CREATETIME'"`               //创建时间
+	UPDATETIME        string  `json:"updatetime"  xorm:"'UPDATETIME'"`               //更新时间
+	AUDITTIME         string  `json:"audittime"  xorm:"'AUDITTIME'"`                 //审核时间
 }
 
 func (r *ErmcpHedgePlan) buildSql(status string) string {
@@ -46,6 +48,8 @@ func (r *ErmcpHedgePlan) buildSql(status string) string {
 		"       t.Convertfactor," +
 		"       to_char(t.Plantime,'yyyy-mm-dd hh24:mi:ss') Plantime," +
 		"       to_char(t.createtime,'yyyy-mm-dd hh24:mi:ss') createtime," +
+		"       to_char(t.updatetime, 'yyyy-mm-dd hh24:mi:ss') updatetime," +
+		"       to_char(t.audittime, 'yyyy-mm-dd hh24:mi:ss') audittime," +
 		"       t.Hedgeplanstatus," +
 		"       t.Remark" +
 		"  from ermcp_hedgeplan t" +
@@ -55,6 +59,13 @@ func (r *ErmcpHedgePlan) buildSql(status string) string {
 		"    on t.deliverygoodsid = g.deliverygoodsid" +
 		" where t.hedgeplanstatus in (%v) and t.areauserid=%v"
 
+	if status == "2" {
+		// 执行中状态，按审核时间倒序
+		str += " order by t.audittime desc"
+	} else {
+		str += " order by t.updatetime desc"
+	}
+
 	return fmt.Sprintf(str, status, r.Areauserid)
 }
 

models/ermcpMiddleGoods.go

@@ -28,6 +28,7 @@ type ErmcpMiddleGoodsModel struct {
 	GOODSGROUPID     int32   `json:"goodsgroupid"  xorm:"'GOODSGROUPID'"`         // 关联期货品种ID
 	ISVALID          int32   `json:"isvalid"  xorm:"'ISVALID'"`                   // 状态 0-无效(停用) 1-有效(正常)
 	MODIFYTIME       string  `json:"modifytime"  xorm:"'MODIFYTIME'"`             // 修改时间
+	CREATETIME       string  `json:"createtime"  xorm:"'CREATETIME'"`             // 修改时间
 	ENUMDICNAME      string  `json:"enumdicname"`                                 // 单位名称
 }
 
@@ -75,6 +76,7 @@ func (r *ErmcpMiddleGoodsModel) buildSql() string {
 		"       AREAUSERID," +
 		"       GOODSGROUPID," +
 		"       to_char(MODIFYTIME, 'yyyy-mm-dd hh24:mi:ss') MODIFYTIME," +
+		"       to_char(CREATETIME, 'yyyy-mm-dd hh24:mi:ss') CREATETIME," +
 		"       ISVALID" +
 		"  from erms_middlegoods t" +
 		"  where 1=1 "
@@ -87,6 +89,7 @@ func (r *ErmcpMiddleGoodsModel) buildSql() string {
 	if r.MIDDLEGOODSID > 0 {
 		sqlId = sqlId + fmt.Sprintf(" and MIDDLEGOODSID=%v", r.MIDDLEGOODSID)
 	}
+	sqlId += "order by t.createtime desc"
 	return sqlId
 }
 

models/ermcpUser.go

@@ -14,7 +14,7 @@ import (
 	"mtp2_if/utils"
 )
 
-// 客户资料结构
+// ErmcpUserModel 客户资料结构
 type ErmcpUserModel struct {
 	USERID            int    `json:"userid"  xorm:"'USERID'"`                       // 用户ID
 	MEMBERUSERID      int    `json:"memberuserid"  xorm:"'MEMBERUSERID'"`           // 所属机构ID
@@ -35,6 +35,8 @@ type ErmcpUserModel struct {
 	PROVINCEID        int32  `json:"provinceid"  xorm:"'PROVINCEID'"`               // 省
 	CITYID            int32  `json:"cityid"  xorm:"'CITYID'"`                       // 市
 	CREATETIME        string `json:"createtime"  xorm:"'CREATETIME'"`               // 创建时间
+	MODIFYTIME        string `json:"modifytime"  xorm:"'MODIFYTIME'"`               // 修改时间
+	AUDITTIME         string `json:"audittime"  xorm:"'AUDITTIME'"`                 // 审核时间
 }
 
 func (r *ErmcpUserModel) buildWskhSql(accStatus string) string {
@@ -55,14 +57,17 @@ func (r *ErmcpUserModel) buildWskhSql(accStatus string) string {
 		"       t.countryid," +
 		"       t.provinceid," +
 		"       to_char(t.createtime,'yyyy-mm-dd hh24:mi:ss') createtime," +
-		"       t.cityid" +
+		"       t.cityid," +
+		"       to_char(t.modifiedtime,'yyyy-mm-dd hh24:mi:ss') modifytime," +
+		"       to_char(t.auditime,'yyyy-mm-dd hh24:mi:ss') audittime" +
 		"  from wskh_userinfo t" +
 		"  left join enumdicitem e" +
 		"    on t.cardtype = e.enumitemname" +
 		"   and e.enumdiccode = 'certificatetype'" +
 		" where t.userstate in (%v)" +
 		"   and t.usertype = 6" +
-		"   and t.memberareaid = %v"
+		"   and t.memberareaid = %v" +
+		" order by t.modifiedtime desc"
 	return fmt.Sprintf(str, accStatus, r.MEMBERUSERID)
 }
 
@@ -84,6 +89,8 @@ func (r *ErmcpUserModel) buildSql(accStatus string) string {
 		"       u.countryid," +
 		"       u.provinceid," +
 		"       to_char(t.createtime,'yyyy-mm-dd hh24:mi:ss') createtime," +
+		"       to_char(t.modifytime,'yyyy-mm-dd hh24:mi:ss') modifytime," +
+		"       to_char(t.audittime,'yyyy-mm-dd hh24:mi:ss') audittime," +
 		"       u.cityid" +
 		"  from useraccount t" +
 		"  left join userinfo u" +
@@ -94,6 +101,13 @@ func (r *ErmcpUserModel) buildSql(accStatus string) string {
 		" where t.usertype = 6" +
 		"   and t.accountstatus in (%v)" +
 		"   and t.memberuserid = %v"
+	// 查正常状态,按审核时间排序
+	if accStatus == "4" {
+		str += " order by t.audittime desc"
+	} else if accStatus == "6" {
+		// 停用状态按修改时间排序
+		str += " order by t.modifytime desc"
+	}
 
 	return fmt.Sprintf(str, accStatus, r.MEMBERUSERID)
 }

models/ermcpWrstandard.go

@@ -58,6 +58,7 @@ func (r *ErmcpWrstandard) buildSql() string {
 	if r.ISVALID >= 0 {
 		sqlId = sqlId + fmt.Sprintf(" and t.ISVALID=%v", r.ISVALID)
 	}
+	sqlId += " order by createtime desc"
 	return sqlId
 }