|
@@ -550,11 +550,6 @@ func (this *TargetController) TargetAdd() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- //if tradeCode == "" {
|
|
|
- // br.Msg = "数据异常"
|
|
|
- // br.ErrMsg = "最大编码为空"
|
|
|
- // return
|
|
|
- //}
|
|
|
maxTradeCode, err := utils.GetMaxTradeCode(tradeCode)
|
|
|
if err != nil {
|
|
|
br.Msg = "数据异常"
|
|
@@ -2398,13 +2393,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{
|
|
@@ -3130,9 +3125,6 @@ func (this *TargetController) ImportTarget() {
|
|
|
}
|
|
|
failDatas = append(failDatas, failItem)
|
|
|
continue
|
|
|
- //br.Msg = "数据异常"
|
|
|
- //br.ErrMsg = "最大编码为空"
|
|
|
- //return
|
|
|
}
|
|
|
maxTradeCode, err := utils.GetMaxTradeCode(tradeCode)
|
|
|
if err != nil {
|