|
|
@ -2360,13 +2360,13 @@ func (t *Chargetab) PropertyFeeData(startDate string) (datalist CatPropertytabDa |
|
|
|
}) |
|
|
|
} |
|
|
|
//查询楼层统计
|
|
|
|
var proper []Propertytab |
|
|
|
var proper []PropertytabTemporary |
|
|
|
//查询住户统计
|
|
|
|
err = e.Table("propertytab").Select("buildingid,count(1) count,sum(constructionarea) constructionarea").In("propertytypeid", rateMap["住宅"]).In("buildingid", buildingId).Where("cid=?", t.Cid).GroupBy("buildingid").Find(&proper) |
|
|
|
if err != nil { |
|
|
|
return datalist, err |
|
|
|
} |
|
|
|
properMap := make(map[string]Propertytab) |
|
|
|
properMap := make(map[string]PropertytabTemporary) |
|
|
|
for _, v := range proper { |
|
|
|
properMap[v.Buildingid] = v |
|
|
|
} |
|
|
|