Selaa lähdekoodia

千海金查客户资料增加生日、性别、所属客户经理字段

zou.yingbin 4 vuotta sitten
vanhempi
commit
b260094464
5 muutettua tiedostoa jossa 169 lisäystä ja 87 poistoa
  1. 3 1
      controllers/qhjPCWeb/qryQhjPCWeb.go
  2. 23 1
      docs/docs.go
  3. 23 1
      docs/swagger.json
  4. 17 2
      docs/swagger.yaml
  5. 103 82
      models/qhjPCWeb.go

+ 3 - 1
controllers/qhjPCWeb/qryQhjPCWeb.go

@@ -41,6 +41,7 @@ func QuerySubArea(c *gin.Context) {
 // @Param userinfotype query int false "客户类型 1-个人 2-企业"
 // @Param customername query string false "客户名称(模糊匹配)"
 // @Param nickname query string false "昵称(模糊匹配)"
+// @Param brokername query string false "所属客户经理(模糊匹配)"
 // @Param includesub query int false "是否包含子级 1-包含"
 // @Success 200 {array} models.QhjMgrCustomer
 // @Failure 500 {object} app.Response
@@ -55,11 +56,12 @@ func QueryCustomerInfo(c *gin.Context) {
 		CUSTOMERNAME string `form:"customername"`                             // 客户名称
 		NICKNAME     string `form:"nickname"`                                 // 昵称
 		INCLUDESUB   int32  `form:"includesub"`                               // 是否包含子级
+		BROKERNAME   string `form:"brokername"`                               // 所属客户经理
 	}{}
 	a.DoBindReq(&req)
 	// Tips: 手机号码是加密存储的, 做不了模糊匹配, 加了又去掉了
 	m := models.QhjMgrCustomer{USERID: mtpcache.GetAreaUserId(req.USERID, 0), USERINFOTYPE: req.USERINFOTYPE, QUERYTYPE: req.QUERYTYPE,
-		CUSTOMERNAME: req.CUSTOMERNAME, NICKNAME: req.NICKNAME, IncludeSub: req.INCLUDESUB}
+		CUSTOMERNAME: req.CUSTOMERNAME, NICKNAME: req.NICKNAME, IncludeSub: req.INCLUDESUB, BROKERNAME: req.BROKERNAME}
 	a.DoGetDataI(&m)
 }
 

+ 23 - 1
docs/docs.go

@@ -8721,6 +8721,12 @@ var doc = `{
                         "in": "query"
                     },
                     {
+                        "type": "string",
+                        "description": "所属客户经理(模糊匹配)",
+                        "name": "brokername",
+                        "in": "query"
+                    },
+                    {
                         "type": "integer",
                         "description": "是否包含子级 1-包含",
                         "name": "includesub",
@@ -27133,6 +27139,18 @@ var doc = `{
                     "description": "审核时间",
                     "type": "string"
                 },
+                "birthday": {
+                    "description": "生日",
+                    "type": "string"
+                },
+                "brokerid": {
+                    "description": "所属客户经理id",
+                    "type": "integer"
+                },
+                "brokername": {
+                    "description": "所属客户经理名称",
+                    "type": "string"
+                },
                 "cardbackphotourl": {
                     "description": "证件反面图片地址",
                     "type": "string"
@@ -27249,6 +27267,10 @@ var doc = `{
                     "description": "备注",
                     "type": "string"
                 },
+                "sex": {
+                    "description": "性别 0-女 1-男",
+                    "type": "integer"
+                },
                 "status": {
                     "description": "开户状态(网上开户表wskh_userinfo) 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过 ; 账户状态(正式表useraccount) 1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:停用(注销) 7:注销(删除)",
                     "type": "integer"
@@ -32099,7 +32121,7 @@ var doc = `{
                     "type": "string"
                 },
                 "wrtradeorderstatus": {
-                    "description": "委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 10:挂牌部分成交 11:仓单生成失败 12:首付扣款失败 13:履约失败 14:撤单解冻贷款失败 15:部成部撤",
+                    "description": "委托状态 - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败",
                     "type": "integer"
                 },
                 "wrtradetype": {

+ 23 - 1
docs/swagger.json

@@ -8705,6 +8705,12 @@
                         "in": "query"
                     },
                     {
+                        "type": "string",
+                        "description": "所属客户经理(模糊匹配)",
+                        "name": "brokername",
+                        "in": "query"
+                    },
+                    {
                         "type": "integer",
                         "description": "是否包含子级 1-包含",
                         "name": "includesub",
@@ -27117,6 +27123,18 @@
                     "description": "审核时间",
                     "type": "string"
                 },
+                "birthday": {
+                    "description": "生日",
+                    "type": "string"
+                },
+                "brokerid": {
+                    "description": "所属客户经理id",
+                    "type": "integer"
+                },
+                "brokername": {
+                    "description": "所属客户经理名称",
+                    "type": "string"
+                },
                 "cardbackphotourl": {
                     "description": "证件反面图片地址",
                     "type": "string"
@@ -27233,6 +27251,10 @@
                     "description": "备注",
                     "type": "string"
                 },
+                "sex": {
+                    "description": "性别 0-女 1-男",
+                    "type": "integer"
+                },
                 "status": {
                     "description": "开户状态(网上开户表wskh_userinfo) 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过 ; 账户状态(正式表useraccount) 1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:停用(注销) 7:注销(删除)",
                     "type": "integer"
@@ -32083,7 +32105,7 @@
                     "type": "string"
                 },
                 "wrtradeorderstatus": {
-                    "description": "委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 10:挂牌部分成交 11:仓单生成失败 12:首付扣款失败 13:履约失败 14:撤单解冻贷款失败 15:部成部撤",
+                    "description": "委托状态 - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败",
                     "type": "integer"
                 },
                 "wrtradetype": {

+ 17 - 2
docs/swagger.yaml

@@ -10735,6 +10735,15 @@ definitions:
       audittime:
         description: 审核时间
         type: string
+      birthday:
+        description: 生日
+        type: string
+      brokerid:
+        description: 所属客户经理id
+        type: integer
+      brokername:
+        description: 所属客户经理名称
+        type: string
       cardbackphotourl:
         description: 证件反面图片地址
         type: string
@@ -10822,6 +10831,9 @@ definitions:
       remark:
         description: 备注
         type: string
+      sex:
+        description: 性别 0-女 1-男
+        type: integer
       status:
         description: '开户状态(网上开户表wskh_userinfo) 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过
           ; 账户状态(正式表useraccount) 1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:停用(注销) 7:注销(删除)'
@@ -14428,8 +14440,7 @@ definitions:
         description: 仓单贸易委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
         type: string
       wrtradeorderstatus:
-        description: 委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝
-          10:挂牌部分成交 11:仓单生成失败 12:首付扣款失败 13:履约失败 14:撤单解冻贷款失败 15:部成部撤
+        description: 委托状态 - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败
         type: integer
       wrtradetype:
         description: 仓单贸易类型 - 1:挂牌 2:摘牌 3:提货卖(文化中国) 4:提货买(文化中国)
@@ -23066,6 +23077,10 @@ paths:
         in: query
         name: nickname
         type: string
+      - description: 所属客户经理(模糊匹配)
+        in: query
+        name: brokername
+        type: string
       - description: 是否包含子级 1-包含
         in: query
         name: includesub

+ 103 - 82
models/qhjPCWeb.go

@@ -91,6 +91,10 @@ type QhjMgrCustomer struct {
 	EMAIL             string `json:"email"  xorm:"'EMAIL'"`                         // 邮件
 	USERNAME          string `json:"username"  xorm:"'USERNAME'"`                   // 用户名称
 	LOGINCODE         string `json:"logincode"  xorm:"'LOGINCODE'"`                 // 登录账号(代码)
+	BROKERID          int64  `json:"brokerid"  xorm:"'BROKERID'"`                   // 所属客户经理id
+	BROKERNAME        string `json:"brokername"  xorm:"'BROKERNAME'"`               // 所属客户经理名称
+	BIRTHDAY          string `json:"birthday"  xorm:"'BIRTHDAY'"`                   // 生日
+	SEX               int32  `json:"sex"  xorm:"'SEX'"`                             // 性别 0-女 1-男
 
 	COUNTRYNAME    string `json:"countryname"`    // 国家名称
 	CITYNAME       string `json:"cityname"`       // 城市名称
@@ -167,97 +171,113 @@ func (r *QhjMgrCustomer) buildSql() string {
 }
 
 func (r *QhjMgrCustomer) buildSqlWskh() string {
-	var sqlId utils.SQLVal = "select *" +
-		"  from (select t.userid," +
-		"               t.memberareaid MEMBERUSERID," +
-		"               t.USERINFOTYPE," +
-		"               t.username," +
-		"               t.CUSTOMERNAME," +
-		"               t.NICKNAME," +
-		"               t.CARDTYPE," +
-		"               t.CARDNUM," +
-		"               t.mobilephone MOBILE," +
-		"               t.TELPHONE," +
-		"               t.cardaddress ADDRESS," +
-		"               t.REMARK," +
-		"               t.ATTACHMENT1," +
-		"               t.CARDFRONTPHOTOURL," +
-		"               t.CARDBACKPHOTOURL," +
-		"               t.proxystatementurl," +
-		"               t.userstate status," +
-		"               t.countryid," +
-		"               t.provinceid," +
-		"               t.districtid," +
-		"               to_char(t.createtime, 'yyyy-mm-dd hh24:mi:ss') createtime," +
-		"               t.cityid," +
-		"               to_char(t.modifiedtime, 'yyyy-mm-dd hh24:mi:ss') modifytime," +
-		"               to_char(t.auditime, 'yyyy-mm-dd hh24:mi:ss') audittime," +
-		"               t.taxpayernum," +
-		"               t.legalpersonname," +
-		"               t.contactname," +
-		"               t.email," +
-		"               t.areaid parentuserid," +
-		"               t.logincode," +
-		"               t.usertype" +
-		"          from wskh_userinfo t" +
-		"         start with t.areaid = %v" +
-		"        connect by prior t.userid = t.areaid" +
-		"               and t.usertype in (2, 6)" +
-		"               and level = %v) a" +
-		" where 1 = 1" +
-		"   and a.usertype != 2" +
-		"   and a.status in (%v)"
+	var sqlId utils.SQLVal = `
+select u.accountname brokername, a.*
+  from (select t.userid,
+               t.memberareaid MEMBERUSERID,
+               t.USERINFOTYPE,
+               t.username,
+               t.CUSTOMERNAME,
+               t.NICKNAME,
+               t.CARDTYPE,
+               t.CARDNUM,
+               t.mobilephone MOBILE,
+               t.TELPHONE,
+               t.cardaddress ADDRESS,
+               t.REMARK,
+               t.ATTACHMENT1,
+               t.CARDFRONTPHOTOURL,
+               t.CARDBACKPHOTOURL,
+               t.proxystatementurl,
+               t.userstate status,
+               t.countryid,
+               t.provinceid,
+               t.districtid,
+               to_char(t.createtime, 'yyyy-mm-dd hh24:mi:ss') createtime,
+               t.cityid,
+               to_char(t.modifiedtime, 'yyyy-mm-dd hh24:mi:ss') modifytime,
+               to_char(t.auditime, 'yyyy-mm-dd hh24:mi:ss') audittime,
+               t.taxpayernum,
+               t.legalpersonname,
+               t.contactname,
+               t.email,
+               t.areaid parentuserid,
+               t.logincode,
+               t.usertype,
+               t.sex,
+               to_char(t.birthday, 'yyyy-mm-dd hh24:mi:ss') birthday,
+               to_number(t.brokerid) brokerid
+          from wskh_userinfo t
+         start with t.areaid = %v
+        connect by prior t.userid = t.areaid
+               and t.usertype in (2, 6)
+               and level = %v) a
+  left join useraccount u
+    on a.brokerid = u.userid
+ where 1 = 1
+   and a.usertype != 2
+   and a.status in (%v)
+`
 	status := DecodeStr(r.QUERYTYPE == 1, "1", "2,4,5")
 	sqlId.FormatParam(r.USERID, r.level(), status)
 	sqlId.AndEx("a.USERINFOTYPE", r.USERINFOTYPE, r.USERINFOTYPE > 0)
 	sqlId.JoinEx(len(r.CUSTOMERNAME) > 0, fmt.Sprintf(` and a.customername like '%%%v%%'`, r.CUSTOMERNAME))
 	sqlId.JoinEx(len(r.NICKNAME) > 0, fmt.Sprintf(` and a.nickname like '%%%v%%'`, r.NICKNAME))
+	sqlId.JoinEx(len(r.BROKERNAME) > 0, fmt.Sprintf(` and u.accountname like '%%%v%%'`, r.BROKERNAME))
 	return sqlId.String()
 }
 
 func (r *QhjMgrCustomer) buildSqlNormal() string {
-	var sqlId utils.SQLVal = "with tmp as" +
-		" (select t.userid, wm_concat(t.logincode) logincode" +
-		"    from loginaccount t" +
-		"   group by t.userid)" +
-		"select a.*," +
-		"       k.logincode," +
-		"       u.USERINFOTYPE," +
-		"       u.CUSTOMERNAME," +
-		"       u.NICKNAME," +
-		"       u.CARDTYPEID CARDTYPE," +
-		"       u.CARDNUM," +
-		"       u.MOBILE," +
-		"       u.TELPHONE," +
-		"       u.ADDRESS," +
-		"       u.REMARK," +
-		"       u.ATTACHMENT1," +
-		"       u.CARDFRONTPHOTOURL," +
-		"       u.CARDBACKPHOTOURL," +
-		"       u.proxystatementurl," +
-		"       u.countryid," +
-		"       u.provinceid," +
-		"       u.districtid," +
-		"       u.taxpayernum," +
-		"       u.legalpersonname," +
-		"       u.contactname," +
-		"       u.email," +
-		"       u.cityid" +
-		"  from (select t.userid," +
-		"               t.usertype," +
-		"               t.parentuserid," +
-		"               t.memberuserid," +
-		"               t.accountstatus status," +
-		"               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" +
-		"          from useraccount t where 1=1 and t.usertype = 6 %v" +
-		"         ) a" +
-		"  left join tmp k" +
-		"    on a.userid = k.userid" +
-		"  left join userinfo u" +
-		"    on a.userid = u.userid" +
-		" where 1 = 1"
+	var sqlId utils.SQLVal = `
+with tmp as
+ (select t.userid, wm_concat(t.logincode) logincode
+    from loginaccount t
+   group by t.userid)
+select a.*,
+       k.logincode,
+       u.USERINFOTYPE,
+       u.CUSTOMERNAME,
+       u.NICKNAME,
+       u.CARDTYPEID CARDTYPE,
+       u.CARDNUM,
+       u.MOBILE,
+       u.TELPHONE,
+       u.ADDRESS,
+       u.REMARK,
+       u.ATTACHMENT1,
+       u.CARDFRONTPHOTOURL,
+       u.CARDBACKPHOTOURL,
+       u.proxystatementurl,
+       u.countryid,
+       u.provinceid,
+       u.districtid,
+       u.taxpayernum,
+       u.legalpersonname,
+       u.contactname,
+       u.email,
+       u.cityid,
+       u.sex,
+       to_char(u.birthday, 'yyyy-mm-dd hh24:mi:ss') birthday,
+       u2.accountname brokername
+  from (select t.userid,
+               t.usertype,
+               t.parentuserid,
+               t.memberuserid,
+               t.broker,
+               t.accountstatus status,
+               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
+          from useraccount t
+         where 1 = 1
+           and t.usertype = 6 %v) a
+  left join tmp k
+    on a.userid = k.userid
+  left join userinfo u
+    on a.userid = u.userid
+  left join useraccount u2 on a.broker=u2.broker
+ where 1 = 1
+`
 	status := DecodeStr(r.QUERYTYPE == 3, "4", "6")
 	var sqlParam utils.SQLVal
 	sqlParam.And("t.accountstatus", status)
@@ -270,6 +290,7 @@ func (r *QhjMgrCustomer) buildSqlNormal() string {
 	sqlId.AndEx("u.USERINFOTYPE", r.USERINFOTYPE, r.USERINFOTYPE > 0)
 	sqlId.JoinEx(len(r.CUSTOMERNAME) > 0, fmt.Sprintf(` and u.customername like '%%%v%%'`, r.CUSTOMERNAME))
 	sqlId.JoinEx(len(r.NICKNAME) > 0, fmt.Sprintf(` and u.nickname like '%%%v%%'`, r.NICKNAME))
+	sqlId.JoinEx(len(r.BROKERNAME) > 0, fmt.Sprintf(` and u2.accountname like '%%%v%%'`, r.BROKERNAME))
 	return sqlId.String()
 }