diff --git a/main.go b/main.go index 39226f1..eec66e3 100644 --- a/main.go +++ b/main.go @@ -72,11 +72,12 @@ func imain() { //初始化日志开始 baseDir := "" flag.StringVar(&baseDir, "dir", "log", "running in a directory") + flag.StringVar(&utils.SysPath, "p", "", "root Path") flag.Parse() defer glog.Flush() fmt.Println(baseDir) - baseDir,err := utils.GetCurrentPath(baseDir) + baseDir, err := utils.GetCurrentPath(baseDir) if err != nil { fmt.Printf("failed to get time location: %v\n", err) return @@ -93,7 +94,7 @@ func imain() { return } //加载配置 - path,err := utils.GetCurrentPath("conf/config.yaml") + path, err := utils.GetCurrentPath("conf/config.yaml") if err != nil { fmt.Printf("failed to get time location: %v\n", err) return diff --git a/meta/ap/CustDemandHead.meta.go b/meta/ap/CustDemandHead.meta.go index 7bb2ed8..79e1f40 100644 --- a/meta/ap/CustDemandHead.meta.go +++ b/meta/ap/CustDemandHead.meta.go @@ -34,8 +34,8 @@ var CustDemandHead_CtrlTime2 = grmi.NewField("CtrlTime2", "[AP_CustDemandHead].C var CustDemandHead_LastModify = grmi.NewField("LastModify", "[AP_CustDemandHead].LastModify", "lastmodify", grmi.TypeDateTime) var CustDemandHead_LastUser = grmi.NewField("LastUser", "[AP_CustDemandHead].LastUser", "lastuser", grmi.TypeString) var CustDemandHead_CreateTime = grmi.NewField("CreateTime", "[AP_CustDemandHead].CreateTime", "createtime", grmi.TypeDateTime) -var CustDemandHead_CreateYear = grmi.NewField("CreateYear", "[AP_CustDemandHead].CreateYear", "createyear", grmi.TypeDateTime) -var CustDemandHead_CreateWeek = grmi.NewField("CreateWeek", "[AP_CustDemandHead].CreateWeek", "createweek", grmi.TypeDateTime) +var CustDemandHead_CreateYear = grmi.NewField("CreateYear", "[AP_CustDemandHead].CreateYear", "createyear", grmi.TypeString) +var CustDemandHead_CreateWeek = grmi.NewField("CreateWeek", "[AP_CustDemandHead].CreateWeek", "createweek", grmi.TypeString) /****************************************************************************** * diff --git a/meta/ap/CustDemandVerHead.meta.go b/meta/ap/CustDemandVerHead.meta.go index 64a13e7..c51d445 100644 --- a/meta/ap/CustDemandVerHead.meta.go +++ b/meta/ap/CustDemandVerHead.meta.go @@ -34,6 +34,8 @@ var CustDemandVerHead_CtrlTime2 = grmi.NewField("CtrlTime2", "[AP_CustDemandVerH var CustDemandVerHead_LastModify = grmi.NewField("LastModify", "[AP_CustDemandVerHead].LastModify", "lastmodify", grmi.TypeDateTime) var CustDemandVerHead_LastUser = grmi.NewField("LastUser", "[AP_CustDemandVerHead].LastUser", "lastuser", grmi.TypeString) var CustDemandVerHead_CreateTime = grmi.NewField("CreateTime", "[AP_CustDemandVerHead].CreateTime", "createtime", grmi.TypeDateTime) +var CustDemandVerHead_CreateYear = grmi.NewField("CreateYear", "[AP_CustDemandVerHead].CreateYear", "createyear", grmi.TypeString) +var CustDemandVerHead_CreateWeek = grmi.NewField("CreateWeek", "[AP_CustDemandVerHead].CreateWeek", "createweek", grmi.TypeString) /****************************************************************************** * @@ -66,6 +68,8 @@ var CustDemandVerHead = grmi.NewEntity( CustDemandVerHead_LastModify.Name: CustDemandVerHead_LastModify, CustDemandVerHead_LastUser.Name: CustDemandVerHead_LastUser, CustDemandVerHead_CreateTime.Name: CustDemandVerHead_CreateTime, + CustDemandVerHead_CreateYear.Name: CustDemandVerHead_CreateYear, + CustDemandVerHead_CreateWeek.Name: CustDemandVerHead_CreateWeek, }, []string{"PlantNr"}, - []string{"Descr", "Status", "PlanReleaseTime", "ActualReleaseTime", "CreateMode", "CreateUser", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"}) + []string{"Descr", "Status", "PlanReleaseTime", "ActualReleaseTime", "CreateMode", "CreateUser", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser", "CreateYear", "CreateWeek"}) diff --git a/models/ap/CustDemandVerHead.model.go b/models/ap/CustDemandVerHead.model.go index c225546..6b4b72f 100644 --- a/models/ap/CustDemandVerHead.model.go +++ b/models/ap/CustDemandVerHead.model.go @@ -39,6 +39,8 @@ type CustDemandVerHead struct { LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"AP_CustDemandVerHead-LastUser"` CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"AP_CustDemandVerHead-CreateTime"` CustomerItem []CustomerItem `xorm:"-" json:"AP_CustDemandVerHead-CustomerItem"` + CreateYear int `xorm:"int 'CreateYear'" json:"AP_CustDemandVerHead-CreateYear"` + CreateWeek int `xorm:"int 'CreateWeek'" json:"AP_CustDemandVerHead-CreateWeek"` } /****************************************************************************** diff --git a/services/ap/implments/CustDemandVerHead.service.impl.go b/services/ap/implments/CustDemandVerHead.service.impl.go index 9428cc7..bf54ea1 100644 --- a/services/ap/implments/CustDemandVerHead.service.impl.go +++ b/services/ap/implments/CustDemandVerHead.service.impl.go @@ -52,6 +52,8 @@ var DefaultConditionOfCustDemandVerHead = grmi.NewCondition( meta.CustDemandVerHead_LastModify.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_LastModify, grmi.Approximate, false), meta.CustDemandVerHead_LastUser.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_LastUser, grmi.Equal, false), meta.CustDemandVerHead_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_CreateTime, grmi.Approximate, false), + meta.CustDemandVerHead_CreateWeek.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_CreateWeek, grmi.Equal, false), + meta.CustDemandVerHead_CreateYear.UrlParameterName: grmi.NewConditionItem(meta.CustDemandVerHead_CreateYear, grmi.Equal, false), }, nil, ) @@ -674,14 +676,14 @@ func (impl *CustDemandVerHeadServiceImplement) SelectVersionCustomerList(user *g } dao_customer := basedal.NewCustomerDAO(session, user.PlantNr, user.UserId) - for _, info := range result{ + for _, info := range result { customerData, err := dao_customer.SelectOne(info.CustomerId) if err != nil { return nil, err } versionCustomer := model.VersionCustomer{ CustomerName: customerData.Name1, - Status: info.Status, + Status: info.Status, } versionList = append(versionList, versionCustomer) } @@ -924,7 +926,7 @@ func (impl *CustDemandVerHeadServiceImplement) ImportFile(user *global.User, cus lenInfo := lenData - temLen if lenInfo > 0 { for k := 0; k < lenInfo; k++ { - weekDate := temDemandDate.AddDate(0, 0, 7) + weekDate := temDemandDate.AddDate(0, 0, 7*(k+1)) year, month, _ := weekDate.Date() week := utils.WeekByDate(weekDate) one := model.CustDemandVerDetail{} @@ -1648,7 +1650,7 @@ func (impl *CustDemandVerHeadServiceImplement) ExportCompareVersion(user *global cell.Value = "版本" for _, mapData := range val.Item { //描述 - for key,_ :=range mapData{ + for key, _ := range mapData { cell = row.AddCell() cell.Value = utils.ValueToString(key, "") } @@ -1665,7 +1667,7 @@ func (impl *CustDemandVerHeadServiceImplement) ExportCompareVersion(user *global cell.Value = utils.ValueToString(val.VersionId, "") for _, mapData := range val.Item { //描述 - for _,value :=range mapData{ + for _, value := range mapData { cell = row.AddCell() cell.Value = utils.ValueToString(value, "") } @@ -1679,4 +1681,4 @@ func (impl *CustDemandVerHeadServiceImplement) ExportCompareVersion(user *global excelfile := exceldir + "/" + filename err = file.Save(excelfile) return filename, nil -} \ No newline at end of file +} diff --git a/utils/file.go b/utils/file.go index a4f95ef..141de76 100644 --- a/utils/file.go +++ b/utils/file.go @@ -117,6 +117,9 @@ func IsExists(path string) bool { * ******************************************************************************/ func GetCurrentPath(dir string) (string, error) { + if SysPath != "" { + return SysPath + dir, nil + } file, err := exec.LookPath(os.Args[0]) if err != nil { return "", err diff --git a/utils/sysconf.go b/utils/sysconf.go index 4063288..cc6ce23 100644 --- a/utils/sysconf.go +++ b/utils/sysconf.go @@ -28,3 +28,4 @@ const ( // 中国时区 var SysTimeLocation, _ = time.LoadLocation("Asia/Chongqing") +var SysPath string