'日常评价接口调整'

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

@@ -12,8 +12,8 @@ type OilContract struct {
 	ProjectPlace         string    `json:"ProjectPlace" xorm:"comment('工程地点') VARCHAR(100) 'ProjectPlace'"`
 	ProjectOwner         string    `json:"ProjectOwner" xorm:"comment('项目负责人') VARCHAR(50) 'ProjectOwner'"`
 	Telephone            string    `json:"Telephone" xorm:"comment('联系人电话') VARCHAR(50) 'Telephone'"`
-	ContractClass        string    `json:"ContractClass" xorm:"comment('合同类别') VARCHAR(50) 'ContractClass'"`
 	ProjectType          string    `json:"ProjectType" xorm:"comment('项目类别') VARCHAR(50) 'ProjectType'"`
+	ContractClass        string    `json:"ContractClass" xorm:"comment('合同类别') VARCHAR(50) 'ContractClass'"`
 	ContractMode         string    `json:"ContractMode" xorm:"comment('合同模式') VARCHAR(50) 'ContractMode'"`
 	Amount               string    `json:"Amount" xorm:"comment('合同总金额(万元)') DECIMAL(11,2) 'Amount'"`
 	ContractPeriod       string    `json:"ContractPeriod" xorm:"comment('合同总工期(天)') VARCHAR(50) 'ContractPeriod'"`
@@ -31,12 +31,16 @@ type OilContract struct {
 	QualityUnit          string    `json:"QualityUnit" xorm:"comment('质量监督单位') VARCHAR(50) 'QualityUnit'"`
 	QualityOwner         string    `json:"QualityOwner" xorm:"comment('质量监督负责人') VARCHAR(50) 'QualityOwner'"`
 	QualityTelphone      string    `json:"QualityTelphone" xorm:"comment('手机号') VARCHAR(50) 'QualityTelphone'"`
+	SettleStatus         string    `json:"SettleStatus" xorm:"comment('结算状态 1未结算2阶段性结算') VARCHAR(50) 'SettleStatus'"`
+	Status               int       `json:"Status" xorm:"comment('合同状态 1未履行2履行中2履行完毕') INT(1) 'Status'"`
 	Remark               string    `json:"Remark" xorm:"comment('备注') VARCHAR(500) 'Remark'"`
 	IsDelete             int       `json:"IsDelete" xorm:"default 0 comment('删除状态，0正常，1已删除') INT(11) 'IsDelete'"`
+	StartDate            time.Time `json:"StartDate" xorm:"comment('开始时间') DATETIME 'StartDate'"`
+	EndDate              time.Time `json:"EndDate" xorm:"comment('截止时间（履行期限）') DATETIME 'EndDate'"`
 	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'"`
+	ModifiedBy           string    `json:"ModifiedBy" xorm:"default '1' VARCHAR(50) 'ModifiedBy'"`
 }

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

@@ -25,6 +25,33 @@ type OilContractReview struct {
 	ModifiedUserId    int       `json:"ModifiedUserId" xorm:"INT(11) 'ModifiedUserId'"`
 	ModifiedBy        string    `json:"ModifiedBy" xorm:"VARCHAR(50) 'ModifiedBy'"`
 }
+type OilContractReviewListVo struct {
+	Id                int       `json:"Id"`
+	ContractId        int       `json:"ContractId"`
+	Status            string    `json:"Status"`
+	WorkflowId        string    `json:"WorkflowId"`
+	BusinessKey       string    `json:"BusinessKey"`
+	ProcessKey        string    `json:"ProcessKey"`
+	BackRemark        string    `json:"BackRemark"`
+	FirstAudit        int       `json:"FirstAudit"`
+	SecondAudit       int       `json:"SecondAudit"`
+	ThirdAudit        int       `json:"ThirdAudit"`
+	FourthAudit       int       `json:"FourthAudit"`
+	CommitComId       string    `json:"FourthAudit"`
+	ProfessionalAudit int       `json:"ProfessionalAudit"`
+	AuditIndex        int       `json:"AuditIndex"`
+	IsFinal           string    `json:"IsFinal"`
+	CreateOn          time.Time `json:"CreateOn"`
+	CreateUserId      int       `json:"CreateUserId"`
+	CreateBy          string    `json:"CreateBy"`
+	ModifiedOn        time.Time `json:"ModifiedOn"`
+	ModifiedUserId    int       `json:"ModifiedUserId"`
+	ModifiedBy        string    `json:"ModifiedBy"`
+
+	SupplierName      string    `json:"SupplierName"`   // 供应商名称
+	ProjectName       string    `json:"ProjectName"`    // 项目名称
+	ContractNo        string    `json:"ContractNo"`     // 合同编号
+}
 type OilContractReviewVo struct {
 	Items []*OilContractEvaluationItemsVo
 	Id             int       `json:"Id" xorm:"not null pk INT(11) 'Id'"`

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

@@ -18,13 +18,15 @@ func GetOilContractReviewService(xormEngine *xorm.Engine) *OilContractReviewServ
 }
 func (s *OilContractReviewService) GetContractReviewList(pageIndex, itemsPerPage int64, order string, asc string, entitiesPtr interface{}, where string) (total int64) {
 	var err error
+	if pageIndex < 1 { pageIndex = 1}
+	if itemsPerPage < 1 { itemsPerPage = 10 }
 	var resultsSlice []map[string][]byte
 	sqlconunt := "SELECT count(*) " +
 		"FROM OilContractReview r " +
 		"LEFT JOIN OilContract c ON r.ContractId=c.id " +
 		"WHERE "+ where
 
-	sql := "SELECT r.* " +
+	sql := "SELECT r.*,c.SupplierName " +
 		"FROM OilContractReview r " +
 		"LEFT JOIN OilContract c ON r.ContractId=c.id " +
 		"WHERE "+ where +

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

@@ -7,6 +7,7 @@ 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'"`
+	Category         int       `json:"Category" xorm:"not null default 0 comment('0二级单位创建1专业处创建') INT(11) 'Category'"`
 	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'"`

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

@@ -101,7 +101,7 @@ func (this *OilContractReviewController) GetEntityList() {
 		}
 	}
 	svc := contractReview.GetOilContractReviewService(utils.DBE)
-	var list []contractReview.OilContractReview
+	var list []contractReview.OilContractReviewListVo
 	total := svc.GetContractReviewList(page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list

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

@@ -200,11 +200,23 @@ func (this *OilContractSumScoreController) GetComputeEntityList(){
 		}
 	}
 	SupplierName := this.GetString("SupplierName")
+	CreateOn     := this.GetString("CreateOn")
+	Type         := this.GetString("Type","01")
 
 	if SupplierName != "" {
 		where = where + " and contract.SupplierName like '%" + SupplierName + "%'"
 	}
-
+	if Type != ""{
+		where = where + " and contract.ContractClass = '" + Type + "'"
+	}
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and review.CreateOn>='" + minDate + "' and review.CreateOn<='" + maxDate + "'"
+		}
+	}
 	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
 	var list []contractSumScore.OilContractComputeSumScoreVo
 	total := svc.GetPagingComputeEntitiesWithOrderBytbl(page.CurrentPage, page.Size, orderby, asc, &list, where)
@@ -267,12 +279,12 @@ func (this *OilContractSumScoreController) AddEntity() {
 	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
 
 	json.Unmarshal(jsonBlob, &model)
+	model.Category = 1                      // 二级单位创建
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 
 	_, err := svc.InsertEntityBytbl(this.User.AccCode+OilContractSumScoreName, &model)
-
 	var errinfo ErrorDataInfo
 	if err == nil {
 		//新增