Merge branch 'contract_tmp' of http://code.dashoo.cn/dashoo/supplier_system into contract_tmp

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

@@ -17,7 +17,7 @@ type OilContractReview struct {
 	CommitComId       string    `xorm:"default '0' comment('提交二级单位Id') VARCHAR(50)"`
 	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'"`
+	IsFinal           int       `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'"`
@@ -48,9 +48,22 @@ type OilContractReviewListVo struct {
 	ModifiedUserId    int       `json:"ModifiedUserId"`
 	ModifiedBy        string    `json:"ModifiedBy"`
 
-	SupplierName      string    `json:"SupplierName"`   // 供应商名称
-	ProjectName       string    `json:"ProjectName"`    // 项目名称
-	ContractNo        string    `json:"ContractNo"`     // 合同编号
+	SupplierName         string    `json:"SupplierName"`   // 供应商名称
+	ProjectName          string    `json:"ProjectName"`    // 项目名称
+	ContractNo           string    `json:"ContractNo"`     // 合同编号
+	SupplierId           int       `json:"SupplierId"`
+	ProjectPlace         string    `json:"ProjectPlace"`
+	ProjectOwner         string    `json:"ProjectOwner"`
+	Telephone            string    `json:"Telephone"`
+	ProjectType          string    `json:"ProjectType"`
+	ContractClass        string    `json:"ContractClass"`
+	ContractMode         string    `json:"ContractMode"`
+	Amount               string    `json:"Amount"`
+	ContractPeriod       string    `json:"ContractPeriod"`
+	OpenDate             time.Time `json:"OpenDate"`
+	PlanFinishDate       time.Time `json:"PlanFinishDate"`
+	SettleStatus         string    `json:"SettleStatus"`
+	Remark               string    `json:"Remark"`
 }
 type OilContractReviewVo struct {
 	Items []*OilContractEvaluationItemsVo

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

@@ -26,7 +26,19 @@ func (s *OilContractReviewService) GetContractReviewList(pageIndex, itemsPerPage
 		"LEFT JOIN OilContract c ON r.ContractId=c.id " +
 		"WHERE "+ where
 
-	sql := "SELECT r.*,c.SupplierName " +
+	sql := "SELECT r.*,c.SupplierName,c.ProjectName,c.ContractNo,c.SupplierId " +
+		",c.ProjectPlace" +
+		",c.ProjectOwner" +
+		",c.Telephone" +
+		",c.ProjectType" +
+		",c.ContractClass" +
+		",c.ContractMode" +
+		",c.Amount" +
+		",c.ContractPeriod" +
+		",c.OpenDate" +
+		",c.PlanFinishDate" +
+		",c.SettleStatus" +
+		",c.Remark " +
 		"FROM OilContractReview r " +
 		"LEFT JOIN OilContract c ON r.ContractId=c.id " +
 		"WHERE "+ where +

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

@@ -261,6 +261,8 @@ func (this *OilContractReviewController) UpdateEntity() {
 
 		"AuditIndex",
 
+		"IsFinal",
+
 		"CreateOn",
 
 		"CreateUserId",