|
@@ -132,7 +132,7 @@ func GetReportProjectInfo(param *ReportProjectInfoParam, positionId int64) (data
|
|
|
}
|
|
|
|
|
|
// ReportProjectInfoFormat 周报/月报 项目明细 格式化数据
|
|
|
-func ReportProjectInfoFormat(data []map[string]interface{}) []map[string]interface{} {
|
|
|
+func ReportProjectInfoFormat(data []map[string]interface{}, from string) []map[string]interface{} {
|
|
|
rs := []map[string]interface{}{}
|
|
|
for i := 0; i < len(data); i++ {
|
|
|
tmp := map[string]interface{}{}
|
|
@@ -148,6 +148,10 @@ func ReportProjectInfoFormat(data []map[string]interface{}) []map[string]interfa
|
|
|
winIdArr = append(winIdArr, splitWinnerId[j])
|
|
|
}
|
|
|
tmp["id"] = encrypt.EncodeArticleId2ByCheck(common.ObjToString(data[i]["source_infoid"]))
|
|
|
+ if from == From {
|
|
|
+ tmp["id"] = common.ObjToString(data[i]["source_infoid"])
|
|
|
+ }
|
|
|
+
|
|
|
tmp["winnerId"] = winIdArr
|
|
|
tmp["winner"] = strings.Split(tmpWinner, ",")
|
|
|
tmp["name"] = common.ObjToString(data[i]["name"])
|