update

boxcost/api/plan-cost-excel.go

@@ -214,39 +214,31 @@ func (b *PlanCostExcel) drawAllContent() error {
 						}
 
 						// 状态
-						stop := false
 						stageStatus := ""
+
 						if len(stage.BillId) < 1 {
 							stageStatus = "未生成订单"
-							stop = true
+						}
+						if splan.State[stage.BillId] == "created" {
+							stageStatus = "进行中"
 						}
 						// 审核状态
-						if !stop {
-							if splan.Reviewed[stage.BillId] == 1 {
-								stageStatus = "已审核"
-							} else {
-								stageStatus = "未审核"
-								stop = true
-							}
-
+						if splan.Reviewed[stage.BillId] == 1 {
+							stageStatus = "已审核"
+						} else {
+							stageStatus = "未审核"
 						}
 
 						// 接单状态
-						if !stop {
-							if splan.IsAck[stage.BillId] {
-								stageStatus = "已接单"
-							} else {
-								stageStatus = "未接单"
-								stop = true
-							}
-
+						if splan.IsAck[stage.BillId] {
+							stageStatus = "已接单"
+						} else {
+							stageStatus = "未接单"
 						}
 
 						// 完成状态
 						if splan.State[stage.BillId] == "complete" {
 							stageStatus = "已完成"
-						} else if splan.State[stage.BillId] == "created" {
-							stageStatus = "进行中"
 						}
 
 						b.drawRow(b.Row, "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit), stage.Norm, matHeigth, matWidth, unit, price, budgetPrice, realPrice)

boxcost/api/plan-summary-excel.go

@@ -215,41 +215,31 @@ func (b *PlanSummaryExcel) drawAllContent() error {
 						}
 
 						// 状态
-						stop := false
 						stageStatus := ""
+
 						if len(stage.BillId) < 1 {
 							stageStatus = "未生成订单"
-							stop = true
+						}
+						if splan.State[stage.BillId] == "created" {
+							stageStatus = "进行中"
 						}
 						// 审核状态
-						if !stop {
-							if splan.Reviewed[stage.BillId] == 1 {
-								stageStatus = "已审核"
-							} else {
-								stageStatus = "未审核"
-								stop = true
-							}
-
+						if splan.Reviewed[stage.BillId] == 1 {
+							stageStatus = "已审核"
+						} else {
+							stageStatus = "未审核"
 						}
 
 						// 接单状态
-						if !stop {
-							if splan.IsAck[stage.BillId] {
-								stageStatus = "已接单"
-							} else {
-								stageStatus = "未接单"
-								stop = true
-							}
-
+						if splan.IsAck[stage.BillId] {
+							stageStatus = "已接单"
+						} else {
+							stageStatus = "未接单"
 						}
 
 						// 完成状态
-						if !stop {
-							if splan.State[stage.BillId] == "complete" {
-								stageStatus = "已完成"
-							} else if splan.State[stage.BillId] == "created" {
-								stageStatus = "进行中"
-							}
+						if splan.State[stage.BillId] == "complete" {
+							stageStatus = "已完成"
 						}
 
 						b.drawRow(b.Row, "", "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit), stage.Norm, matHeigth, matWidth, unit, price, budgetPrice, realPrice)
@@ -405,41 +395,31 @@ func (b *PlanSummaryExcel) drawSupplierContent() error {
 								}
 
 								// 状态
-								stop := false
 								stageStatus := ""
+
 								if len(stage.BillId) < 1 {
 									stageStatus = "未生成订单"
-									stop = true
+								}
+								if splan.State[stage.BillId] == "created" {
+									stageStatus = "进行中"
 								}
 								// 审核状态
-								if !stop {
-									if splan.Reviewed[stage.BillId] == 1 {
-										stageStatus = "已审核"
-									} else {
-										stageStatus = "未审核"
-										stop = true
-									}
-
+								if splan.Reviewed[stage.BillId] == 1 {
+									stageStatus = "已审核"
+								} else {
+									stageStatus = "未审核"
 								}
 
 								// 接单状态
-								if !stop {
-									if splan.IsAck[stage.BillId] {
-										stageStatus = "已接单"
-									} else {
-										stageStatus = "未接单"
-										stop = true
-									}
-
+								if splan.IsAck[stage.BillId] {
+									stageStatus = "已接单"
+								} else {
+									stageStatus = "未接单"
 								}
 
 								// 完成状态
-								if !stop {
-									if splan.State[stage.BillId] == "complete" {
-										stageStatus = "已完成"
-									} else if splan.State[stage.BillId] == "created" {
-										stageStatus = "进行中"
-									}
+								if splan.State[stage.BillId] == "complete" {
+									stageStatus = "已完成"
 								}
 
 								b.drawRow(b.Row, "", "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit), stage.Norm, matHeigth, matWidth, unit, price, budgetPrice, realPrice)

boxcost/api/summary-sample-excel.go

@@ -114,46 +114,35 @@ func (b *SummarySampleExcel) drawAllContent() error {
 					cates := map[string][]int{}
 					for _, stage := range comp.Stages {
 						// 状态
-						stop := false
 						stageStatus := ""
 						statusMark := "【x】"
 
 						if len(stage.BillId) < 1 {
 							stageStatus = "未生成订单"
-							stop = true
+						}
+						if splan.State[stage.BillId] == "created" {
+							stageStatus = "进行中"
 						}
 						// 审核状态
-						if !stop {
-							if splan.Reviewed[stage.BillId] == 1 {
-								stageStatus = "已审核"
-							} else {
-								stageStatus = "未审核"
-								stop = true
-							}
-
+						if splan.Reviewed[stage.BillId] == 1 {
+							stageStatus = "已审核"
+						} else {
+							stageStatus = "未审核"
 						}
 
 						// 接单状态
-						if !stop {
-							if splan.IsAck[stage.BillId] {
-								stageStatus = "已接单"
-							} else {
-								stageStatus = "未接单"
-								stop = true
-							}
-
+						if splan.IsAck[stage.BillId] {
+							stageStatus = "已接单"
+						} else {
+							stageStatus = "未接单"
 						}
 
 						// 完成状态
-						if !stop {
-							if splan.State[stage.BillId] == "complete" {
-								stageStatus = "已完成"
-								statusMark = "【v】"
-							} else if splan.State[stage.BillId] == "created" {
-								stageStatus = "进行中"
-							}
-
+						if splan.State[stage.BillId] == "complete" {
+							stageStatus = "已完成"
+							statusMark = "【v】"
 						}
+
 						fmt.Println(stageStatus)
 						createTime := splan.CreateTimes[stage.BillId].Local().Format("2006-01-02")
 						deliveryTime := stage.DeliveryTime.Local().Format("2006-01-02")
@@ -256,45 +245,33 @@ func (b *SummarySampleExcel) drawSupplierContent() error {
 								}
 
 								// 状态
-								stop := false
 								stageStatus := ""
 								statusMark := "【x】"
 
 								if len(stage.BillId) < 1 {
 									stageStatus = "未生成订单"
-									stop = true
+								}
+								if splan.State[stage.BillId] == "created" {
+									stageStatus = "进行中"
 								}
 								// 审核状态
-								if !stop {
-									if splan.Reviewed[stage.BillId] == 1 {
-										stageStatus = "已审核"
-									} else {
-										stageStatus = "未审核"
-										stop = true
-									}
-
+								if splan.Reviewed[stage.BillId] == 1 {
+									stageStatus = "已审核"
+								} else {
+									stageStatus = "未审核"
 								}
 
 								// 接单状态
-								if !stop {
-									if splan.IsAck[stage.BillId] {
-										stageStatus = "已接单"
-									} else {
-										stageStatus = "未接单"
-										stop = true
-									}
-
+								if splan.IsAck[stage.BillId] {
+									stageStatus = "已接单"
+								} else {
+									stageStatus = "未接单"
 								}
 
 								// 完成状态
-								if !stop {
-									if splan.State[stage.BillId] == "complete" {
-										stageStatus = "已完成"
-										statusMark = "【v】"
-									} else if splan.State[stage.BillId] == "created" {
-										stageStatus = "进行中"
-									}
-
+								if splan.State[stage.BillId] == "complete" {
+									stageStatus = "已完成"
+									statusMark = "【v】"
 								}
 								fmt.Println(stageStatus)
 								createTime := splan.CreateTimes[stage.BillId].Local().Format("2006-01-02")