前后:增项/年审该公司名成曾用名;增项的准入范围显示问题

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

@@ -372,6 +372,7 @@ func (this *OilAnnualListenerController) WorkflowEndAudit() {
 			user.Realname = item.ChangeInfo
 			var cor register.OilCorporateInfo
 			var cert suppliercert.OilSupplierCert
+			var oldName supplier.OilSupplierOldName
 			var supplier supplier.OilSupplier
 			srv.GetEntityByWhere(OilSupplierCertName,"Id = " + strconv.Itoa(annualEntity.CerId),&cert)
 			srv.GetEntityByWhere(OilSupplierName,"Id = " + strconv.Itoa(cert.SupplierId),&supplier)
@@ -379,6 +380,19 @@ func (this *OilAnnualListenerController) WorkflowEndAudit() {
 			if cor.UserId > 0{
 				srv.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = " + strconv.Itoa(cor.UserId))
 			}
+			// 曾用名存到主表
+			supplier.OldSupplierName = item.BeChangeInfo
+			srv.UpdateEntityBywheretbl(OilSupplierName, &supplier, []string{"OldSupplierName"}, "Id = "+strconv.Itoa(cert.SupplierId))
+
+			oldName.OldName = item.BeChangeInfo
+			oldName.Name = item.ChangeInfo
+			oldName.SupplierId = cert.SupplierId
+			oldName.GfId = 0
+			oldName.CreateOn = item.CreateOn
+			oldName.CreateBy = item.CreateBy
+			oldName.CreateUserId = item.CreateUserId
+			// 曾用名存到子表
+			srv.InsertEntityBytbl("OilSupplierOldName", &oldName)
 		}
 	}
 

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

@@ -368,6 +368,35 @@ func (this *OilSupplierCertAppendListenerController) WorkflowEndAudit() {
 	var _ error
 	if len(infoItems) > 0 {
 		for i := 0; i < len(infoItems); i++ {
+			if infoItems[i].SelectItem == "SupplierName" {
+				var user userRole.Base_User
+				var oldName supplier.OilSupplierOldName
+				user.Realname = infoItems[i].ChangeInfo
+				var cor register.OilCorporateInfo
+				var supplier supplier.OilSupplier
+				certAppendSrv.GetEntityByWhere(OilSupplierName,"Id = " + strconv.Itoa(supplierCertAppendEntity.SupplierId),&supplier)
+				certAppendSrv.GetEntityByWhere(OilCorporateInfoName,"CommercialNo = '" + supplier.CommercialNo + "'",&cor)
+				if cor.UserId > 0 {
+					// 更新user表的RealName
+					certAppendSrv.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = " + strconv.Itoa(cor.UserId))
+				}
+
+				// 曾用名存到主表
+				supplier.OldSupplierName = infoItems[i].BeChangeInfo
+				certAppendSrv.UpdateEntityBywheretbl(OilSupplierName, &supplier, []string{"OldSupplierName"}, "Id = "+strconv.Itoa(supplierCertAppendEntity.SupplierId))
+
+				oldName.OldName = infoItems[i].BeChangeInfo
+				oldName.Name = infoItems[i].ChangeInfo
+				oldName.SupplierId = supplierCertAppendEntity.SupplierId
+				oldName.GfId = 0
+				oldName.CreateOn = infoItems[i].CreateOn
+				oldName.CreateBy = infoItems[i].CreateBy
+				oldName.CreateUserId = infoItems[i].CreateUserId
+				// 曾用名存到子表
+				certAppendSrv.InsertEntityBytbl("OilSupplierOldName", &oldName)
+
+			}
+
 			where := " Id = " + utils.ToStr(supplierCertAppendEntity.SupplierId)
 			var sql string
 			if infoItems[i].SelectItem == "SetupTime" {
@@ -392,23 +421,6 @@ func (this *OilSupplierCertAppendListenerController) WorkflowEndAudit() {
 			certAppendSrv.UpdateEntityBytbl(OilSupplierFileName, qualDetail[i].FileId, &supFileModel, []string{"FileName", "FileUrl", "EffectDate"})
 		}
 	}
-
-	// 更新user表的RealName
-	var user userRole.Base_User
-	for _,item := range infoItems{
-		if item.SelectItem == "SupplierName" {
-			user.Realname = item.ChangeInfo
-			var cor register.OilCorporateInfo
-			var cert suppliercert.OilSupplierCert
-			var supplier supplier.OilSupplier
-			certAppendSrv.GetEntityByWhere(OilSupplierCertName,"Id = " + strconv.Itoa(supplierCertAppendEntity.SupplierCertId),&cert)
-			certAppendSrv.GetEntityByWhere(OilSupplierName,"Id = " + strconv.Itoa(cert.SupplierId),&supplier)
-			certAppendSrv.GetEntityByWhere(OilCorporateInfoName,"CommercialNo = '" + supplier.CommercialNo + "'",&cor)
-			if cor.UserId > 0{
-				certAppendSrv.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = " + strconv.Itoa(cor.UserId))
-			}
-		}
-	}
 	this.Data["json"] = 1
 	this.ServeJSON()
 }

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

@@ -43,7 +43,7 @@ type appenditems struct {
 func (this *OilSupplierCertAppendSubController) GetList() {
 
 	//获取分页信息
-	//page := this.GetPageInfoForm()
+	page := this.GetPageInfoForm()
 	//where := " 1=1 "
 	//orderby := "Id"
 	//asc := false
@@ -66,10 +66,14 @@ func (this *OilSupplierCertAppendSubController) GetList() {
 	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
 	var list []suppliercertsub.OilSupplierCertSub
 	//svc.GetEntitysByWhere(OilSupplierCertAppendSubName, where, &list)
-	svc.GetEntitysByOrderbyWhere(OilSupplierCertSubName, suwhere, "CreateOn asc", &list)
-	var datainfo ErrorDataInfo
-	datainfo.Item = list
-	this.Data["json"] = &datainfo
+	//svc.GetEntitysByOrderbyWhere(OilSupplierCertSubName, suwhere, "CreateOn asc", &list)
+	total := svc.GetPagingEntitiesWithOrder(page.CurrentPage, page.Size, "CreateOn", false, &list, suwhere)
+	var dataInfo DataInfo
+	dataInfo.CurrentItemCount = total
+	dataInfo.PageIndex = page.CurrentPage
+	dataInfo.ItemsPerPage = page.Size
+	dataInfo.Items = list
+	this.Data["json"] = &dataInfo
 	this.ServeJSON()
 }
 

src/dashoo.cn/frontend_web/src/pages/select/processselect/index.vue

@@ -92,7 +92,7 @@
             </el-table-column>
           </el-table>
           <el-pagination @size-change="handleSizeChangeAll" @current-change="handleCurrentChangeAll" :current-page="currentPage"
-                         :page-sizes="[10, 50, 100, 200, 500]" :page-size="sizeAll" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                         :page-sizes="[40, 80, 120, 160, 200]" :page-size="sizeAll" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="准入" name="first">
@@ -176,7 +176,7 @@
             </el-table-column>
           </el-table>
           <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                         :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="年审" name="third">
@@ -226,7 +226,7 @@
             </el-table-column>
           </el-table>
           <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                         :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="变更申请" name="fourth">
@@ -268,7 +268,7 @@
             </el-table-column>
           </el-table>
           <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                         :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-tab-pane>
         <!--<el-tab-pane label="资质变更" name="fifth">-->
@@ -434,7 +434,7 @@
         // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
-          _size:  this.size,
+          _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
           tabinx: val