工单相关接口

src/dashoo.cn/backend/api/business/oilcontract/contractReview/contractReview.go

@@ -16,6 +16,7 @@ type OilContractReview struct {
 	FourthAudit       int       `json:"FourthAudit" xorm:"comment('集中审批') INT(11) 'FourthAudit'"`
 	ProfessionalAudit int       `json:"ProfessionalAudit" xorm:"comment('业务处室专业审批人id') INT(11) 'ProfessionalAudit'"`
 	AuditIndex        int       `json:"AuditIndex" xorm:"default 0 comment('审批次数') INT(11) 'AuditIndex'"`
+	IsFinal           string    `json:"IsFinal" xorm:"comment('是否最终评价（履行完成） 0否1是')  INT(11) 'IsFinal'"`
 	CreateOn          time.Time `json:"CreateOn" xorm:"DATETIME 'CreateOn'"`
 	CreateUserId      int       `json:"CreateUserId" xorm:"INT(11) 'CreateUserId'"`
 	CreateBy          string    `json:"CreateBy" xorm:"VARCHAR(50) 'CreateBy'"`

src/dashoo.cn/backend/api/controllers/base.go

@@ -291,6 +291,7 @@ var (
 	OilContractEvaluationItemsName           string = "OilContractEvaluationItems" //合同业绩评价项目
 	OilContractReviewName                    string = "OilContractReview"          //合同审核工作流
 	OilEvaluationItemsName                   string = "OilEvaluationItems"         //业绩评价项目
+	OilContractEvaluationOrderName           string = "OilContractEvaluationOrder" //评价工单表
 	OilContractOffGradeName					 string = "OilContractOffGrade"        //业绩评价不合格原因
 	OilContractSumScoreName                  string = "OilContractSumScore"        //年度汇总评分
 )

src/dashoo.cn/backend/api/routers/router.go

@@ -489,10 +489,17 @@ func init() {
 				&oilcontract.OilContractReviewController{},
 			),
 		),
+<<<<<<< HEAD
 		// 合同评价明细
 		beego.NSNamespace("/contract-evaluation",
 			beego.NSInclude(
 				&oilcontract.OilContractEvaluationItemsController{},
+=======
+		// 合同评价工单
+		beego.NSNamespace("/contract-order",
+			beego.NSInclude(
+				&oilcontract.OilContractEvaluationOrderController{},
+>>>>>>> 工单相关接口
 			),
 		),
 	)