|
@@ -60,10 +60,31 @@ func (this *AnalysisReportPdf) GetPdfDetail() {
|
|
|
log.Println("非白名单ip", requestIp)
|
|
|
return nil, fmt.Errorf("非法请求")
|
|
|
}
|
|
|
+ rMap := make(map[string]interface{})
|
|
|
getQueryMap, timeRangeMap, t_err := func() (map[string]interface{}, map[string]int64, error) {
|
|
|
switch this.GetString("source") {
|
|
|
case "luago":
|
|
|
if entId := this.GetString("entId"); entId != "" {
|
|
|
+ ty := this.GetString("type")
|
|
|
+ if ty == "2" {
|
|
|
+ //lua变动信息获取
|
|
|
+ cepm := &entity.EntFollow{
|
|
|
+ HasPower: true,
|
|
|
+ }
|
|
|
+ entInfo, _, err := cepm.GetEntChangeList(entId, qutil.IntAll(this.GetString("showPart")))
|
|
|
+ if err == nil {
|
|
|
+ rMap["ent_change"] = entInfo
|
|
|
+ }
|
|
|
+ //lua通讯录获取
|
|
|
+ cepm1 := &entity.Portrait{}
|
|
|
+ entinfo, _ := db.Mgo_Ent.FindOneByField("qyxy_std", map[string]interface{}{"_id": entId}, map[string]interface{}{"company_name": 1})
|
|
|
+ if entinfo != nil {
|
|
|
+ rData, err := cepm1.GetContacts(qutil.InterfaceToStr((*entinfo)["company_name"]), 1)
|
|
|
+ if err == nil {
|
|
|
+ rMap["ent_contacts"] = rData
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return map[string]interface{}{
|
|
|
"type": 1,
|
|
|
"ent": entId,
|
|
@@ -113,7 +134,7 @@ func (this *AnalysisReportPdf) GetPdfDetail() {
|
|
|
if t_err != nil {
|
|
|
return nil, t_err
|
|
|
}
|
|
|
- rMap := make(map[string]interface{})
|
|
|
+
|
|
|
wait := &sync.WaitGroup{}
|
|
|
var lock sync.Mutex
|
|
|
var err error
|