|
@@ -234,7 +234,7 @@ func writeMap1(tmp map[string]string, i int, v string) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-var bzpath, gjpath, rpath string = "web/res/标准字段包%d.xlsx", "web/res/高级字段包%d.xlsx", "web/res/标签导出%d.xlsx"
|
|
|
+var bzpath, gjpath, rpath string = "web/res/标准字段包%d.xlsx", "web/res/高级字段包%d.xlsx", "web/res/%s_%d.xlsx"
|
|
|
|
|
|
func ResponseXlsx_Data(id string) string {
|
|
|
if id != "" {
|
|
@@ -360,6 +360,7 @@ func ResponseXlsx_Rule(id string) string {
|
|
|
defer util.Catch()
|
|
|
var data *map[string]interface{}
|
|
|
data, _ = Mgo.FindById("cuserdepartrule", id, `{}`)
|
|
|
+
|
|
|
if len(*data) == 0 {
|
|
|
return ""
|
|
|
}
|
|
@@ -370,15 +371,22 @@ func ResponseXlsx_Rule(id string) string {
|
|
|
}
|
|
|
sh := xf.Sheets[0]
|
|
|
fields_len := len(export_fields)
|
|
|
+ //
|
|
|
for i, r := range sh.Rows {
|
|
|
if i == fields_len {
|
|
|
break
|
|
|
}
|
|
|
+
|
|
|
field := export_fields[i] //export_fields值的顺序与模板表一致
|
|
|
if field == "i_extfieldstype" {
|
|
|
r.AddCell().SetValue(export_extfieldstype[fmt.Sprint((*data)[field])])
|
|
|
continue
|
|
|
}
|
|
|
+ if field == "s_userid" {
|
|
|
+ userName, _ := Mgo.FindById("cuser", (*data)[field].(string), `{}`)
|
|
|
+ r.AddCell().SetValue((*userName)["s_name"])
|
|
|
+ continue
|
|
|
+ }
|
|
|
field_val := ""
|
|
|
if strings.HasPrefix(field, "s_") {
|
|
|
field_val = util.ObjToString((*data)[field])
|
|
@@ -410,7 +418,8 @@ func ResponseXlsx_Rule(id string) string {
|
|
|
new_row.AddCell().SetValue(s_subscopeclass)
|
|
|
}
|
|
|
}
|
|
|
- fname := fmt.Sprintf(rpath, time.Now().Unix())
|
|
|
+ ruleName := (*data)["s_name"]
|
|
|
+ fname := fmt.Sprintf(rpath, ruleName,time.Now().Unix())
|
|
|
xf.Save(fname)
|
|
|
return fname
|
|
|
}
|