年度评论调整

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

@@ -9,7 +9,32 @@ type OilContractSumScore struct {
 	SupplierId       int       `json:"SupplierId" xorm:"default 0 comment('供应商ID') INT(11) 'SupplierId'"`
 	SupplierName     string    `json:"SupplierName" xorm:"comment('企业名称') VARCHAR(255) 'SupplierName'"`
 	ContractClass    string    `json:"ContractClass" xorm:"comment('合同类别') VARCHAR(255) 'ContractClass'"`
-	ContractId       int       `json:"ContractId" xorm:"not null default 0 comment('合同表ID') INT(11) 'ContractId'"`
+	Category         int       `json:"Category" xorm:"not null default 0 comment('0二级单位创建1专业处创建') INT(11) 'Category'"`
+	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'"`
+	FirstAudit        int       `json:"FirstAudit" xorm:"comment('初审') INT(11) 'FirstAudit'"`
+	SecondAudit       int       `json:"SecondAudit" xorm:"comment('复审') INT(11) 'SecondAudit'"`
+	ThirdAudit        int       `json:"ThirdAudit" xorm:"comment('专业科室审批') INT(11) 'ThirdAudit'"`
+	FourthAudit       int       `json:"FourthAudit" xorm:"comment('集中审批') INT(11) 'FourthAudit'"`
+	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'"`
+	Status           string    `json:"Status" xorm:"not null default '0' comment('状态标识( 0 初始 - 1待二级初审 - 2待二级复审 - 3-专业科室接收 4 待专业科室审核 - 5 待集中评审 - 6 待交费 - 7 待入库 - 8 完成 - 9审核未通过)') VARCHAR(10) 'Status'"`
+	CreateOn       	 time.Time `json:"CreateOn" xorm:"DATETIME 'CreateOn'"`
+	CreateUserId     int       `json:"CreateUserId" xorm:"INT(11) 'CreateUserId'"`
+	CreateBy         string    `json:"CreateBy" xorm:"VARCHAR(50) 'CreateBy'"`
+	ModifiedOn       time.Time `json:"ModifiedOn" xorm:"DATETIME 'ModifiedOn'"`
+	ModifiedUserId   int       `json:"ModifiedUserId" xorm:"INT(11) 'ModifiedUserId'"`
+	ModifiedBy       string    `json:"ModifiedBy" xorm:"VARCHAR(50) 'ModifiedBy'"`
+}
+type OilContractSumScoreVo struct {
+	Id               int       `json:"Id" xorm:"not null pk autoincr comment('ID') INT(11) 'Id'"`
+	SupplierId       int       `json:"SupplierId" xorm:"default 0 comment('供应商ID') INT(11) 'SupplierId'"`
+	SupplierName     string    `json:"SupplierName" xorm:"comment('企业名称') VARCHAR(255) 'SupplierName'"`
+	ContractClass    string    `json:"ContractClass" xorm:"comment('合同类别') VARCHAR(255) 'ContractClass'"`
 	Category         int       `json:"Category" xorm:"not null default 0 comment('0二级单位创建1专业处创建') INT(11) 'Category'"`
 	SumScore         float64   `json:"SumScore" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore'"`
 	Content1    	 string    `json:"Content1" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content1'"`
@@ -27,7 +52,6 @@ type OilContractSumScore struct {
 	Content5    	 string    `json:"Content5" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content5'"`
 	NormalSumScore5  float64   `json:"NormalSumScore5" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore5'"`
 	SumScore5        float64   `json:"SumScore5" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore5'"`
-	Status           string    `json:"Status" xorm:"not null default '0' comment('状态标识( 0 初始 - 1待二级初审 - 2待二级复审 - 3-专业科室接收 4 待专业科室审核 - 5 待集中评审 - 6 待交费 - 7 待入库 - 8 完成 - 9审核未通过)') VARCHAR(10) 'Status'"`
 	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'"`
@@ -48,7 +72,6 @@ type OilContractSumScore struct {
 	ModifiedUserId   int       `json:"ModifiedUserId" xorm:"INT(11) 'ModifiedUserId'"`
 	ModifiedBy       string    `json:"ModifiedBy" xorm:"VARCHAR(50) 'ModifiedBy'"`
 }
-
 type OilContractComputeSumScoreVo struct {
 	SupplierId    int       `json:"SupplierId"`
 	SupplierName  string    `json:"SupplierName"`

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

@@ -0,0 +1,32 @@
+package contractSumScoreItems
+
+import "time"
+
+type OilContractSumScoreItems struct{
+	Id               int       `json:"Id" xorm:"not null pk autoincr comment('ID') INT(11) 'Id'"`
+	SumScoreId       int       `json:"SumScoreId" xorm:"default 0 comment('主表ID') INT(11) 'SumScoreId'"`
+	SumScore         float64   `json:"SumScore" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore'"`
+	Content1    	 string    `json:"Content1" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content1'"`
+	NormalSumScore1  float64   `json:"NormalSumScore1" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore1'"`
+	SumScore1        float64   `json:"SumScore1" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore1'"`
+	Content2    	 string    `json:"Content2" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content2'"`
+	NormalSumScore2  float64   `json:"NormalSumScore2" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore2'"`
+	SumScore2        float64   `json:"SumScore2" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore2'"`
+	Content3    	 string    `json:"Content3" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content3'"`
+	NormalSumScore3  float64   `json:"NormalSumScore3" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore3'"`
+	SumScore3        float64   `json:"SumScore3" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore3'"`
+	Content4    	 string    `json:"Content4" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content4'"`
+	NormalSumScore4  float64   `json:"NormalSumScore4" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore4'"`
+	SumScore4        float64   `json:"SumScore4" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore4'"`
+	Content5    	 string    `json:"Content5" xorm:"default '0' comment('评价内容') VARCHAR(50) 'Content5'"`
+	NormalSumScore5  float64   `json:"NormalSumScore5" xorm:"default 0.00 comment('标准分值') DECIMAL(11,2) 'NormalSumScore5'"`
+	SumScore5        float64   `json:"SumScore5" xorm:"default 0.00 comment('实际分值') DECIMAL(11,2) 'SumScore5'"`
+	Status           string    `json:"Status" xorm:"not null default '0' comment('状态标识( 0 初始 - 1待二级初审 - 2待二级复审 - 3-专业科室接收 4 待专业科室审核 - 5 待集中评审 - 6 待交费 - 7 待入库 - 8 完成 - 9审核未通过)') VARCHAR(10) 'Status'"`
+	Note			 string    `json:"Note" xorm:"comment('备注') VARCHAR(255) 'Note'"`
+	CreateOn       	 time.Time `json:"CreateOn" xorm:"DATETIME 'CreateOn'"`
+	CreateUserId     int       `json:"CreateUserId" xorm:"INT(11) 'CreateUserId'"`
+	CreateBy         string    `json:"CreateBy" xorm:"VARCHAR(50) 'CreateBy'"`
+	ModifiedOn       time.Time `json:"ModifiedOn" xorm:"DATETIME 'ModifiedOn'"`
+	ModifiedUserId   int       `json:"ModifiedUserId" xorm:"INT(11) 'ModifiedUserId'"`
+	ModifiedBy       string    `json:"ModifiedBy" xorm:"VARCHAR(50) 'ModifiedBy'"`
+}

src/dashoo.cn/backend/api/business/oilcontract/contractSumScoreItems/contractSumScoreItemsService.go

@@ -0,0 +1,13 @@
+package contractSumScoreItems
+import (
+	. "dashoo.cn/backend/api/mydb"
+	"github.com/go-xorm/xorm"
+)
+type OilContractSumScoreItemsService struct {
+	MyServiceBase
+}
+func GetOilContractSumScoreItemsService(xormEngine *xorm.Engine) *OilContractSumScoreItemsService {
+	s := new(OilContractSumScoreItemsService)
+	s.DBE = xormEngine
+	return s
+}

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

@@ -294,6 +294,7 @@ var (
 	OilContractEvaluationOrderName           string = "OilContractEvaluationOrder" //评价工单表
 	OilContractOffGradeName					 string = "OilContractOffGrade"        //业绩评价不合格原因
 	OilContractSumScoreName                  string = "OilContractSumScore"        //年度汇总评分
+	OilContractSumScoreItemsName             string = "OilContractSumScoreItems"   //年度汇总评分明细
 )
 
 //分页信息及数据

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

@@ -1,6 +1,7 @@
 package oilcontract
 
 import (
+	"dashoo.cn/backend/api/business/oilcontract/contractSumScoreItems"
 	//"dashoo.cn/backend/api/business/oilcontract/contractReview"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/workflow"
@@ -233,7 +234,6 @@ func (this *OilContractSumScoreController) GetComputeEntityList(){
 		where = where + " and contract.ContractClass = '" + Type + "'"
 	}
 
-
 	// 今年的汇总
 	year   := strconv.Itoa(time.Now().Year())
 	month  := "01"
@@ -304,23 +304,54 @@ func (this *OilContractSumScoreController) GetEntity() {
 // @Success	200	{object} controllers.Request
 // @router /add [post]
 func (this *OilContractSumScoreController) AddEntity() {
-	var model contractSumScore.OilContractSumScore
+	var model contractSumScore.OilContractSumScoreVo
 	var jsonBlob = this.Ctx.Input.RequestBody
-	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
 	json.Unmarshal(jsonBlob, &model)
-	model.Status   = "0"
-	model.Category = 1                      // 二级单位创建
-	model.CreateOn = time.Now()
-	model.CreateBy = this.User.Realname
-	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 
-	_, err := svc.InsertEntityBytbl(OilContractSumScoreName, &model)
+	var entity contractSumScore.OilContractSumScore
+	entity.SupplierId   = model.SupplierId
+	entity.SupplierName = model.SupplierName
+	entity.ContractClass= model.ContractClass
+	entity.Category   = 1                      // 二级单位创建
+	entity.Status     = "0"
+	entity.CreateOn   = time.Now()
+	entity.CreateBy   = this.User.Realname
+	entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	_, err := svc.InsertEntityBytbl(OilContractSumScoreName, &entity)
+
+	var item contractSumScoreItems.OilContractSumScoreItems
+	item.SumScoreId = entity.Id
+	item.SumScore   = model.SumScore
+	item.Content1   = model.Content1
+	item.NormalSumScore1 = model.NormalSumScore1
+	item.SumScore1  = model.SumScore1
+	item.Content2   = model.Content2
+	item.NormalSumScore2 = model.NormalSumScore2
+	item.SumScore2  = model.SumScore2
+	item.Content3   = model.Content3
+	item.NormalSumScore3 = model.NormalSumScore3
+	item.SumScore3  = model.SumScore3
+	item.Content4   = model.Content4
+	item.NormalSumScore4 = model.NormalSumScore4
+	item.SumScore4  = model.SumScore4
+	item.Content5   = model.Content5
+	item.NormalSumScore5 = model.NormalSumScore5
+	item.SumScore5  = model.SumScore5
+	item.Note       = model.Note
+	item.CreateOn   = time.Now()
+	item.CreateBy   = this.User.Realname
+	item.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	itemSvc := contractSumScoreItems.GetOilContractSumScoreItemsService(utils.DBE)
+	itemSvc.InsertEntityBytbl(OilContractSumScoreItemsName, &entity)
 	var errinfo ErrorDataInfo
 	if err == nil {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = model.Id
+		errinfo.Item = entity.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {