年审信息变更列表修改

src/dashoo.cn/backend/api/business/oilsupplier/annualaudit/annualauditService.go

@@ -118,4 +118,40 @@ func (s *OilAnnualAuditService) SubmitOrgAudit(status, workflowid, certId, annua
 	ActiComplete.CallbackUrl =  utils.Cfg.MustValue("workflow", "callbackHost")+"/api/annualaudit/auditcallback?status="+ status +"&annualId="+ annualId
 	res = svcActiviti.MultiTaskComplete(ActiComplete)
 	return processInstanceId, res
+}
+
+func (s *OilAnnualAuditService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, AnnualAuditName string, pageIndex, itemsPerPage int64, orderby string, asc bool, entitiesPtr interface{}, where string) (total int64) {
+	var resultsSlice []map[string][]byte
+
+	//获取总记录数
+	sqlCount := `select count(*) from ` + supplierTableName + ` a `
+	sqlCount += ` left join ` + AnnualAuditName + " b on b.SupplierId = a.Id"
+	sqlCount += ` where ` + where
+
+	var sql string
+	sql = `select a.SupplierName, b.* `
+	sql += ` from ` + supplierTableName + ` a `
+	sql += ` left join ` + AnnualAuditName + " b on b.SupplierId = a.Id"
+	sql += ` where ` + where
+	if asc {
+		sql += ` order by ` + orderby + ` ASC `
+	} else {
+		sql += ` order by ` + orderby + ` DESC `
+	}
+	if (pageIndex != 0 && itemsPerPage !=0) {
+		sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+	}
+	s.DBE.SQL(sql).Find(entitiesPtr)
+
+	resultsSlice, _ = s.DBE.Query(sqlCount)
+
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, _ = strconv.ParseInt(string(value), 10, 64)
+			break
+		}
+	}
+
+	return total
 }

src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -7,6 +7,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/paymentinfo"
+	"dashoo.cn/backend/api/business/register"
 	"dashoo.cn/business2/areajson"
 	"dashoo.cn/business2/items"
 	"dashoo.cn/business2/permission"
@@ -54,7 +55,7 @@ func (this *AnnualAuditController) GetEntityList() {
 	//获取分页信息
 	page := this.GetPageInfoForm()
 	where := " 1=1 "
-	orderby := "Id"
+	orderby := "b.Id"
 	asc := false
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
@@ -71,19 +72,19 @@ func (this *AnnualAuditController) GetEntityList() {
 	CreateOn := this.GetString("CreateOn")
 
 	if SupplierTypeName != "" {
-		where = where + " and SupplierTypeName like '%" + SupplierTypeName + "%'"
+		where = where + " and b.SupplierTypeName like '%" + SupplierTypeName + "%'"
 	}
 
 	if RecUnitId != "" {
-		where = where + " and RecUnitId like '%" + RecUnitId + "%'"
+		where = where + " and b.RecUnitId like '%" + RecUnitId + "%'"
 	}
 
 	if AccessCardNo != "" {
-		where = where + " and AccessCardNo like '%" + AccessCardNo + "%'"
+		where = where + " and b.AccessCardNo like '%" + AccessCardNo + "%'"
 	}
 
 	if SupplierName != "" {
-		where = where + " and SupplierName like '%" + SupplierName + "%'"
+		where = where + " and b.SupplierName like '%" + SupplierName + "%'"
 	}
 
 	if CreateOn != "" {
@@ -91,24 +92,27 @@ func (this *AnnualAuditController) GetEntityList() {
 		if len(dates) == 2 {
 			minDate := dates[0]
 			maxDate := dates[1]
-			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+			where = where + " and b.CreateOn>='" + minDate + "' and b.CreateOn<='" + maxDate + "'"
 		}
 	}
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	var registerUser register.OilCorporateInfo
+	sql := " UserName='" + this.User.Username + "'"
+	svc.GetEntity(&registerUser,sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
-		where = where + " and CreateUserId = '" + this.User.Id + "'"
+		where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
 	} else {
 		//超级管理员和有查看所有数据权限的用户不加条件
 		svcPerm := permission.GetPermissionService(utils.DBE)
 		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
 		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-			where = where + " and CreateUserId = '" + this.User.Id + "'"
+			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
 		}
 	}
-
-	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	var list []annualaudit.OilAnnualAudit
-	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+	//total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilAnnualAuditName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total

src/dashoo.cn/backend/api/controllers/oilsupplier/infochange.go

@@ -7,6 +7,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
+	"dashoo.cn/backend/api/business/register"
 	"dashoo.cn/business2/parameter"
 	"dashoo.cn/business2/permission"
 	"dashoo.cn/business2/userRole"
@@ -119,7 +120,7 @@ func (this *InfoChangeController) GetSuppList() {
 	//获取分页信息
 	page := this.GetPageInfoForm()
 	where := " 1=1 "
-	orderby := "Id"
+	orderby := "b.Id"
 	asc := false
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
@@ -383,19 +384,21 @@ func (this *InfoChangeController) GetSuppList() {
 			where = where + " and a.CreateOn>='" + minDate + "' and a.CreateOn<='" + maxDate + "'"
 		}
 	}
+	svc := infochange.GetInfoChangeService(utils.DBE)
+	var registerUser register.OilCorporateInfo
+	sql := " UserName='" + this.User.Username + "'"
+	svc.GetEntity(&registerUser,sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
-		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+		where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
 	} else {
 		//超级管理员和有查看所有数据权限的用户不加条件
 		svcPerm := permission.GetPermissionService(utils.DBE)
 		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
 		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-			where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
 		}
 	}
-
-	svc := infochange.GetInfoChangeService(utils.DBE)
 	var list []infochange.SuppModelInfo
 	total := svc.GetSuppPagingEntitiesWithOrderBytbl(OilSupplierName, OilInfoChangeName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 	//total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)