|
|
@@ -1183,12 +1183,13 @@ func (this *TargetController) ExportDataList() {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- fileName += time.Now().Format("06.01.02") + `.xlsx` //文件名称
|
|
|
- this.Ctx.Output.Download(downloadFilePath, fileName)
|
|
|
defer func() {
|
|
|
os.Remove(downloadFilePath)
|
|
|
}()
|
|
|
+
|
|
|
+ fileName += time.Now().Format("06.01.02") + `.xlsx` //文件名称
|
|
|
+ this.Ctx.Output.Download(downloadFilePath, fileName)
|
|
|
+
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "success"
|
|
|
@@ -2056,13 +2057,13 @@ func (this *TargetController) TargetFrequencyList() {
|
|
|
|
|
|
func sortEdbFrequency(frequencyList []string) (newFrequencyList []string) {
|
|
|
var frequencyMap1 = map[string]int{
|
|
|
- "日度": 1,
|
|
|
- "周度": 2,
|
|
|
- "旬度": 3,
|
|
|
- "月度": 4,
|
|
|
- "季度": 5,
|
|
|
+ "日度": 1,
|
|
|
+ "周度": 2,
|
|
|
+ "旬度": 3,
|
|
|
+ "月度": 4,
|
|
|
+ "季度": 5,
|
|
|
"半年度": 6,
|
|
|
- "年度": 7,
|
|
|
+ "年度": 7,
|
|
|
}
|
|
|
|
|
|
var frequencyMap2 = map[int]string{
|
