年度汇总表基本字段修改

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

@@ -6,11 +6,26 @@ import (
 
 type OilContractSumScore struct {
 	Id               int       `json:"Id" xorm:"not null pk autoincr comment('ID') INT(11) 'Id'"`
-	Contractid       int       `json:"ContractId" xorm:"not null default 0 comment('合同表ID') INT(11) 'ContractId'"`
-	Normalsumscore   string    `json:"NormalSumScore" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore'"`
-	Sumscore         string    `json:"SumScore" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore'"`
-	Conclusionreason string    `json:"ConclusionReason" xorm:"comment('不合格原因') VARCHAR(255) 'ConclusionReason'"`
+	ContractId       int       `json:"ContractId" xorm:"not null default 0 comment('合同表ID') INT(11) 'ContractId'"`
+	SumScore         string    `json:"SumScore" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore'"`
+	Content1    	 string    `json:"Content1" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content1'"`
+	NormalSumScore1  string    `json:"NormalSumScore1" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore1'"`
+	SumScore1        string    `json:"SumScore1" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore1'"`
+	Content2    	 string    `json:"Content2" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content2'"`
+	NormalSumScore2  string    `json:"NormalSumScore2" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore2'"`
+	SumScore2        string    `json:"SumScore2" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore2'"`
+	Content3    	 string    `json:"Content3" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content3'"`
+	NormalSumScore3  string    `json:"NormalSumScore3" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore3'"`
+	SumScore3        string    `json:"SumScore3" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore3'"`
+	Content4    	 string    `json:"Content4" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content4'"`
+	NormalSumScore4  string    `json:"NormalSumScore4" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore4'"`
+	SumScore4        string    `json:"SumScore4" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore4'"`
+	Note			 string    `json:"Note" xorm:"comment('备注') VARCHAR(255) 'Note'"`
+	ConclusionReason string    `json:"ConclusionReason" xorm:"comment('不合格原因') VARCHAR(255) 'ConclusionReason'"`
 	Conclusion       int       `json:"Conclusion" xorm:"default 0 comment('0不合格，1观察使用，2合格，3优秀') INT(11) 'Conclusion'"`
+	WorkflowId     	 string    `json:"WorkflowId" xorm:"default '0' comment('工作流的ID') VARCHAR(50) 'WorkflowId'"`
+	Businesskey      string    `json:"BusinessKey" xorm:"VARCHAR(255) 'BusinessKey'"`
+	Processkey     	 string    `json:"ProcessKey" xorm:"comment('工作流名称') VARCHAR(255) 'ProcessKey'"`
 	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/oilcontract/contractSumScore.go

@@ -38,8 +38,19 @@ func (this *OilContractSumScoreController) GetEntityList() {
 	}
 	Id := this.GetString("Id")
 	ContractId := this.GetString("ContractId")
-	NormalSumScore := this.GetString("NormalSumScore")
 	SumScore := this.GetString("SumScore")
+	NormalSumScore1 := this.GetString("NormalSumScore1")
+	SumScore1 := this.GetString("SumScore1")
+	Content1 := this.GetString("Content1")
+	NormalSumScore2 := this.GetString("NormalSumScore2")
+	SumScore2 := this.GetString("SumScore2")
+	Content2 := this.GetString("Content2")
+	NormalSumScore3 := this.GetString("NormalSumScore3")
+	SumScore3 := this.GetString("SumScore3")
+	Content3 := this.GetString("Content3")
+	NormalSumScore4 := this.GetString("NormalSumScore4")
+	SumScore4 := this.GetString("SumScore4")
+	Content4 := this.GetString("Content4")
 	ConclusionReason := this.GetString("ConclusionReason")
 	Conclusion := this.GetString("Conclusion")
 	CreateOn := this.GetString("CreateOn")
@@ -58,16 +69,57 @@ func (this *OilContractSumScoreController) GetEntityList() {
 		where = where + " and ContractId like '%" + ContractId + "%'"
 	}
 
+	if SumScore != "" {
+		where = where + " and SumScore like '%" + SumScore + "%'"
+	}
 
-	if NormalSumScore != "" {
-		where = where + " and NormalSumScore like '%" + NormalSumScore + "%'"
+	if Content1 != "" {
+		where = where + " and Content1 like '%" + Content1 + "%'"
 	}
 
+	if NormalSumScore1 != "" {
+		where = where + " and NormalSumScore1 like '%" + NormalSumScore1 + "%'"
+	}
 
-	if SumScore != "" {
-		where = where + " and SumScore like '%" + SumScore + "%'"
+	if SumScore1 != "" {
+		where = where + " and SumScore1 like '%" + SumScore1 + "%'"
+	}
+
+	if Content2 != "" {
+		where = where + " and Content2 like '%" + Content2 + "%'"
+	}
+
+	if NormalSumScore2 != "" {
+		where = where + " and NormalSumScore2 like '%" + NormalSumScore2 + "%'"
 	}
 
+	if SumScore2 != "" {
+		where = where + " and SumScore2 like '%" + SumScore2 + "%'"
+	}
+
+	if Content3 != "" {
+		where = where + " and Content3 like '%" + Content3 + "%'"
+	}
+
+	if NormalSumScore3 != "" {
+		where = where + " and NormalSumScore3 like '%" + NormalSumScore3 + "%'"
+	}
+
+	if SumScore3 != "" {
+		where = where + " and SumScore3 like '%" + SumScore3 + "%'"
+	}
+
+	if Content4 != "" {
+		where = where + " and Content4 like '%" + Content4 + "%'"
+	}
+
+	if NormalSumScore4 != "" {
+		where = where + " and NormalSumScore4 like '%" + NormalSumScore4 + "%'"
+	}
+
+	if SumScore4 != "" {
+		where = where + " and SumScore4 like '%" + SumScore4 + "%'"
+	}
 
 	if ConclusionReason != "" {
 		where = where + " and ConclusionReason like '%" + ConclusionReason + "%'"
@@ -78,7 +130,6 @@ func (this *OilContractSumScoreController) GetEntityList() {
 		where = where + " and Conclusion like '%" + Conclusion + "%'"
 	}
 
-
 	if CreateOn != "" {
 		where = where + " and CreateOn like '%" + CreateOn + "%'"
 	}
@@ -233,10 +284,32 @@ func (this *OilContractSumScoreController) UpdateEntity() {
 
 		"ContractId",
 
-		"NormalSumScore",
-
 		"SumScore",
 
+		"Content1",
+
+		"NormalSumScore1",
+
+		"SumScore1",
+
+		"Content2",
+
+		"NormalSumScore2",
+
+		"SumScore2",
+
+		"Content3",
+
+		"NormalSumScore3",
+
+		"SumScore3",
+
+		"Content4",
+
+		"NormalSumScore4",
+
+		"SumScore4",
+
 		"ConclusionReason",
 
 		"Conclusion",