xg

CMPlatform/go.mod

@@ -3,7 +3,7 @@ module cmplatform
 go 1.20
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20231222072535-dca21a393e0e
+	app.yhyue.com/moapp/jybase v0.0.0-20240430022254-1c219332539c
 	github.com/Chain-Zhang/pinyin v0.1.3
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/antonmedv/expr v1.15.3

CMPlatform/go.sum

@@ -4,6 +4,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6 h1:uyaBp5Iuc/Il4+O
 app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jybase v0.0.0-20231222072535-dca21a393e0e h1:3SOZl1ZdYiC/Midaf92FjtF77eNjUWDusLTn7xzoPXE=
 app.yhyue.com/moapp/jybase v0.0.0-20231222072535-dca21a393e0e/go.mod h1:fjaD11Z3FIk9EyfOpdKAMQNs7nPZCpT/qKIw1oVsb9w=
+app.yhyue.com/moapp/jybase v0.0.0-20240430022254-1c219332539c h1:OQ1O0ujL7/dcvBeqvSQ5z23p7/YRPmP8IGoer7eqdcA=
+app.yhyue.com/moapp/jybase v0.0.0-20240430022254-1c219332539c/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=

CMPlatform/history/historytask.go

@@ -2,6 +2,8 @@ package history
 
 import (
 	"cmplatform/util"
+	"context"
+
 	// "context"
 	"encoding/json"
 	"fmt"
@@ -164,9 +166,9 @@ func (this *HistoryData) HistoryTask(history_id string) {
 		cus.GetData("history", i_dataSource) //获取数据
 		//cus.RemoveRepeatData()               //数据去重
 		cus.saveBeforeData(history_id, isFilter, noticeFilter, dataTable, entId, iContact, xlsxData)
-		// if err := util.MgoSave.C.Database(util.MgoSave.DbName).Collection(cus.saveTempColl).Drop(context.Background()); err != nil { // 删除临时表
-		// 	log.Error("临时表删除失败", zap.Error(err), zap.String("coll", cus.saveTempColl))
-		// }
+		if err := util.MgoSave.C.Database(util.MgoSave.DbName).Collection(cus.saveTempColl).Drop(context.Background()); err != nil { // 删除临时表
+			log.Error("临时表删除失败", zap.Error(err), zap.String("coll", cus.saveTempColl))
+		}
 		//cus.AssembelAndSaveData(history_id, isFilter, noticeFilter, dataTable, entId, iContact, xlsxData) //组装、保存数据
 		if dataTable == 2 {
 			//使用pc商机管理的企业，数据存入mysql表，扣除数据量

CMPlatform/web/templates/private/historylog_list.html

@@ -184,7 +184,6 @@
                         }
                     }
                 },
-
                 {
                     "data": "finishtime",
                     render: function (val) {
@@ -304,16 +303,6 @@
                         }
                     }
                 },
-                {
-                    "data": "create_user",
-                    render: function (val) {
-                        if (val === undefined) {
-                            return ""
-                        } else {
-                            return val
-                        }
-                    }
-                },
                 {
                     "data": "state",
                     render: function (val) {
@@ -338,7 +327,17 @@
                         }
                     }
                 },
-
+                {
+                    "data": "createtime",
+                    render: function (val) {
+                        if (val === undefined) {
+                            return "未执行"
+                        }
+                        var dt = new Date()
+                        dt.setTime(parseInt(val) * 1000)
+                        return dt.format("yyyy-MM-dd hh:mm:ss")
+                    }
+                },
                 {
                     "data": "finishtime",
                     render: function (val) {