后:hse导出60改23

src/dashoo.cn/backend/api/business/oilrtx/RtxService.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -182,30 +183,30 @@ func (s *RtxService) HandleSendMsg(username string, tomobile string, message str
 
 func (s *RtxService) HandlePtrLogin(username string, password string, BaseUser string) int {
 
-	client := &http.Client{}
-	var ptrUser PtrUser
-
-	ptrUser.UserName = username
-	ptrUser.PassWord = password
+	//client := &http.Client{}
+	//var ptrUser PtrUser
+	//
+	//ptrUser.UserName = username
+	//ptrUser.PassWord = password
+	//
+	//reqJson, err := json.Marshal(ptrUser)
+	//params := string(reqJson)
+	//
+	//ptrUrl := utils.Cfg.MustValue("PtrUrl", "ptrUrl")
+	//
+	//req, err := http.NewRequest("post", ptrUrl, strings.NewReader(params))
+	//req.Header.Add("Content-Type", "application/json")
+	////req.Header.Add("X-Token", "HJpczmIJr9z26t9KcV0i1OsBE9RXFeuyhuN9MdV+Ts/FlUjCgDOxaaubo9DkF91t+X2MCxBqX6s=")
 
-	reqJson, err := json.Marshal(ptrUser)
-	params := string(reqJson)
+	//resp, err := client.Do(req)
 
 	ptrUrl := utils.Cfg.MustValue("PtrUrl", "ptrUrl")
 
-	req, err := http.NewRequest("post", ptrUrl, strings.NewReader(params))
-	req.Header.Add("Content-Type", "application/json")
-	////req.Header.Add("X-Token", "HJpczmIJr9z26t9KcV0i1OsBE9RXFeuyhuN9MdV+Ts/FlUjCgDOxaaubo9DkF91t+X2MCxBqX6s=")
-
-	resp, err := client.Do(req)
+	v := make(url.Values)
+	v.Add("UserName", username)
+	v.Add("PassWord", password)
 
-	//ptrUrl := utils.Cfg.MustValue("PtrUrl", "ptrUrl")
-	//
-	//v := make(url.Values)
-	//v.Add("UserName", username)
-	//v.Add("PassWord", password)
-	//
-	//resp, err := http.PostForm(ptrUrl, v)
+	resp, err := http.PostForm(ptrUrl, v)
 
 	if err != nil {
 		log.Println("err= ", err)

src/dashoo.cn/backend/api/controllers/oilsupplier/hsescore.go

@@ -26,7 +26,7 @@ type printHseInfo struct {
 	SupplierName string
 	Name         string
 	StartTime    string
-	End      string
+	End          string
 	ApplyTime    string
 }
 
@@ -563,6 +563,7 @@ func (this *HSEScoreController) ExportWord() {
 	fileName := "HSE培训合格证书.docx"
 
 	retDocUrl := svcActiviti.FillWordTemplate(dataMap, url, fileName)
+	model.Ip = strings.Replace(model.Ip, "60.30.245.229", "10.76.248.23", -1)
 	// 转成pdf
 	if strings.Contains(retDocUrl, "upfile") {
 		retDocUrl = "http://" + model.Ip + "/" + retDocUrl