|
|
@@ -170,7 +170,7 @@ func (this *OilContractSumScoreController) GetComputeEntityList() {
|
|
|
// 优秀、合格分数值从配置中取
|
|
|
var paramEntityList []baseparameter.Base_Parameter
|
|
|
paramsSvc := baseparameter.GetBaseparameterService(utils.DBE)
|
|
|
- paramEntityList = paramsSvc.GetBaseparameterbyid("GFGL1", "paramset")
|
|
|
+ paramEntityList = paramsSvc.GetBaseparameterbyid("GFGL_CONTRACT", "paramset")
|
|
|
good := "80"
|
|
|
pass := "60"
|
|
|
for _, i := range paramEntityList {
|
|
|
@@ -215,7 +215,7 @@ func (this *OilContractSumScoreController) GetComputeEntityList() {
|
|
|
svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
|
|
|
var list []contractSumScore.OilContractComputeSumScoreVo
|
|
|
total := svc.GetPagingComputeEntitiesWithOrderBytbl(page.CurrentPage, page.Size, orderby, asc, &list, where, having)
|
|
|
- for index,item := range list {
|
|
|
+ for index, item := range list {
|
|
|
where1 := where + " and contract.SupplierId = " + strconv.Itoa(item.SupplierId)
|
|
|
var list1 []contractSumScore.OilContractSumScoreResult
|
|
|
svc.GetSumListEntitiesWithOrderBytbl(&list1, where1)
|
|
|
@@ -973,7 +973,7 @@ func (this *OilContractSumScoreController) ExcelExport() {
|
|
|
// 优秀、合格分数值从配置中取
|
|
|
var paramEntityList []baseparameter.Base_Parameter
|
|
|
paramsSvc := baseparameter.GetBaseparameterService(utils.DBE)
|
|
|
- paramEntityList = paramsSvc.GetBaseparameterbyid("GFGL1", "paramset")
|
|
|
+ paramEntityList = paramsSvc.GetBaseparameterbyid("GFGL_CONTRACT", "paramset")
|
|
|
good := "80"
|
|
|
pass := "60"
|
|
|
for _, i := range paramEntityList {
|
|
|
@@ -1014,7 +1014,7 @@ func (this *OilContractSumScoreController) ExcelExport() {
|
|
|
var list []contractSumScore.OilContractComputeSumScoreVo
|
|
|
svc.GetPagingComputeEntitiesWithOrderBytbl(page.CurrentPage, page.Size, orderby, asc, &list, where, having)
|
|
|
|
|
|
- for index,item := range list {
|
|
|
+ for index, item := range list {
|
|
|
where1 := where + " and contract.SupplierId = " + strconv.Itoa(item.SupplierId)
|
|
|
var list1 []contractSumScore.OilContractSumScoreResult
|
|
|
svc.GetSumListEntitiesWithOrderBytbl(&list1, where1)
|