feature(权限):权限生成

opms_parent/app/dao/plat/internal/plat_task.go

@@ -36,7 +36,7 @@ type platTaskColumns struct {
 	IsOverdue        string // 是否超期（10否20是）
 	TaskStartDate    string // 发布时间
 	TaskEndDate      string // 要求完成时间
-	TaskDesc         string // 任务说明
+	TaskDesc         string // 督办内容
 	MainUserId       string // 负责人ID
 	OwnerUserId      string // 协办人ID
 	TaskLabel        string // 任务标签,号拼接

opms_parent/app/model/plat/internal/plat_task.go

@@ -18,7 +18,7 @@ type PlatTask struct {
 	IsOverdue        string      `orm:"is_overdue"         json:"isOverdue"`        // 是否超期（10否20是）
 	TaskStartDate    *gtime.Time `orm:"task_start_date"    json:"taskStartDate"`    // 发布时间
 	TaskEndDate      *gtime.Time `orm:"task_end_date"      json:"taskEndDate"`      // 要求完成时间
-	TaskDesc         string      `orm:"task_desc"          json:"taskDesc"`         // 任务说明
+	TaskDesc         string      `orm:"task_desc"          json:"taskDesc"`         // 督办内容
 	MainUserId       int         `orm:"main_user_id"       json:"mainUserId"`       // 负责人ID
 	OwnerUserId      string      `orm:"owner_user_id"      json:"ownerUserId"`      // 协办人ID
 	TaskLabel        string      `orm:"task_label"         json:"taskLabel"`        // 任务标签,号拼接

opms_parent/app/service/base/base_distributor.go

@@ -31,20 +31,20 @@ func NewDistributorService(ctx context.Context) (svc *distributorService, err er
 	return svc, nil
 }
 
-//GetList 经销商信息列表
+// GetList 经销商信息列表
 func (s *distributorService) GetList(req *model.BaseDistributorSearchReq) (total int, distributorList []*model.DistributorRonp, err error) {
 	distributorModel := s.Dao.M
 	if req.DistCode != "" {
-		distributorModel = distributorModel.Where(s.Dao.Columns.DistCode+" like ?", "%"+req.DistCode+"%")
+		distributorModel = distributorModel.Where(s.Dao.C.DistCode+" like ?", "%"+req.DistCode+"%")
 	}
 	if req.DistName != "" {
-		distributorModel = distributorModel.Where(s.Dao.Columns.DistName+" like ?", "%"+req.DistName+"%")
+		distributorModel = distributorModel.Where(s.Dao.C.DistName+" like ?", "%"+req.DistName+"%")
 	}
 	if req.BelongSale != "" {
-		distributorModel = distributorModel.Where(s.Dao.Columns.BelongSale+" like ?", "%"+req.BelongSale+"%")
+		distributorModel = distributorModel.Where(s.Dao.C.BelongSale+" like ?", "%"+req.BelongSale+"%")
 	}
 	if req.ProvinceId > 0 {
-		distributorModel = distributorModel.Where(s.Dao.Columns.ProvinceId+" in (?)", req.ProvinceId)
+		distributorModel = distributorModel.Where(s.Dao.C.ProvinceId+" in (?)", req.ProvinceId)
 	}
 	total, err = distributorModel.Count()
 	if err != nil {
@@ -55,7 +55,7 @@ func (s *distributorService) GetList(req *model.BaseDistributorSearchReq) (total
 	return
 }
 
-//Create 经销商创建
+// Create 经销商创建
 func (s *distributorService) Create(req *model.AddDistributor) (lastId int64, err error) {
 	DistributorData := new(model.BaseDistributor)
 	if err = gconv.Struct(req, DistributorData); err != nil {
@@ -72,9 +72,9 @@ func (s *distributorService) Create(req *model.AddDistributor) (lastId int64, er
 	return
 }
 
-//GetEntityById 详情
+// GetEntityById 详情
 func (s *distributorService) GetEntityById(id int64) (distributorInfo *model.DistributorRonp, err error) {
-	err = s.Dao.Where(base.BaseProduct.Columns.Id, id).Scan(&distributorInfo)
+	err = s.Dao.Where(base.BaseProduct.C.Id, id).Scan(&distributorInfo)
 	if err != nil {
 		return
 	}
@@ -99,8 +99,8 @@ func (s *distributorService) UpdateById(req *model.UpdateDistributorReq) (err er
 		return
 	}
 	service.SetUpdatedInfo(distData, s.GetCxtUserId(), s.GetCxtUserName())
-	_, err = s.Dao.FieldsEx(s.Dao.Columns.DistCode, s.Dao.Columns.Id,
-		s.Dao.Columns.CreatedName, s.Dao.Columns.CreatedBy, s.Dao.Columns.CreatedTime).WherePri(s.Dao.Columns.Id, req.Id).Update(distData)
+	_, err = s.Dao.FieldsEx(s.Dao.C.DistCode, s.Dao.C.Id,
+		s.Dao.C.CreatedName, s.Dao.C.CreatedBy, s.Dao.C.CreatedTime).WherePri(s.Dao.C.Id, req.Id).Update(distData)
 	if err != nil {
 		g.Log().Error(err)
 		return
@@ -108,7 +108,7 @@ func (s *distributorService) UpdateById(req *model.UpdateDistributorReq) (err er
 	return
 }
 
-//DeleteByIds 删除
+// DeleteByIds 删除
 func (s *distributorService) DeleteByIds(ids []int64) (err error) {
 	if len(ids) == 1 {
 		count, err := s.Dao.WherePri(ids[0]).Count()
@@ -120,12 +120,12 @@ func (s *distributorService) DeleteByIds(ids []int64) (err error) {
 			return myerrors.TipsError("数据不存在或已被删除，请刷新页面")
 		}
 	} else {
-		_, err := s.Dao.WhereIn(s.Dao.Columns.Id, ids).LockShared().Count()
+		_, err := s.Dao.WhereIn(s.Dao.C.Id, ids).LockShared().Count()
 		if err != nil {
 			g.Log().Error(err)
 			return err
 		}
-		result, err := s.Dao.WhereIn(s.Dao.Columns.Id, ids).Delete()
+		result, err := s.Dao.WhereIn(s.Dao.C.Id, ids).Delete()
 		if err != nil {
 			g.Log().Error(err)
 			return err

opms_parent/app/service/base/base_district.go

@@ -74,7 +74,7 @@ func (s *districtService) SortToProvince(treeList []*model.ProvincesTree) []*mod
 // GetProvinceList 返回所有省份的
 func (s *districtService) GetProvinceList() (list []*model.Province, err error) {
 
-	err = s.Dao.Where(base.BaseDistrict.Columns.ParentId, 0).Scan(&list)
+	err = s.Dao.Where(base.BaseDistrict.C.ParentId, 0).Scan(&list)
 	if err != nil {
 		g.Log().Error(err)
 		return

opms_parent/app/service/base/base_product.go

@@ -27,7 +27,7 @@ func NewProductService(ctx context.Context) (svc *productService, err error) {
 	return svc, nil
 }
 
-//GetList 产品信息列表
+// GetList 产品信息列表
 func (s *productService) GetList(req *model.ProductSearchReq) (total int, productList []*model.BaseProduct, err error) {
 	Dao := &s.Dao.BaseProductDao
 	if req.ProdCode != "" {
@@ -55,7 +55,7 @@ func (s *productService) GetList(req *model.ProductSearchReq) (total int, produc
 	return
 }
 
-//GetEntityById 根据ID查询详细信息
+// GetEntityById 根据ID查询详细信息
 func (s *productService) GetEntityById(id int64) (product *model.BaseProduct, err error) {
 	product, err = s.Dao.FindOne(id)
 	if err != nil {
@@ -65,7 +65,7 @@ func (s *productService) GetEntityById(id int64) (product *model.BaseProduct, er
 	return
 }
 
-//Create 添加信息
+// Create 添加信息
 func (s *productService) Create(req *model.AddProductReq) (lastInsertId int64, err error) {
 	product := new(model.BaseProduct)
 	if err = gconv.Struct(req, product); err != nil {
@@ -81,7 +81,7 @@ func (s *productService) Create(req *model.AddProductReq) (lastInsertId int64, e
 	return
 }
 
-//UpdateById 修改数据
+// UpdateById 修改数据
 func (s *productService) UpdateById(req *model.UpdateProductReq) (err error) {
 	product, err := s.Dao.FindOne(req.Id)
 	if err != nil {
@@ -103,7 +103,7 @@ func (s *productService) UpdateById(req *model.UpdateProductReq) (err error) {
 	return
 }
 
-//DeleteByIds 删掉数据
+// DeleteByIds 删掉数据
 func (s *productService) DeleteByIds(ids []int64) (err error) {
 	if len(ids) == 1 {
 		count, err := s.Dao.WherePri(ids[0]).Count()
@@ -114,19 +114,19 @@ func (s *productService) DeleteByIds(ids []int64) (err error) {
 		if count == 0 {
 			return myerrors.TipsError("数据不存在或已被删除，请刷新页面")
 		}
-		_, err = s.Dao.WherePri(s.Dao.Columns.Id, ids[0]).Delete()
+		_, err = s.Dao.WherePri(s.Dao.C.Id, ids[0]).Delete()
 		if err != nil {
 			g.Log().Error(err)
 			return err
 		}
 		return err
 	} else {
-		_, err := s.Dao.WhereIn(s.Dao.Columns.Id, ids).LockShared().Count()
+		_, err := s.Dao.WhereIn(s.Dao.C.Id, ids).LockShared().Count()
 		if err != nil {
 			g.Log().Error(err)
 			return err
 		}
-		result, err := s.Dao.WhereIn(s.Dao.Columns.Id, ids).Delete()
+		result, err := s.Dao.WhereIn(s.Dao.C.Id, ids).Delete()
 		if err != nil {
 			g.Log().Error(err)
 			return err

opms_parent/app/service/base/base_sales_region.go

@@ -67,7 +67,7 @@ func (s *salesRegionService) GetRegionTree() (regionList []*model.Region, err er
 	detailDao := base.NewBaseSalesRegionDetailDao(s.Tenant)
 	regionDetailsList := ([]*model.District)(nil)
 	err = detailDao.Fields("region_id, cust_province_id as regionCode, cust_province as regionDesc").Group("cust_province_id").
-		OrderAsc(detailDao.Columns.RegionId).Scan(&regionDetailsList)
+		OrderAsc(detailDao.C.RegionId).Scan(&regionDetailsList)
 	if err != nil {
 		return
 	}

opms_parent/app/service/base/base_sales_region_detail.go

@@ -32,7 +32,7 @@ func NewSalesRegionDetailService(ctx context.Context) (svc *salesRegionDetailSer
 
 // GetList 销售区域列表
 func (s *salesRegionDetailService) GetList(req *model.SecBaseRegionDetailReq) (total int, RegionList []*model.BaseRegionDetailRep, err error) {
-	Model := s.Dao.Where(s.Dao.Columns.RegionId, req.RegionId)
+	Model := s.Dao.Where(s.Dao.C.RegionId, req.RegionId)
 	total, err = Model.Count()
 	if err != nil {
 		err = myerrors.DbError("获取总行数失败。")
@@ -103,7 +103,7 @@ func (s *salesRegionDetailService) UpdateById(req *model.UpdateBaseRegionDetailR
 		return
 	}
 	service.SetUpdatedInfo(productData, s.GetCxtUserId(), s.GetCxtUserName())
-	_, err = s.Dao.FieldsEx(service.UpdateFieldEx...).WherePri(base.BaseSalesRegionDetail.Columns.Id, req.Id).Update(productData)
+	_, err = s.Dao.FieldsEx(service.UpdateFieldEx...).WherePri(base.BaseSalesRegionDetail.C.Id, req.Id).Update(productData)
 
 	if err != nil {
 		g.Log().Error(err)
@@ -114,6 +114,6 @@ func (s *salesRegionDetailService) UpdateById(req *model.UpdateBaseRegionDetailR
 
 // DeleteByIds 删除
 func (s *salesRegionDetailService) DeleteByIds(ids []int64) (err error) {
-	_, err = s.Dao.WhereIn(s.Dao.Columns.Id, ids).Delete()
+	_, err = s.Dao.WhereIn(s.Dao.C.Id, ids).Delete()
 	return
 }

opms_parent/app/service/cust/cust_customer.go

@@ -912,7 +912,7 @@ func (s *CustomerService) GetCustNameIsExist(req *model.IsExistsCustName) (exist
 
 // CustAbstract 客户摘要
 func (s *CustomerService) CustAbstract(Id int64) (followInfo *model.Follow, err error) {
-	count, err := s.FollowDao.Where(s.FollowDao.Columns.CustId, Id).Count()
+	count, err := s.FollowDao.Where(s.FollowDao.C.CustId, Id).Count()
 	if err != nil {
 		g.Log().Error(err)
 		return
@@ -1086,7 +1086,7 @@ func (s *CustomerService) MergeCustomer(req *model.MergeCustomerRep) (err error)
 			"updated_by":   s.GetCxtUserId(),
 			"updated_name": s.GetCxtUserName(),
 			"end_date":     gtime.Now(),
-		}).WhereIn(s.BelongDao.Columns.CustId, req.Id).Update()
+		}).WhereIn(s.BelongDao.C.CustId, req.Id).Update()
 	if err != nil {
 		g.Log().Error(err)
 		return
@@ -1119,7 +1119,7 @@ func (s *CustomerService) BatchCreatebelong(rep []*model.CustCustomer, req *mode
 			"updated_by":   s.GetCxtUserId(),
 			"updated_name": s.GetCxtUserName(),
 			"end_date":     gtime.Now(),
-		}).WhereIn(s.BelongDao.Columns.CustId, req.Ids).Update()
+		}).WhereIn(s.BelongDao.C.CustId, req.Ids).Update()
 	if err != nil {
 		return err
 	}

opms_parent/app/service/cust/cust_customer_contact.go

@@ -46,7 +46,7 @@ func (s *CustomercontactService) Create(req *model.CustCustomerContactSeq) (err
 	return
 }
 
-//修改联系人
+// 修改联系人
 func (s *CustomercontactService) UpdateById(req *model.UpdateCustCustomerContactSeq) (err error) {
 	count, err := s.Dao.Count(req.Id)
 	if err != nil {
@@ -63,8 +63,8 @@ func (s *CustomercontactService) UpdateById(req *model.UpdateCustCustomerContact
 		return
 	}
 	service.SetUpdatedInfo(CustomertData, s.GetCxtUserId(), s.GetCxtUserName())
-	_, err = s.Dao.FieldsEx(s.Dao.Columns.CreatedTime, s.Dao.Columns.CreatedBy, s.Dao.Columns.CreatedName, s.Dao.Columns.CustId, s.Dao.Columns.Id).
-		WherePri(s.Dao.Columns.Id, req.Id).Update(CustomertData)
+	_, err = s.Dao.FieldsEx(s.Dao.C.CreatedTime, s.Dao.C.CreatedBy, s.Dao.C.CreatedName, s.Dao.C.CustId, s.Dao.C.Id).
+		WherePri(s.Dao.C.Id, req.Id).Update(CustomertData)
 
 	if err != nil {
 		g.Log().Error(err)
@@ -73,7 +73,7 @@ func (s *CustomercontactService) UpdateById(req *model.UpdateCustCustomerContact
 	return
 }
 
-//获取联系人信息
+// 获取联系人信息
 func (s *CustomercontactService) GetList(req *model.ContactSeq) (total int, list []*model.CustCustomerContactInfo, err error) {
 	contactDao := s.Dao.M.Where("cust_id = ", req.CustId)
 
@@ -94,7 +94,7 @@ func (s *CustomercontactService) GetList(req *model.ContactSeq) (total int, list
 	return
 }
 
-//删除联系人
+// 删除联系人
 func (s *CustomercontactService) DeleteById(Ids []int64) (err error) {
 	result, err := s.Dao.Where(" id  in (?) ", Ids).Count()
 	if err != nil {

opms_parent/app/service/work/work_order.go

@@ -19,8 +19,8 @@ type OrderService struct {
 	Dao *work.WorkOrderDao
 }
 
-//工单状态
-//10发起20审批中30审批通过40审批拒绝50关闭
+// 工单状态
+// 10发起20审批中30审批通过40审批拒绝50关闭
 var MapStatus = map[string]string{"10": "发起", "20": "审批中", "30": "审批通过", "40": "审批拒绝", "50": "关闭"}
 
 func NewOrderService(ctx context.Context) (svc *OrderService, err error) {
@@ -32,16 +32,16 @@ func NewOrderService(ctx context.Context) (svc *OrderService, err error) {
 	return svc, nil
 }
 
-//列表
+// 列表
 func (s *OrderService) GetList(req *model.WorkOrderSearchReq) (total int, OrderList []*model.WorkOrderList, err error) {
 	Model := s.Dao
 	//工单类型
 	if req.OrderTypeId != 0 {
-		Model.Where(s.Dao.Columns.OrderTypeId, req.OrderTypeId)
+		Model.Where(s.Dao.C.OrderTypeId, req.OrderTypeId)
 	}
 	//工单状态
 	if req.OrderStatus != "" {
-		Model.Where(s.Dao.Columns.OrderStatus, req.OrderStatus)
+		Model.Where(s.Dao.C.OrderStatus, req.OrderStatus)
 	}
 	total, err = Model.Fields().Count()
 	if err != nil {
@@ -106,10 +106,10 @@ func (s *OrderService) DeriveList(req *model.WorkOrderExport) (content *model.Wo
 	return &con, err
 }
 
-//详情
+// 详情
 func (s *OrderService) GetEntityById(req *comm_def.IdReq) (detail *model.WorkDetail, err error) {
 	Model := s.Dao
-	err = Model.Where(s.Dao.Columns.Id, req.Id).Scan(&detail)
+	err = Model.Where(s.Dao.C.Id, req.Id).Scan(&detail)
 	if err != nil {
 		err = myerrors.DbError("获取详情失败。")
 		return