撤销

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

@@ -31,8 +31,6 @@ type OilContractSumScore struct {
 	ModifiedBy       string    `json:"ModifiedBy" xorm:"VARCHAR(50) 'ModifiedBy'"`
 	UnitId            int       `json:"UnitId" xorm:"INT(11) 'UnitId'"`
 	Unit              string    `json:"Unit" xorm:"VARCHAR(50) 'Unit'"`
-	Result1 		 string    `json:"Result1" xorm:"comment('业绩评价结果') VARCHAR(255) 'Result1'"`
-	Result2 		 string    `json:"Result2" xorm:"comment('基本条件评价结果') VARCHAR(255) 'Result2'"`
 }
 type OilContractSumScoreVo struct {
 	Id               int       `json:"Id" xorm:"not null pk autoincr comment('ID') INT(11) 'Id'"`
@@ -101,8 +99,6 @@ type OilContractSumScoreVo struct {
 	B6       int       `json:"B6" xorm:"default 0 comment('B6') INT(11) 'B6'"`
 	B7       int       `json:"B7" xorm:"default 0 comment('B7') INT(11) 'B7'"`
 	B8       int       `json:"B8" xorm:"default 0 comment('B8') INT(11) 'B8'"`
-	Result1 		 string    `json:"Result1" xorm:"comment('业绩评价结果') VARCHAR(255) 'Result1'"`
-	Result2 		 string    `json:"Result2" xorm:"comment('基本条件评价结果') VARCHAR(255) 'Result2'"`
 }
 type OilContractComputeSumScoreVo struct {
 	SupplierId    int       `json:"SupplierId"`

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

@@ -283,9 +283,6 @@ func (this *OilContractSumScoreController) AddEntity() {
 	entity.SupplierId   = model.SupplierId
 	entity.SupplierName = model.SupplierName
 	entity.ContractClass= model.ContractClass
-	entity.Conclusion	= model.Conclusion
-	entity.Result1	= model.Result1
-	entity.Result2	= model.Result2
 	entity.Year         = model.Year
 	entity.Status     = "0"
 	entity.Unit       = this.User.Unit
@@ -430,9 +427,6 @@ func (this *OilContractSumScoreController) UpdateEntity() {
 		"SupplierId",
 		"SupplierName",
 		"ContractClass",
-		"Conclusion",
-		"Result1",
-		"Result2",
 		"Year",
 		"Status",
 		"CreateOn",