Merge pull request '修改解析portal数据的排序字段，修改response中data的数据类型' (#255) from fix_portal into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/255
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>

models/base/response.go

@@ -3,5 +3,5 @@ package base
 type Response struct {
 	Code int    `json:"code"`
 	Msg  string `json:"msg"`
-	Data []byte `json:"data"`
+	Data string `json:"data"`
 }

services/log/implments/ArtDemandHead.service.impl.go

@@ -13,7 +13,6 @@ import (
 	model "LAPP_GAAS_GFrame_BACKEND/models/log"
 	"LAPP_GAAS_GFrame_BACKEND/utils"
 	"LAPP_GAAS_GFrame_BACKEND/web/models"
-	"errors"
 	"fmt"
 	"github.com/360EntSecGroup-Skylar/excelize/v2"
 	json "github.com/json-iterator/go"
@@ -836,11 +835,16 @@ func (impl *ArtDemandHeadServiceImplement) TransferDataToOrigin(getTimeUrl, post
 		log.Error("DataToOrigin unmarshal time body failed, error:"+err.Error(), "body: "+string(timeBody))
 		return
 	}
+	log.Debug("DataToOrigin get time response:" + string(timeBody))
+
 	if response.Code != http.StatusOK {
 		log.Info("DataToOrigin get time data failed, response:" + string(timeBody))
 		return
 	}
-	lastTime := string(response.Data)
+	lastTime := response.Data
+	if lastTime == "" {
+		lastTime = "2000-01-01 00:00:00"
+	}
 	_, err = time.Parse("2006-01-02 15:04:05", lastTime)
 	if err != nil {
 		log.Error("DataToOrigin parse time failed, error:"+err.Error(), "time string:"+lastTime)
@@ -881,6 +885,7 @@ func (impl *ArtDemandHeadServiceImplement) TransferDataToOrigin(getTimeUrl, post
 		log.Error("DataToOrigin unmarshal post file response failed, error:"+err.Error(), "data:"+string(resp))
 		return
 	}
+	log.Debug("DataToOrigin post file response:" + string(resp))
 	if postResp.Code != http.StatusOK {
 		log.Error("DataToOrigin post file response code is not OK, data:" + string(resp))
 		return
@@ -985,9 +990,10 @@ func (impl *ArtDemandHeadServiceImplement) SaveToExcel(headLi *[]model.ArtDemand
 	if err != nil {
 		return "", err
 	}
-	pathLi := strings.Split(filepath, "web\\")
-	if len(pathLi) != 2 {
-		return "", errors.New("导出失败,请重试")
-	}
-	return pathLi[1], nil
+	//pathLi := strings.Split(filepath, "web\\")
+	//if len(pathLi) != 2 {
+	//	return "", errors.New("导出失败,请重试")
+	//}
+	//return pathLi[1], nil
+	return filepath, nil
 }

services/om/implments/ParsePortalWorkOrder.service.impl.go

@@ -119,7 +119,7 @@ func (impl *ParseMesWorkOrderServiceImplement) DealFileDemandHead(demandHead mod
 	artDemandHeadDao := logDal.NewArtDemandHeadDAO(sessionTX, demandHead.PlantNr, "crontab")
 	artDemandLstDao := logDal.NewArtDemandLstDAO(sessionTX, demandHead.PlantNr, "crontab")
 	articleDao := baseDal.NewArticleDAO(sessionTX, demandHead.PlantNr, "crontab")
-	demandLstLi, err := demandLstDao.Select([]grmi.Predicate{meta.DemandLst_FileNr.NewPredicate(grmi.Equal, demandHead.FileNr)}, []grmi.Field{meta.DemandLst_PartCode})
+	demandLstLi, err := demandLstDao.Select([]grmi.Predicate{meta.DemandLst_FileNr.NewPredicate(grmi.Equal, demandHead.FileNr)}, []grmi.Field{meta.DemandLst_Pos})
 	if err != nil {
 		log.Error("ParseMesWorkOrder DealArtDemand delete  art demandLst failed, error: " + err.Error())
 		return
@@ -759,7 +759,7 @@ func (impl *ParseMesWorkOrderServiceImplement) DealDBDemandHead(demandHead model
 	artDemandHeadDao := logDal.NewArtDemandHeadDAO(sessionTX, demandHead.PlantNr, "crontab")
 	artDemandLstDao := logDal.NewArtDemandLstDAO(sessionTX, demandHead.PlantNr, "crontab")
 	articleDao := baseDal.NewArticleDAO(sessionTX, demandHead.PlantNr, "crontab")
-	demandLstLi, err := demandLstDao.Select([]grmi.Predicate{meta.DemandLst_TaskNr.NewPredicate(grmi.Equal, demandHead.TaskNr)}, []grmi.Field{meta.DemandLst_PartCode})
+	demandLstLi, err := demandLstDao.Select([]grmi.Predicate{meta.DemandLst_TaskNr.NewPredicate(grmi.Equal, demandHead.TaskNr)}, []grmi.Field{meta.DemandLst_Pos})
 	if err != nil {
 		log.Error("ParseMesWorkOrder DealDBDemandHead get  art demandLst failed, error: " + err.Error())
 		return