linmadan / mmm-worth · 提交

转到一个项目

作者 陈志颖
提交 fbddd7d6c1acddf80c79fa1d09093ba7fb11221f 1 个父辈 368c65f1

test:排行榜

内嵌 并排对比
正在显示 2 个修改的文件 包含 183 行增加 和 14 行删除
@@ -118,3 +118,119 @@ @@ -118,3 +118,119 @@
118 } 118 }
119 2020/11/22 11:27:51.988 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606015671715470000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},"currentEmployeeWealth":{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":88100,"Ranking":1},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":26117.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":7132,"Ranking":3},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":3209.8,"Ranking":4},{"Uid":3259769336383488,"EmployeeName":"张三","EmployeesContributions":-10000,"Ranking":5}],"employeesWealth":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":88100,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":26217.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeeSuMoney": 119 2020/11/22 11:27:51.988 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606015671715470000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},"currentEmployeeWealth":{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":88100,"Ranking":1},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":26117.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":7132,"Ranking":3},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":3209.8,"Ranking":4},{"Uid":3259769336383488,"EmployeeName":"张三","EmployeesContributions":-10000,"Ranking":5}],"employeesWealth":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":88100,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":26217.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeeSuMoney":
120 2020/11/22 11:27:51.988 [D] [server.go:1925] | 127.0.0.1| 200 | 273.421678ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list 120 2020/11/22 11:27:51.988 [D] [server.go:1925] | 127.0.0.1| 200 | 273.421678ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  121 +2020/11/22 11:58:38.218 [I] [???:0] http server Running on http://:8082
  122 +2020/11/22 11:58:42.742 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606017522742157000
  123 + Auth=
  124 + BodyData:{
  125 + "companyId": 381,
  126 + "uid": 3259769335767040,
  127 + "rankingType": 1,
  128 + "offset": 0,
  129 + "limit": 20
  130 +}
  131 +2020/11/22 11:58:42.790 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606017522742157000 BodyData:{"code":501,"msg":"内部服务出错：ERROR #42703 column \"employee_su_money\" does not exist"}
  132 +2020/11/22 11:58:42.790 [D] [server.go:1925] | 127.0.0.1| 200 | 48.380143ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  133 +2020/11/22 12:00:12.438 [I] [???:0] http server Running on http://:8082
  134 +2020/11/22 12:00:15.805 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606017615805753000
  135 + Auth=
  136 + BodyData:{
  137 + "companyId": 381,
  138 + "uid": 3259769335767040,
  139 + "rankingType": 1,
  140 + "offset": 0,
  141 + "limit": 20
  142 +}
  143 +2020/11/22 12:00:15.827 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606017615805753000 BodyData:{"code":501,"msg":"内部服务出错：ERROR #42703 column \"su_money_expend\" does not exist"}
  144 +2020/11/22 12:00:15.827 [D] [server.go:1925] | 127.0.0.1| 200 | 22.18184ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  145 +2020/11/22 12:03:59.208 [I] [???:0] http server Running on http://:8082
  146 +2020/11/22 12:04:07.553 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606017847553717000
  147 + Auth=
  148 + BodyData:{
  149 + "companyId": 381,
  150 + "uid": 3259769335767040,
  151 + "rankingType": 1,
  152 + "offset": 0,
  153 + "limit": 20
  154 +}
  155 +2020/11/22 12:04:07.576 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606017847553717000 BodyData:{"code":501,"msg":"内部服务出错：ERROR #42P01 missing FROM-clause entry for table \"su_money_transaction_record\""}
  156 +2020/11/22 12:04:07.576 [D] [server.go:1925] | 127.0.0.1| 200 | 23.004413ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  157 +2020/11/22 12:20:31.275 [I] [???:0] http server Running on http://:8082
  158 +2020/11/22 12:20:34.796 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606018834796917000
  159 + Auth=
  160 + BodyData:{
  161 + "companyId": 381,
  162 + "uid": 3259769335767040,
  163 + "rankingType": 1,
  164 + "offset": 0,
  165 + "limit": 20
  166 +}
  167 +2020/11/22 12:20:34.826 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606018834796917000 BodyData:{"code":501,"msg":"内部服务出错：ERROR #42703 column \"su_money_expend\" does not exist"}
  168 +2020/11/22 12:20:34.826 [D] [server.go:1925] | 127.0.0.1| 200 | 29.795665ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  169 +2020/11/22 12:22:13.734 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606018933734689000
  170 + Auth=
  171 + BodyData:{
  172 + "companyId": 381,
  173 + "uid": 3259769335767040,
  174 + "rankingType": 1,
  175 + "offset": 0,
  176 + "limit": 20
  177 +}
  178 +2020/11/22 12:22:13.754 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606018933734689000 BodyData:{"code":501,"msg":"内部服务出错：ERROR #42703 column \"su_money_expend\" does not exist"}
  179 +2020/11/22 12:22:13.755 [D] [server.go:1925] | 127.0.0.1| 200 | 20.761409ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  180 +2020/11/22 12:23:07.862 [I] [???:0] http server Running on http://:8082
  181 +2020/11/22 12:23:10.580 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606018990580426000
  182 + Auth=
  183 + BodyData:{
  184 + "companyId": 381,
  185 + "uid": 3259769335767040,
  186 + "rankingType": 1,
  187 + "offset": 0,
  188 + "limit": 20
  189 +}
  190 +2020/11/22 12:23:10.711 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606018990580426000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},"currentEmployeeWealth":{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":86999,"Ranking":1},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":26117.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":7132,"Ranking":3},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":3209.8,"Ranking":4},{"Uid":3259769336383488,"EmployeeName":"张三","EmployeesContributions":-10000,"Ranking":5}],"employeesWealth":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":86999,"Ranking":1}]},"msg":"ok"}
  191 +2020/11/22 12:23:10.711 [D] [server.go:1925] | 127.0.0.1| 200 | 131.065001ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  192 +2020/11/22 12:33:30.845 [I] [???:0] http server Running on http://:8082
  193 +2020/11/22 12:33:52.955 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606019632955031000
  194 + Auth=
  195 + BodyData:{
  196 + "companyId": 381,
  197 + "uid": 3259769335767040,
  198 + "rankingType": 1,
  199 + "offset": 0,
  200 + "limit": 20
  201 +}
  202 +2020/11/22 12:33:53.179 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606019632955031000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},"currentEmployeeWealth":{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":86999,"Ranking":1},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":26117.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":7132,"Ranking":3},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":3209.8,"Ranking":4},{"Uid":3259769336383488,"EmployeeName":"张三","EmployeesContributions":-10000,"Ranking":5}],"employeesWealth":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":86999,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":23819.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeeSuMoney":
  203 +2020/11/22 12:33:53.180 [D] [server.go:1925] | 127.0.0.1| 200 | 225.138069ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  204 +2020/11/22 12:34:22.889 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606019662889441000
  205 + Auth=
  206 + BodyData:{
  207 + "companyId": 381,
  208 + "uid": 3259769336174592,
  209 + "rankingType": 1,
  210 + "offset": 0,
  211 + "limit": 20
  212 +}
  213 +2020/11/22 12:34:23.014 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606019662889441000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":26117.3,"Ranking":2},"currentEmployeeWealth":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":23819.3,"Ranking":2},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":26117.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":7132,"Ranking":3},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":3209.8,"Ranking":4},{"Uid":3259769336383488,"EmployeeName":"张三","EmployeesContributions":-10000,"Ranking":5}],"employeesWealth":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":86999,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":23819.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeeSuMon
  214 +2020/11/22 12:34:23.015 [D] [server.go:1925] | 127.0.0.1| 200 | 125.760916ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  215 +2020/11/22 12:34:28.359 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606019668359718000
  216 + Auth=
  217 + BodyData:{
  218 + "companyId": 381,
  219 + "uid": 3259769336174592,
  220 + "rankingType": 2,
  221 + "offset": 0,
  222 + "limit": 20
  223 +}
  224 +2020/11/22 12:34:28.440 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606019668359718000 BodyData:{"code":0,"data":{"currentEmployeeContributions":null,"currentEmployeeWealth":null,"employeesContributions":null,"employeesWealth":null},"msg":"ok"}
  225 +2020/11/22 12:34:28.441 [D] [server.go:1925] | 127.0.0.1| 200 | 81.400555ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
  226 +2020/11/22 12:34:33.460 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606019673460431000
  227 + Auth=
  228 + BodyData:{
  229 + "companyId": 381,
  230 + "uid": 3259769336174592,
  231 + "rankingType": 1,
  232 + "offset": 0,
  233 + "limit": 20
  234 +}
  235 +2020/11/22 12:34:33.614 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606019673460431000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":26117.3,"Ranking":2},"currentEmployeeWealth":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":23819.3,"Ranking":2},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":88000,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":26117.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":7132,"Ranking":3},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":3209.8,"Ranking":4},{"Uid":3259769336383488,"EmployeeName":"张三","EmployeesContributions":-10000,"Ranking":5}],"employeesWealth":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeeSuMoney":86999,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":23819.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeeSuMon
  236 +2020/11/22 12:34:33.614 [D] [server.go:1925] | 127.0.0.1| 200 | 154.246858ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
@@ -312,30 +312,81 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter @@ -312,30 +312,81 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter
312 tx := dao.transactionContext.PgTx 312 tx := dao.transactionContext.PgTx
313 suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord) 313 suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
314 314
  315 + // 兑换现金退还素币
315 queryWealthRestore := tx.Model(suMoneyTransactionRecordModel) 316 queryWealthRestore := tx.Model(suMoneyTransactionRecordModel)
  317 + queryWealthRestore = queryWealthRestore.Join("JOIN employees AS e ON e.uid = (su_money_transaction_record.employee->>'uid')::bigint")
  318 + queryWealthRestore = queryWealthRestore.ColumnExpr("su_money_transaction_record.employee->>'uid' AS uid")
  319 + queryWealthRestore = queryWealthRestore.ColumnExpr("su_money_transaction_record.employee->>'employeeName' AS employee_name")
  320 + queryWealthRestore = queryWealthRestore.ColumnExpr("sum(su_money_transaction_record.su_money) AS su_money_restore")
  321 + queryWealthRestore = queryWealthRestore.ColumnExpr("ROW_NUMBER() OVER (ORDER BY sum(su_money_transaction_record.su_money) DESC) AS ranking")
  322 + queryWealthRestore = queryWealthRestore.Where(`su_money_transaction_record.record_type =?`, 6)
  323 + queryWealthRestore = queryWealthRestore.Where(`e.status = ?`, 1) // 离职员工过滤
  324 + if companyId, ok := queryOptions["companyId"]; ok && (companyId.(int64) != 0) {
  325 + queryWealthRestore = queryWealthRestore.Where("e.company_id = ?", companyId)
  326 + }
  327 + if startTime, ok := queryOptions["startTime"]; ok {
  328 + queryWealthRestore = queryWealthRestore.Where(`su_money_transaction_record.create_time > ?`, startTime)
  329 + }
  330 + if endTime, ok := queryOptions["endTime"]; ok {
  331 + queryWealthRestore = queryWealthRestore.Where(`su_money_transaction_record.create_time < ?`, endTime)
  332 + }
  333 + queryWealthRestoreWith := queryWealthRestore.GroupExpr("su_money_transaction_record.employee->>'uid',su_money_transaction_record.employee->>'employeeName'")
  334 +
  335 + // 兑换现金退还素币子查询
  336 + //queryWealthRestoreWith := queryWealthRestore.Order("su_money_restore DESC")
  337 +
  338 + // 素币支出
  339 + queryWealthExpend := tx.Model()
  340 + queryWealthExpend = queryWealthExpend.With("a", queryWealthRestoreWith)
  341 + queryWealthExpend = queryWealthExpend.Table("a")
  342 + queryWealthExpend = queryWealthExpend.Table("su_money_transaction_records")
  343 + queryWealthExpend = queryWealthExpend.Join("JOIN employees AS e ON e.uid = (su_money_transaction_records.employee->>'uid')::bigint")
  344 + queryWealthExpend = queryWealthExpend.ColumnExpr("su_money_transaction_records.employee->>'uid' AS uid")
  345 + queryWealthExpend = queryWealthExpend.ColumnExpr("su_money_transaction_records.employee->>'employeeName' AS employee_name")
  346 + queryWealthExpend = queryWealthExpend.ColumnExpr("sum(su_money_transaction_records.su_money) - a.su_money_restore AS su_money_expend")
  347 + queryWealthExpend = queryWealthExpend.ColumnExpr("ROW_NUMBER() OVER (ORDER BY sum(su_money_transaction_records.su_money) DESC) AS ranking")
  348 + queryWealthExpend = queryWealthExpend.Where(`su_money_transaction_records.record_type IN (?)`, pg.In([]int{4, 1, 5}))
  349 + queryWealthExpend = queryWealthExpend.Where(`e.status = ?`, 1) // 离职员工过滤
  350 + //queryWealthExpend = queryWealthExpend.Where("su_money_transaction_records.employee->>'uid' = a.uid")
  351 + if companyId, ok := queryOptions["companyId"]; ok && (companyId.(int64) != 0) {
  352 + queryWealthExpend = queryWealthExpend.Where("e.company_id = ?", companyId)
  353 + }
  354 + if startTime, ok := queryOptions["startTime"]; ok {
  355 + queryWealthExpend = queryWealthExpend.Where(`su_money_transaction_records.create_time > ?`, startTime)
  356 + }
  357 + if endTime, ok := queryOptions["endTime"]; ok {
  358 + queryWealthExpend = queryWealthExpend.Where(`su_money_transaction_records.create_time < ?`, endTime)
  359 + }
  360 + queryWealthExpendWith := queryWealthExpend.GroupExpr("su_money_transaction_records.employee->>'uid',su_money_transaction_records.employee->>'employeeName',a.su_money_restore")
316 361
  362 + // 素币支出子查询
  363 + //queryWealthExpendWith := queryWealthRestore.Order("su_money_expend DESC")
317 364
318 - // 财富值榜单（素币）  
319 - queryWealth := tx.Model(suMoneyTransactionRecordModel)  
320 - queryWealth = queryWealth.Join("JOIN employees AS e ON e.uid = (su_money_transaction_record.employee->>'uid')::bigint")  
321 - queryWealth = queryWealth.ColumnExpr("su_money_transaction_record.employee->>'uid' AS uid")  
322 - queryWealth = queryWealth.ColumnExpr("su_money_transaction_record.employee->>'employeeName' AS employee_name")  
323 - queryWealth = queryWealth.ColumnExpr("sum(su_money_transaction_record.su_money) AS employee_su_money")  
324 - queryWealth = queryWealth.ColumnExpr("ROW_NUMBER() OVER (ORDER BY sum(su_money_transaction_record.su_money) DESC) AS ranking")  
325 - queryWealth = queryWealth.Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{2, 3})) 365 + // 素币值榜单
  366 + queryWealth := tx.Model()
  367 + queryWealth = queryWealth.With("b", queryWealthExpendWith)
  368 + queryWealth = queryWealth.Table("b")
  369 + queryWealth = queryWealth.Table("su_money_transaction_records")
  370 + queryWealth = queryWealth.Join("JOIN employees AS e ON e.uid = (su_money_transaction_records.employee->>'uid')::bigint")
  371 + queryWealth = queryWealth.ColumnExpr("su_money_transaction_records.employee->>'uid' AS uid")
  372 + queryWealth = queryWealth.ColumnExpr("su_money_transaction_records.employee->>'employeeName' AS employee_name")
  373 + queryWealth = queryWealth.ColumnExpr("sum(su_money_transaction_records.su_money) - b.su_money_expend AS employee_su_money")
  374 + queryWealth = queryWealth.ColumnExpr("ROW_NUMBER() OVER (ORDER BY sum(su_money_transaction_records.su_money) DESC) AS ranking")
  375 + queryWealth = queryWealth.Where(`su_money_transaction_records.record_type IN (?)`, pg.In([]int{2, 3}))
326 queryWealth = queryWealth.Where(`e.status = ?`, 1) // 离职员工过滤 376 queryWealth = queryWealth.Where(`e.status = ?`, 1) // 离职员工过滤
  377 + queryWealth = queryWealth.Where("su_money_transaction_records.employee->>'uid' = b.uid")
327 if companyId, ok := queryOptions["companyId"]; ok && (companyId.(int64) != 0) { 378 if companyId, ok := queryOptions["companyId"]; ok && (companyId.(int64) != 0) {
328 queryWealth = queryWealth.Where("e.company_id = ?", companyId) 379 queryWealth = queryWealth.Where("e.company_id = ?", companyId)
329 } 380 }
330 if startTime, ok := queryOptions["startTime"]; ok { 381 if startTime, ok := queryOptions["startTime"]; ok {
331 - queryWealth = queryWealth.Where(`su_money_transaction_record.create_time > ?`, startTime) 382 + queryWealth = queryWealth.Where(`su_money_transaction_records.create_time > ?`, startTime)
332 } 383 }
333 if endTime, ok := queryOptions["endTime"]; ok { 384 if endTime, ok := queryOptions["endTime"]; ok {
334 - queryWealth = queryWealth.Where(`su_money_transaction_record.create_time < ?`, endTime) 385 + queryWealth = queryWealth.Where(`su_money_transaction_records.create_time < ?`, endTime)
335 } 386 }
336 - queryWealth = queryWealth.GroupExpr("su_money_transaction_record.employee->>'uid',su_money_transaction_record.employee->>'employeeName'") 387 + queryWealth = queryWealth.GroupExpr("su_money_transaction_records.employee->>'uid',su_money_transaction_records.employee->>'employeeName',b.su_money_expend")
337 388
338 - // 个人财富值子查询（个人素币） 389 + // 个人素币值子查询
339 queryWealthWith := queryWealth.Order("employee_su_money DESC") 390 queryWealthWith := queryWealth.Order("employee_su_money DESC")
340 391
341 if offset, ok := queryOptions["offset"]; ok { 392 if offset, ok := queryOptions["offset"]; ok {
@@ -359,7 +410,7 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter @@ -359,7 +410,7 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter
359 return nil, err 410 return nil, err
360 } 411 }
361 412
362 - // 个人财富值排名（个人素币排名） 413 + // 个人素币排名
363 queryEmployeeWealth := tx.Model() 414 queryEmployeeWealth := tx.Model()
364 queryEmployeeWealth = queryEmployeeWealth.With("t", queryWealthWith) 415 queryEmployeeWealth = queryEmployeeWealth.With("t", queryWealthWith)
365 queryEmployeeWealth = queryEmployeeWealth.Table("t") 416 queryEmployeeWealth = queryEmployeeWealth.Table("t")
@@ -380,7 +431,7 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter @@ -380,7 +431,7 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter
380 retCurrentEmployeeWealth = retEmployeeWealth[0] 431 retCurrentEmployeeWealth = retEmployeeWealth[0]
381 } 432 }
382 433
383 - // 贡献值子查询-减少的贡献值 434 + // 减少的贡献值
384 queryContributionsDecrease := tx.Model(suMoneyTransactionRecordModel) 435 queryContributionsDecrease := tx.Model(suMoneyTransactionRecordModel)
385 queryContributionsDecrease = queryContributionsDecrease.Join("JOIN employees AS e ON e.uid = (su_money_transaction_record.employee->>'uid')::bigint") 436 queryContributionsDecrease = queryContributionsDecrease.Join("JOIN employees AS e ON e.uid = (su_money_transaction_record.employee->>'uid')::bigint")
386 queryContributionsDecrease = queryContributionsDecrease.ColumnExpr("su_money_transaction_record.employee->>'uid' AS uid") 437 queryContributionsDecrease = queryContributionsDecrease.ColumnExpr("su_money_transaction_record.employee->>'uid' AS uid")
@@ -398,6 +449,8 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter @@ -398,6 +449,8 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter
398 if endTime, ok := queryOptions["endTime"]; ok { 449 if endTime, ok := queryOptions["endTime"]; ok {
399 queryContributionsDecrease = queryContributionsDecrease.Where(`su_money_transaction_record.create_time < ?`, endTime) 450 queryContributionsDecrease = queryContributionsDecrease.Where(`su_money_transaction_record.create_time < ?`, endTime)
400 } 451 }
  452 +
  453 + // 贡献值子查询
401 contributionsDecrease := queryContributionsDecrease.GroupExpr("su_money_transaction_record.employee->>'uid',su_money_transaction_record.employee->>'employeeName'") 454 contributionsDecrease := queryContributionsDecrease.GroupExpr("su_money_transaction_record.employee->>'uid',su_money_transaction_record.employee->>'employeeName'")
402 455
403 // 贡献值排行榜 456 // 贡献值排行榜