wip:离线判断

src/jfw/modules/bigmember/src/entity/marketAnalysis/analysisPdf.go

@@ -155,7 +155,7 @@ func (this *AnalysisReportPdf) GetPdfDetail() {
 			userId := qutil.ObjToString(sessVal["userId"])
 			go func() { //分析数据
 				wait.Done()
-				mae := &ma.AnalysisEntity{MgoRecordId: qutil.InterfaceToStr(getQueryMap["rid"]), UId: userId, Pid: pid, MgoUserId: qutil.ObjToString(sessVal["mgoUserId"]), PositionId: qutil.IntAll(sessVal["positionId"]), Mgo: &db.Mgo, MySql: db.Mysql}
+				mae := &ma.AnalysisEntity{MgoRecordId: qutil.InterfaceToStr(getQueryMap["rid"]), UId: userId, Pid: pid, MgoUserId: qutil.ObjToString(sessVal["mgoUserId"]), PositionId: qutil.Int64All(sessVal["positionId"]), Mgo: &db.Mgo, MySql: db.Mysql}
 				rDataMap, err := mae.GetPdfPageApi()
 				if err != nil {
 					log.Println("GetPdfPageApi", err.Error())
@@ -168,7 +168,7 @@ func (this *AnalysisReportPdf) GetPdfDetail() {
 			}()
 			go func() { //项目明细
 				defer wait.Done()
-				mae := &ma.AnalysisEntity{MgoRecordId: qutil.InterfaceToStr(getQueryMap["rid"]), UId: userId, Pid: pid, MgoUserId: qutil.ObjToString(sessVal["mgoUserId"]), PositionId: qutil.IntAll(sessVal["positionId"]), Mgo: &db.Mgo, MySql: db.Mysql}
+				mae := &ma.AnalysisEntity{MgoRecordId: qutil.InterfaceToStr(getQueryMap["rid"]), UId: userId, Pid: pid, MgoUserId: qutil.ObjToString(sessVal["mgoUserId"]), PositionId: qutil.Int64All(sessVal["positionId"]), Mgo: &db.Mgo, MySql: db.Mysql}
 				err = mae.GetAnalysisFromMgoDb()
 				if err != nil {
 					log.Println("GetAnalysisFromMgoDb err", err.Error())
@@ -351,7 +351,7 @@ func (this *AnalysisReportPdf) PdfSave() {
 			return
 		}
 		pid, _, _ := CheckPowerEquity(this.Session())
-		mae := &ma.AnalysisEntity{MgoRecordId: rid, UId: userId, Pid: pid, MgoUserId: qutil.ObjToString(sessVal["mgoUserId"]), PositionId: qutil.IntAll(sessVal["positionId"]), Mgo: &db.Mgo, MySql: db.Mysql}
+		mae := &ma.AnalysisEntity{MgoRecordId: rid, UId: userId, Pid: pid, MgoUserId: qutil.ObjToString(sessVal["mgoUserId"]), PositionId: qutil.Int64All(sessVal["positionId"]), Mgo: &db.Mgo, MySql: db.Mysql}
 		queryMap := map[string]interface{}{
 			"_id":   mongodb.StringTOBsonId(mae.MgoRecordId),
 			"i_del": map[string]interface{}{"$ne": 1},

src/jfw/modules/bigmember/src/go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.28.6
+	app.yhyue.com/moapp/jypkg v1.28.7
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18
 	github.com/donnie4w/go-logger v0.0.0-20230316073421-36a48f87a69a

src/jfw/modules/bigmember/src/go.sum

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6t
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.28.6 h1:n4lr4XnEoh1C0IjxlA4yDcumqE0cH7RNf1h46Qs8ICo=
-app.yhyue.com/moapp/jypkg v1.28.6/go.mod h1:7f9hBxeF9RTp6vhTMZ24k4VLsn7HJHyAXOx6qzA3xOw=
+app.yhyue.com/moapp/jypkg v1.28.7 h1:SFrpy+1m7l8oUByjMSKNCsN1z6L5obD5w8LCO9qIV2w=
+app.yhyue.com/moapp/jypkg v1.28.7/go.mod h1:7f9hBxeF9RTp6vhTMZ24k4VLsn7HJHyAXOx6qzA3xOw=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

src/jfw/modules/bigmember/src/service/report/marketAnalysis.go

@@ -148,7 +148,7 @@ func (this *MarketAnalysis) DoAnalysisPdf() {
 	sessVal := this.Session().GetMultiple()
 	mgoUserId := qutil.ObjToString(sessVal["mgoUserId"])
 	userId := qutil.ObjToString(sessVal["userId"])
-	positionId := qutil.IntAll(sessVal["positionId"])
+	positionId := qutil.Int64All(sessVal["positionId"])
 	phone := qutil.ObjToString(sessVal["phone"])
 	rData, errMsg := func() (interface{}, error) {
 		if phone == "" || !strings.Contains(config.Config.AnalysisPDFPhone, phone) {
@@ -196,7 +196,7 @@ func (this *MarketAnalysis) AnalysisPdfList() {
 	sessVal := this.Session().GetMultiple()
 	mgoUserId := qutil.ObjToString(sessVal["mgoUserId"])
 	userId := qutil.ObjToString(sessVal["userId"])
-	positionId := qutil.IntAll(sessVal["positionId"])
+	positionId := qutil.Int64All(sessVal["positionId"])
 	phone := qutil.ObjToString(sessVal["phone"])
 	rData, errMsg := func() (interface{}, error) {
 		if phone == "" || !strings.Contains(config.Config.AnalysisPDFPhone, phone) {
@@ -234,7 +234,7 @@ func (this *MarketAnalysis) DoAnalysis() {
 	sessVal := this.Session().GetMultiple()
 	mgoUserId := qutil.ObjToString(sessVal["mgoUserId"])
 	userId := qutil.ObjToString(sessVal["userId"])
-	positionId := qutil.IntAll(sessVal["positionId"])
+	positionId := qutil.Int64All(sessVal["positionId"])
 	phone := qutil.ObjToString(sessVal["phone"])
 	positionType := qutil.IntAll(sessVal["positionType"])
 	entId := qutil.IntAll(sessVal["entId"])
@@ -300,7 +300,7 @@ func (this *MarketAnalysis) GetAnalysisResult() {
 	sessVal := this.Session().GetMultiple()
 	mgoUserId := qutil.ObjToString(sessVal["mgoUserId"])
 	userId := qutil.ObjToString(sessVal["userId"])
-	positionId := qutil.IntAll(sessVal["positionId"])
+	positionId := qutil.Int64All(sessVal["positionId"])
 	rData, errMsg := func() (interface{}, error) {
 		pid, isEquity, powerErr := CheckPowerEquity(this.Session())
 		if powerErr != nil {
@@ -343,7 +343,7 @@ func (this *MarketAnalysis) Cancel() {
 	sessVal := this.Session().GetMultiple()
 	mgoUserId := qutil.ObjToString(sessVal["mgoUserId"])
 	userId := qutil.ObjToString(sessVal["userId"])
-	positionId := qutil.IntAll(sessVal["positionId"])
+	positionId := qutil.Int64All(sessVal["positionId"])
 	rData, errMsg := func() (interface{}, error) {
 		pid, powerErr := checkPower(this.Session())
 		if powerErr != nil {
@@ -364,7 +364,7 @@ func (this *MarketAnalysis) IsOffline() {
 	sessVal := this.Session().GetMultiple()
 	mgoUserId := qutil.ObjToString(sessVal["mgoUserId"])
 	userId := qutil.ObjToString(sessVal["userId"])
-	positionId := qutil.IntAll(sessVal["positionId"])
+	positionId := qutil.Int64All(sessVal["positionId"])
 	phone := qutil.ObjToString(sessVal["phone"])
 	positionType := qutil.IntAll(sessVal["positionType"])
 	entId := qutil.IntAll(sessVal["entId"])
@@ -433,7 +433,7 @@ func (this *MarketAnalysis) Delete() {
 	sessVal := this.Session().GetMultiple()
 	mgoUserId := qutil.ObjToString(sessVal["mgoUserId"])
 	userId := qutil.ObjToString(sessVal["userId"])
-	positionId := qutil.IntAll(sessVal["positionId"])
+	positionId := qutil.Int64All(sessVal["positionId"])
 	rData, errMsg := func() (interface{}, error) {
 		pid, powerErr := checkPower(this.Session())
 		if powerErr != nil {
@@ -454,7 +454,7 @@ func (this *MarketAnalysis) AnalysisHistory() {
 	sessVal := this.Session().GetMultiple()
 	mgoUserId := qutil.ObjToString(sessVal["mgoUserId"])
 	userId := qutil.ObjToString(sessVal["userId"])
-	positionId := qutil.IntAll(sessVal["positionId"])
+	positionId := qutil.Int64All(sessVal["positionId"])
 	positionType := qutil.IntAll(sessVal["positionType"])
 	entId := qutil.IntAll(sessVal["entId"])
 	entUserId := qutil.IntAll(sessVal["entUserId"])