优化搜索

app/admin/controller/gas_cylinder.go

@@ -96,7 +96,7 @@ func (e GasCylinderController) Get(c *gin.Context) {
 func (e GasCylinderController) GetByUid(c *gin.Context) {
 	s := service.GasCylinder{}
 	operationLogSvc := service.OperationLog{}
-	req := dto.GasCylinderGetReq{}
+	req := dto.GasCylinderGetByUidReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -110,9 +110,8 @@ func (e GasCylinderController) GetByUid(c *gin.Context) {
 	}
 	var gasCylinder model.ProvGasCylinder
 	p := actions.GetPermissionFromContext(c)
-
 	//数据权限检查
-	err = s.Get(&req, &gasCylinder, p)
+	err = s.GetByUid(&req, &gasCylinder, p)
 	if err != nil {
 		e.Error(500, err, err.Error())
 		return

app/admin/model/car_info.go

@@ -24,7 +24,7 @@ type CarInfo struct {
 	CarNo            string           `json:"carNo" gorm:"size:32;"`   // 车牌号
 	CmpCode          string           `json:"cmpCode" gorm:"size:36;"` // 归属企业登记编号
 	ProvCarInfo      ProvCarInfo      `json:"provCarInfo"`
-	TruckUserCarInfo TruckUserCarInfo `json:"truckUserCarInfo"  gorm:"foreignkey:CarNo;references:CarNo"`
+	TruckUserCarInfo TruckUserCarInfo `json:"truckUserCarInfo"  gorm:"->;foreignkey:CarNo;references:CarNo;"`
 	model2.ControlBy
 	model2.ModelTime
 	model2.DeptBy

app/admin/model/customer.go

@@ -24,6 +24,7 @@ type Customer struct {
 	IsSyncProv bool   `json:"isSyncProv"`                     // 是否同步到省平台
 	Openid     string `json:"openid"`                         // 微信id
 	State      int    `json:"state" gorm:"size:6;default:-1"` // 0-待整改 1-整改中 2-已整改 合格
+	Name       string `json:"principalName" gorm:"size:128;"`
 	model2.ControlBy
 	model2.ModelTime
 	model2.DeptBy
@@ -34,9 +35,10 @@ func (Customer) TableName() string {
 }
 
 type CustomerOmit struct {
-	Id            string `json:"id,omitempty"`            // 主键ID
-	PrincipalName string `json:"principalName,omitempty"` // 负责人名字
-	Openid        string `json:"openid,omitempty"`        // 微信id
+	Id         string `json:"id,omitempty"`         // 主键ID
+	Name       string `json:"name,omitempty"`       // 负责人名字
+	Openid     string `json:"openid,omitempty"`     // 微信id
+	IsSyncProv bool   `json:"isSyncProv,omitempty"` // 是否同步到省平台
 }
 
 func (CustomerOmit) TableName() string {

app/admin/model/device.go

@@ -9,7 +9,7 @@ type Device struct {
 	Sn          string      `json:"sn" gorm:"size:128;"`         // 设备sn
 	Type        int         `json:"type" gorm:"size:32;"`        // 1-手持枪 2-龙门
 	OptType     string      `json:"optType" gorm:"size:32;"`     // 操作类型
-	User        SysUserOmit `json:"user"  gorm:"foreignkey:ProvUserId;references:ProvUserId"`
+	User        SysUserOmit `json:"user"  gorm:"->;foreignkey:ProvUserId;references:ProvUserId"`
 	model2.ControlBy
 	model2.ModelTime
 	model2.DeptBy

app/admin/model/fill_check.go

@@ -30,7 +30,7 @@ type FillCheck struct {
 	model2.Model
 	ProvFillCheck
 	UserId int         `json:"userId" gorm:"size:36"  swaggerignore:"true"` // 创建人员id
-	User   SysUserOmit `json:"user"`
+	User   SysUserOmit `json:"user" gorm:"->;"`
 	model2.ControlBy
 	model2.ModelTime
 	model2.DeptBy

app/admin/model/fill_data.go

@@ -54,9 +54,9 @@ type FillData struct {
 	StationId  string      `json:"stationId" gorm:"size:36"` // 气站ID 否
 	CompanyId  string      `json:"companyId" gorm:"size:36"` // 企业Id 否
 	UserId     string      `json:"userId" gorm:"size:36"`    // 充装工id 否
-	User       SysUserOmit `json:"user" gorm:"foreignkey:UserId;references:ProvUserId"`
-	Station    SysDeptOmit `json:"station" gorm:"foreignkey:StationId;references:CmpCode"`
-	Company    SysDeptOmit `json:"company" gorm:"foreignkey:CompanyId;references:CmpCode"`
+	User       SysUserOmit `json:"user" gorm:"->;foreignkey:UserId;references:ProvUserId"`
+	Station    SysDeptOmit `json:"station" gorm:"->;foreignkey:StationId;references:CmpCode"`
+	Company    SysDeptOmit `json:"company" gorm:"->;foreignkey:CompanyId;references:CmpCode"`
 	model2.ControlBy
 	model2.ModelTime
 	model2.DeptBy
@@ -64,11 +64,11 @@ type FillData struct {
 
 type FillDataDistinctStation struct {
 	StationId string      `json:"stationId" gorm:"size:36"` // 气站ID 否
-	Station   SysDeptOmit `json:"station" gorm:"foreignkey:StationId;references:CmpCode"`
+	Station   SysDeptOmit `json:"station" gorm:"->;foreignkey:StationId;references:CmpCode"`
 }
 type FillDataDistinctUser struct {
 	UserId string      `json:"userId" gorm:"size:36"` // 充装工id 否
-	User   SysUserOmit `json:"user" gorm:"foreignkey:UserId;references:ProvUserId"`
+	User   SysUserOmit `json:"user" gorm:"->;foreignkey:UserId;references:ProvUserId"`
 }
 
 func (FillData) TableName() string {

app/admin/model/inspect_record.go

@@ -35,8 +35,8 @@ type InspectRecord struct {
 	model2.Model
 	ProvInspectRecord
 	OrderId  string       `json:"orderId" gorm:"size:48"` // 订单id
-	Customer CustomerOmit `json:"customer"`
-	User     SysUserOmit  `json:"user"`
+	Customer CustomerOmit `json:"customer" gorm:"->;"`
+	User     SysUserOmit  `json:"user" gorm:"->;"`
 	model2.ControlBy
 	model2.ModelTime
 	model2.DeptBy

app/admin/model/operation_log.go

@@ -25,17 +25,17 @@ type ProvOperationLog struct {
 type OperationLog struct {
 	model2.Model
 	ProvOperationLog
-	State                int          `json:"state" gorm:"size:36"` // 1 - 新循环 2-已完成
+	State                int          `json:"state" gorm:"size:36;default:1"` // 1 - 新循环 2-已完成
 	OptUserObj           SysUserOmit  `json:"optUserObj" gorm:"foreignkey:OptUser;references:ProvUserId"`
-	ObjectUserObj        SysUserOmit  `json:"objectUserObj" gorm:"foreignkey:ObjectUser;references:ProvUserId"`
-	ObjectCustomerObj    CustomerOmit `json:"objectCustomerObj" gorm:"foreignkey:ObjectCustomer;references:Id"`
-	OptCustomerObj       CustomerOmit `json:"optCustomerObj" gorm:"foreignkey:OptCustomer;references:Id"`
-	CompanyObj           SysDeptOmit  `json:"companyObj"  gorm:"foreignkey:CompanyId;references:CmpCode"`
-	CurrentEnterpriseObj SysDeptOmit  `json:"currentEnterpriseObj"  gorm:"foreignkey:CurrentEnterprise;references:CmpCode"`
-	CurrentStationObj    SysDeptOmit  `json:"currentStationObj"  gorm:"foreignkey:CurrentStation;references:CmpCode"`
-	CurrentStoreObj      SysDeptOmit  `json:"currentStoreObj"  gorm:"foreignkey:CurrentStore;references:CmpCode"`
-	CurrentTruckObj      SysUserOmit  `json:"currentTruckObj" gorm:"foreignkey:CurrentTruck;references:ProvUserId"`
-	CurrentAddressObj    CustomerOmit `json:"currentAddressObj" gorm:"foreignkey:CurrentAddress;references:Id"`
+	ObjectUserObj        SysUserOmit  `json:"objectUserObj" gorm:"->;foreignkey:ObjectUser;references:ProvUserId"`
+	ObjectCustomerObj    CustomerOmit `json:"objectCustomerObj" gorm:"->;foreignkey:ObjectCustomer;references:Id"`
+	OptCustomerObj       CustomerOmit `json:"optCustomerObj" gorm:"->;foreignkey:OptCustomer;references:Id"`
+	CompanyObj           SysDeptOmit  `json:"companyObj"  gorm:"->;foreignkey:CompanyId;references:CmpCode"`
+	CurrentEnterpriseObj SysDeptOmit  `json:"currentEnterpriseObj"  gorm:"->;foreignkey:CurrentEnterprise;references:CmpCode"`
+	CurrentStationObj    SysDeptOmit  `json:"currentStationObj"  gorm:"->;foreignkey:CurrentStation;references:CmpCode"`
+	CurrentStoreObj      SysDeptOmit  `json:"currentStoreObj"  gorm:"->;foreignkey:CurrentStore;references:CmpCode"`
+	CurrentTruckObj      SysUserOmit  `json:"currentTruckObj" gorm:"->;foreignkey:CurrentTruck;references:ProvUserId"`
+	CurrentAddressObj    CustomerOmit `json:"currentAddressObj" gorm:"->;foreignkey:CurrentAddress;references:Id"`
 	model2.ControlBy
 	model2.ModelTime
 	model2.DeptBy

app/admin/model/order.go

@@ -37,12 +37,12 @@ type Order struct {
 	DeliveryTime model2.Time     `json:"deliveryTime" gorm:"size:128"` // 配送时间
 	ArriveTime   model2.Time     `json:"arriveTime" gorm:"size:128"`   // 送达时间
 	CancelTime   model2.Time     `json:"cancelTime" gorm:"size:128"`   // 取消时间
-	Customer     CustomerOmit    `json:"customer"`
-	Store        SysDeptOmit     `json:"store"`
-	User         SysUserOmit     `json:"user"`
-	Goods        Goods           `json:"goods"`
-	Spec         GasCylinderSpec `json:"spec"`
-	Dept         SysDeptOmit     `json:"dept"`
+	Customer     Customer        `json:"customer" gorm:"->"`
+	Store        SysDeptOmit     `json:"store" gorm:"->"`
+	User         SysUserOmit     `json:"user" gorm:"->"`
+	Goods        Goods           `json:"goods" gorm:"->"`
+	Spec         GasCylinderSpec `json:"spec" gorm:"->"`
+	Dept         SysDeptOmit     `json:"dept" gorm:"->"`
 	model2.ControlBy
 	model2.ModelTime
 	model2.DeptBy

app/admin/model/real_fill_data.go

@@ -18,7 +18,7 @@ type ProvRealFillData struct {
 type RealFillData struct {
 	model2.Model
 	ProvRealFillData
-	FillGun FillGun `json:"fillGun" gorm:"foreignkey:GunCode;references:GunCode"`
+	FillGun FillGun `json:"fillGun" gorm:"->;foreignkey:GunCode;references:GunCode"`
 	model2.ControlBy
 	model2.ModelTime
 	model2.DeptBy

app/admin/model/sys_user.go

@@ -60,8 +60,8 @@ type ProvTruckUserBindCertificate struct {
 type SysUser struct {
 	model2.Model
 	coreModel.User
-	Dept                         SysDept                      `json:"dept,omitempty"`               // 部门
-	Role                         SysRole                      `json:"role,omitempty"`               // 角色
+	Dept                         SysDept                      `json:"dept" gorm:"->"`               // 部门
+	Role                         SysRole                      `json:"role" gorm:"->"`               // 角色
 	ProvUser                     ProvUser                     `json:"provUser"`                     // 省平台用户信息
 	ProvUserId                   string                       `json:"provUserId" gorm:"size:48;"`   // 省平台用户id
 	ProvStoreUserBindCertificate ProvStoreUserBindCertificate `json:"provStoreUserBindCertificate"` // 送气人员绑定资质信息《燃气从业资格证》

app/admin/model/truck_user_car_info.go

@@ -2,10 +2,11 @@ package model
 
 import model2 "gas-cylinder-api/common/model"
 
+// 车辆绑定用户信息
 type TruckUserCarInfo struct {
 	model2.Model
-	ProvUserId string      `json:"provUserId" gorm:"size:48;"`  // 省平台用户id
-	CarNo      string      `json:"provCmpCode" gorm:"size:32;"` // 所属机构登记编
+	ProvUserId string      `json:"provUserId" gorm:"size:48;"` // 省平台用户id
+	CarNo      string      `json:"carNo" gorm:"size:32;"`      // 车牌号
 	User       SysUserOmit `json:"user"  gorm:"foreignkey:ProvUserId;references:ProvUserId"`
 	model2.ModelTime
 }

app/admin/router/gas_cylinder.go

@@ -9,6 +9,8 @@ import (
 
 func init() {
 	routerCheckRole = append(routerCheckRole, registerGasCylinderRouter)
+	routerNoCheckRole = append(routerNoCheckRole, registerGasCylinderRouterRouter2)
+
 }
 
 // 派费管理
@@ -19,6 +21,14 @@ func registerGasCylinderRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
 	{
 		r.GET("", cont.GetPage)
 		r.GET("/:inner_code", cont.Get)
-		r.GET("/uid/:inner_code", cont.GetByUid)
+	}
+}
+
+// 需认证的路由代码
+func registerGasCylinderRouterRouter2(v1 *gin.RouterGroup) {
+	cont := controller.GasCylinderController{}
+	r := v1.Group("/gas-cylinder")
+	{
+		r.GET("/uid/:chipUid", cont.GetByUid)
 	}
 }

app/admin/service/customer.go

@@ -108,7 +108,7 @@ func (e *Customer) Insert(c *dto.CustomerInsertReq) error {
 		}
 	}
 
-	// 添加角色
+	// 添加客户
 	c.Generate(&data)
 	data.Id = id
 	err = tx.Create(&data).Error
@@ -213,7 +213,7 @@ func (e *Customer) Update(c *dto.CustomerUpdateReq, p *actions.DataPermission) e
 	}()
 
 	var CustomerModel = model.Customer{}
-	// 查询角色是否存在
+	// 查询客户是否存在
 	err = e.Orm.Scopes(actions.Permission(CustomerModel.TableName(), p)).
 		Where("id = ?", c.GetId()).
 		First(&CustomerModel).Error
@@ -261,7 +261,7 @@ func (e *Customer) Remove(c *dto.CustomerDeleteReq, p *actions.DataPermission) e
 
 	var CustomerModel model.Customer
 
-	// 查询角色是否存在
+	// 查询客户是否存在
 	err = e.Orm.Scopes(actions.Permission(CustomerModel.TableName(), p)).
 		Where("id = ?", c.GetId()).
 		First(&CustomerModel).Error

app/admin/service/dto/customer.go

@@ -22,26 +22,28 @@ func (m *CustomerGetPageReq) GetNeedSearch() interface{} {
 }
 
 type CustomerInsertReq struct {
-	Id             string  `json:"id" swaggerignore:"true"`                   // 主键ID
-	Name           string  `json:"name"`                                      // 名字
+	Id             string  `json:"id" swaggerignore:"true"`                         // 主键ID
+	Name           string  `json:"name"`                                            // 名字
 	PrincipalPhone string  `json:"principalPhone" vd:"len($)>0;msg:'电话不能为空'"` // 负责人电话
-	Address        string  `json:"address"`                                   // 地址
-	AddressImg     string  `json:"addressImg"`                                // 现场图片
-	Lng            float64 `json:"lng"`                                       // 经度
-	Lat            float64 `json:"lat"`                                       // 纬度
-	Type           int     `json:"type"`                                      // 类型 0-商户 1-私人
-	City           string  `json:"city"`                                      // 所在地市
-	Area           string  `json:"area"`                                      // 所属区/县
-	Remark         string  `json:"remark"`                                    // 备注描述
-	StoreCode      string  `swaggerignore:"true"`                             // 门店登记编号
+	Address        string  `json:"address"`                                         // 地址
+	AddressImg     string  `json:"addressImg"`                                      // 现场图片
+	Lng            float64 `json:"lng"`                                             // 经度
+	Lat            float64 `json:"lat"`                                             // 纬度
+	Type           int     `json:"type"`                                            // 类型 0-商户 1-私人
+	City           string  `json:"city"`                                            // 所在地市
+	Area           string  `json:"area"`                                            // 所属区/县
+	Remark         string  `json:"remark"`                                          // 备注描述
+	StoreCode      string  `swaggerignore:"true"`                                   // 门店登记编号
 
 	common.ControlBy `swaggerignore:"true"`
 	common.DeptBy    `swaggerignore:"true"`
 }
 
 func (s *CustomerInsertReq) Generate(model *model.Customer) {
+	model.Name = s.Name
 	if s.Type == 0 {
 		model.ShopName = s.Name
+
 	}
 	if s.Type == 1 {
 		model.PrincipalName = s.Name
@@ -77,24 +79,26 @@ func (s *CustomerInsertReq) SetStoreCode(storeCode string) {
 }
 
 type CustomerUpdateReq struct {
-	Id             string  `json:"id" vd:"len($)>0"`                           // 主键ID
-	Name           string  `json:"name"`                                       // 名字
+	Id             string  `json:"id" vd:"len($)>0"`                                 // 主键ID
+	Name           string  `json:"name"`                                             // 名字
 	PrincipalPhone string  `json:"principalPhone"  vd:"len($)>0;msg:'电话不能为空'"` // 负责人电话
-	Address        string  `json:"address"`                                    // 地址
-	AddressImg     string  `json:"addressImg"`                                 // 现场图片
-	Lng            float64 `json:"lng"`                                        // 经度
-	Lat            float64 `json:"lat"`                                        // 纬度
-	Type           int     `json:"type"`                                       // 类型 0-商户 1-私人
-	City           string  `json:"city"`                                       // 所在地市
-	Area           string  `json:"area"`                                       // 所属区/县
-	Remark         string  `json:"remark"`                                     // 备注描述
-	StoreCode      string  `swaggerignore:"true"`                              // 门店登记编号
+	Address        string  `json:"address"`                                          // 地址
+	AddressImg     string  `json:"addressImg"`                                       // 现场图片
+	Lng            float64 `json:"lng"`                                              // 经度
+	Lat            float64 `json:"lat"`                                              // 纬度
+	Type           int     `json:"type"`                                             // 类型 0-商户 1-私人
+	City           string  `json:"city"`                                             // 所在地市
+	Area           string  `json:"area"`                                             // 所属区/县
+	Remark         string  `json:"remark"`                                           // 备注描述
+	StoreCode      string  `swaggerignore:"true"`                                    // 门店登记编号
 
 	common.ControlBy `swaggerignore:"true"`
 	common.DeptBy    `swaggerignore:"true"`
 }
 
 func (s *CustomerUpdateReq) Generate(model *model.Customer) {
+	model.Name = s.Name
+
 	if s.Type == 0 {
 		model.ShopName = s.Name
 	}

app/admin/service/dto/device.go

@@ -8,9 +8,7 @@ import (
 
 type DeviceGetPageReq struct {
 	dto.Pagination `search:"-"`
-	Name           string `form:"name" search:"type:contains;column:name;table:goods"`            // 商品名称
-	MediaType      string `form:"MediaType" search:"type:contains;column:media_type;table:goods"` // 介质类型
-	IsShow         bool   `form:"isShow" search:"type:exact;column:is_show;table:goods"`          // 角色名称
+	Sn             string `form:"sn" search:"type:contains;column:sn;table:device"` // 设备编码
 }
 
 func (m *DeviceGetPageReq) GetNeedSearch() interface{} {

app/admin/service/dto/fill_data.go

@@ -7,12 +7,12 @@ import (
 
 type FillDataGetPageReq struct {
 	dto.Pagination `search:"-"`
-	StationId      string `form:"stationId" search:"-"`     // 气站id
-	UserId         string `form:"userId" search:"-"`        // 充装人员id
-	InnerCode      string `form:"innerCode" search:"-"`     // 气瓶内编码
-	ChipId         string `form:"chipId" search:"-"`        // 高频编码
-	StartFillTime  string `form:"startFillTime" search:"-"` // 充装开始时间
-	EndFillTime    string `form:"endFillTime" search:"-"`   // 充装结束时间
+	StationId      string `form:"stationId" search:"type:contains;column:station_id;table:fill_data"` // 气站id
+	UserId         string `form:"userId" search:"type:contains;column:user_id;table:fill_data"`       // 充装人员id
+	InnerCode      string `form:"innerCode" search:"-"`                                               // 气瓶内编码
+	ChipId         string `form:"chipId" search:"-"`                                                  // 高频编码
+	StartFillTime  string `form:"startFillTime" search:"-"`                                           // 充装开始时间
+	EndFillTime    string `form:"endFillTime" search:"-"`                                             // 充装结束时间
 
 }
 

app/admin/service/dto/fill_gun.go

@@ -8,7 +8,9 @@ import (
 
 type FillGunGetPageReq struct {
 	dto.Pagination `search:"-"`
-	CustomerId     string `form:"customerId" search:"type:contains;column:customer_id;table:address"` // 角色名称
+	GunCode        string `form:"gunCode" search:"type:contains;column:gun_code;table:fill_gun"`          // 充装枪编码
+	ScanGunCode    string `form:"scanGunCode" search:"type:contains;column:scan_gun_code;table:fill_gun"` // 扫描枪编码
+	PersonCode     string `form:"personCode" search:"type:contains;column:person_Code;table:fill_gun"`    // 充装人员编码
 }
 
 func (m *FillGunGetPageReq) GetNeedSearch() interface{} {

app/admin/service/dto/gas_cylinder.go

@@ -6,7 +6,7 @@ import (
 
 type GasCylinderGetPageReq struct {
 	dto.Pagination `search:"-"`
-	InnerCode      string `form:"innerCode" search:"type:contains;column:inner_code;table:dispatch_cost"` // 商品名称
+	InnerCode      string `form:"innerCode" search:"type:contains;column:inner_code;table:gas_cylinder"` // 商品名称
 }
 
 func (m *GasCylinderGetPageReq) GetNeedSearch() interface{} {
@@ -22,7 +22,7 @@ func (s *GasCylinderGetReq) GetInnerCode() interface{} {
 }
 
 type GasCylinderGetByUidReq struct {
-	ChipUid string `json:"chipUid"`
+	ChipUid string `uri:"chipUid"`
 }
 
 func (s *GasCylinderGetByUidReq) GetChipUid() interface{} {

app/admin/service/dto/gas_cylinder_spec.go

@@ -8,7 +8,7 @@ import (
 
 type GasCylinderSpecGetPageReq struct {
 	dto.Pagination `search:"-"`
-	Name           string `form:"name" search:"type:contains;column:name;table:dispatch_cost"` // 商品名称
+	Name           string `form:"name" search:"type:contains;column:name;table:gas_cylinder_spec"` // 商品名称
 }
 
 func (m *GasCylinderSpecGetPageReq) GetNeedSearch() interface{} {

app/admin/service/dto/goods.go

@@ -9,8 +9,8 @@ import (
 type GoodsGetPageReq struct {
 	dto.Pagination `search:"-"`
 	Name           string `form:"name" search:"type:contains;column:name;table:goods"`            // 商品名称
-	MediaType      string `form:"MediaType" search:"type:contains;column:media_type;table:goods"` // 介质类型
-	IsShow         bool   `form:"isShow" search:"type:exact;column:is_show;table:goods"`          // 角色名称
+	MediaType      string `form:"mediaType" search:"type:contains;column:media_type;table:goods"` // 介质类型
+	IsShow         int    `form:"isShow" search:"-"`                                              // 是否展示 1-展示 2-不展示
 }
 
 func (m *GoodsGetPageReq) GetNeedSearch() interface{} {

app/admin/service/fill_data.go

@@ -43,7 +43,7 @@ func FillDataInnerCode(innerCode string) func(db *gorm.DB) *gorm.DB {
 		if len(innerCode) == 0 {
 			return db
 		}
-		return db.Where("JSON_EXTRACT(tb_fill_data, '$.innerCode') like %?% ", innerCode)
+		return db.Where("JSON_EXTRACT(tb_fill_data, '$.innerCode') like ? ", "%"+innerCode+"%")
 	}
 }
 
@@ -53,7 +53,7 @@ func FillDataChipId(chipId string) func(db *gorm.DB) *gorm.DB {
 		if len(chipId) == 0 {
 			return db
 		}
-		return db.Where("JSON_EXTRACT(tb_fill_data, '$.chipId') like %?% ", chipId)
+		return db.Where("JSON_EXTRACT(tb_fill_data, '$.chipId') like ? ", "%"+chipId+"%")
 	}
 }
 
@@ -84,8 +84,9 @@ func (e *FillData) GetPage(c *dto.FillDataGetPageReq, list *[]model.FillData, co
 
 	err = e.Orm.Model(&data).
 		Scopes(
-			FillDataStationId(c.StationId),
-			FillDataUserId(c.UserId),
+			//FillDataStationId(c.StationId),
+			//FillDataUserId(c.UserId),
+			cDto.MakeCondition(c.GetNeedSearch()),
 			FillDataInnerCode(c.InnerCode),
 			FillDataChipId(c.ChipId),
 			FillDataStartFillTime(c.StartFillTime),

app/admin/service/gas_cylinder.go

@@ -67,10 +67,10 @@ func (e *GasCylinder) Get(d *dto.GasCylinderGetReq, data *model.ProvGasCylinder,
 		CheckTime:     data.CheckTime,
 		NextCheckTime: data.NextCheckTime,
 		ProUuid:       data.ProUuid,
-		Uid:           data.Uid,
-		ProductId:     data.ProductId,
-		DeadlineTime:  data.DeadlineTime,
-		CheckInTime:   data.CheckInTime,
+		//Uid:           data.Uid,
+		ProductId:    data.ProductId,
+		DeadlineTime: data.DeadlineTime,
+		CheckInTime:  data.CheckInTime,
 		DeptBy: model2.DeptBy{
 			DeptId: p.DeptId,
 		},
@@ -90,3 +90,62 @@ func (e *GasCylinder) Get(d *dto.GasCylinderGetReq, data *model.ProvGasCylinder,
 
 	return nil
 }
+func (e *GasCylinder) GetByUid(d *dto.GasCylinderGetByUidReq, data *model.ProvGasCylinder, p *actions.DataPermission) error {
+	// TODO 通过省平台获取气瓶详情
+
+	client := resty.New()
+	// 1、通过高频ID查询气瓶内编码
+	var gasCylinder model.GasCylinder
+	err := e.Orm.Where("uid = ?", d.ChipUid).First(&gasCylinder).Error
+	if err != nil {
+		e.Log.Errorf("db error: %s", err)
+		return global.CreateFailedErr
+	}
+
+	resp, err := client.R().Get("https://mock.apifox.com/m2/4037076-0-default/151344663")
+	if err != nil {
+		e.Log.Errorf("db error: %s", err)
+		return global.GetFailedErr
+	}
+	err = json.Unmarshal(resp.Body(), data)
+	if err != nil {
+		e.Log.Errorf("json Unmarshal err: %s", err)
+		return global.GetFailedErr
+	}
+	obj := model.GasCylinder{
+		ProVariety:   data.ProVariety,
+		ProName:      data.ProName,
+		ProNo:        data.ProNo,
+		FillMedia:    data.FillMedia,
+		MakeUnit:     data.MakeUnit,
+		MakeTime:     data.MakeTime,
+		WorkPressure: data.WorkPressure,
+		//InnerCode:     data.InnerCode,
+		Volume:        data.Volume,
+		CheckTime:     data.CheckTime,
+		NextCheckTime: data.NextCheckTime,
+		ProUuid:       data.ProUuid,
+		//Uid:           data.Uid,
+		ProductId:    data.ProductId,
+		DeadlineTime: data.DeadlineTime,
+		CheckInTime:  data.CheckInTime,
+		DeptBy: model2.DeptBy{
+			DeptId: p.DeptId,
+		},
+	}
+	//e.Orm.Create(&obj)
+
+	err = e.Orm.Where("inner_code = ?", gasCylinder.InnerCode).Updates(&obj).Error
+	if err != nil {
+		e.Log.Errorf("db error: %s", err)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return global.GetNotFoundOrNoPermissionErr
+		}
+		return global.GetFailedErr
+	}
+
+	data.InnerCode = gasCylinder.InnerCode
+	data.Uid = gasCylinder.Uid
+
+	return nil
+}

app/admin/service/goods.go

@@ -15,6 +15,19 @@ type Goods struct {
 	service.Service
 }
 
+func GoodsStationIdScopes(isShow int) func(db *gorm.DB) *gorm.DB {
+	return func(db *gorm.DB) *gorm.DB {
+
+		if isShow == 1 {
+			return db.Where("is_show = 1")
+		}
+		if isShow == 2 {
+			return db.Where("is_show = 0")
+		}
+		return db
+	}
+}
+
 // GetPage 获取Goods列表
 func (e *Goods) GetPage(c *dto.GoodsGetPageReq, list *[]model.Goods, count *int64, p *actions.DataPermission) error {
 	var err error
@@ -25,6 +38,7 @@ func (e *Goods) GetPage(c *dto.GoodsGetPageReq, list *[]model.Goods, count *int6
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
+			GoodsStationIdScopes(c.IsShow),
 		).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error

app/admin/service/inspect_record.go

@@ -92,10 +92,27 @@ func (e *InspectRecord) Insert(c *dto.InspectRecordInsertReq) error {
 		}
 
 	}
-	c.UpdateGenerate(&data)
+	c.Generate(&data)
 	// TODO 同步省平台 1.1.1.20 入户安全检查
 	//ipr := data.GenProvInspectRecord()
-	err = tx.Save(&data).Error
+	err = tx.Create(&data).Error
+	if err != nil {
+		e.Log.Errorf("db error: %s", err)
+		return global.UpdateFailedErr
+	}
+
+	// 修改客户入户安全检查状态
+	var CustomerModel model.Customer
+	err = e.Orm.Where("id = ?", c.CreateBy).First(&CustomerModel).Error
+	if err != nil {
+		e.Log.Errorf("db error: %s", err)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return global.UpdateNotFoundOrNoPermissionErr
+		}
+		return global.UpdateFailedErr
+	}
+	CustomerModel.State = data.State
+	err = tx.Save(&CustomerModel).Error
 	if err != nil {
 		e.Log.Errorf("db error: %s", err)
 		return global.UpdateFailedErr
@@ -138,6 +155,23 @@ func (e *InspectRecord) Update(c *dto.InspectRecordInsertReq) error {
 		return global.UpdateFailedErr
 	}
 
+	// 修改客户入户安全检查状态
+	var CustomerModel model.Customer
+	err = e.Orm.Where("id = ?", c.CreateBy).First(&CustomerModel).Error
+	if err != nil {
+		e.Log.Errorf("db error: %s", err)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return global.UpdateNotFoundOrNoPermissionErr
+		}
+		return global.UpdateFailedErr
+	}
+	CustomerModel.State = inspectRecordModel.State
+	err = tx.Save(&CustomerModel).Error
+	if err != nil {
+		e.Log.Errorf("db error: %s", err)
+		return global.UpdateFailedErr
+	}
+
 	c.Id = inspectRecordModel.Id
 
 	return nil

app/admin/service/operation_log.go

@@ -30,6 +30,16 @@ func (e *OperationLog) GetPage(c *dto.OperationLogGetPageReq, list *[]model.Oper
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
 		).
+		Preload("OptUserObj").
+		Preload("ObjectUserObj").
+		Preload("ObjectCustomerObj").
+		Preload("OptCustomerObj").
+		Preload("CompanyObj").
+		Preload("CurrentEnterpriseObj").
+		Preload("CurrentStationObj").
+		Preload("CurrentStoreObj").
+		Preload("CurrentTruckObj").
+		Preload("CurrentAddressObj").
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {
@@ -174,6 +184,18 @@ func (e *OperationLog) Insert(c *dto.OperationLogInsertReq, p *actions.DataPermi
 			// 1、通过高频ID查询气瓶内编码
 			var gasCylinder model.GasCylinder
 			err = tx.Where("uid = ?", chipUid).First(&gasCylinder).Error
+			if err != nil {
+				tx.Rollback()
+				e.Log.Errorf("获取气瓶信息失败: %s", err)
+				return errors.New("获取气瓶信息失败")
+			}
+			var truckUserCarInfo model.TruckUserCarInfo
+			err = tx.Where("prov_user_id = ?", user.ProvUserId).First(&truckUserCarInfo).Error
+			if err != nil {
+				tx.Rollback()
+				e.Log.Errorf("获取车辆信息失败: %s", err)
+				return errors.New("获取车辆信息失败")
+			}
 			operationLog := model.OperationLog{
 				ProvOperationLog: model.ProvOperationLog{
 					InnerCode:         gasCylinder.InnerCode,
@@ -182,6 +204,8 @@ func (e *OperationLog) Insert(c *dto.OperationLogInsertReq, p *actions.DataPermi
 					CompanyId:         user.ProvUser.CmpCode,
 					CurrentEnterprise: user.ProvUser.CmpCode,
 					CurrentStore:      user.ProvUser.CmpCode,
+					CurrentTruck:      user.ProvUserId,
+					CurrentMotor:      truckUserCarInfo.CarNo,
 					OptTime:           time.Now().Format("2006-01-02 15:04:05"),
 				},
 				ControlBy: cModel.ControlBy{
@@ -269,6 +293,9 @@ func InsertOperationLogByOptType26Or36(tx *gorm.DB, OptType string, chipUid stri
 	// 1、通过高频ID查询气瓶内编码
 	var gasCylinder model.GasCylinder
 	err = tx.Where("uid = ?", chipUid).First(&gasCylinder).Error
+	if err != nil {
+		return errors.New("获取气瓶信息失败")
+	}
 
 	operationLog := model.OperationLog{
 		ProvOperationLog: model.ProvOperationLog{
@@ -352,7 +379,7 @@ func (e *OperationLog) ListByUid(InnerCode string, list *[]model.OperationLog) e
 		Preload("CurrentStoreObj").
 		Preload("CurrentTruckObj").
 		Preload("CurrentAddressObj").
-		Find(list).Error
+		Find(list).Order("opt_time").Error
 	if err != nil {
 		e.Log.Errorf("db error: %s", err)
 		return global.GetFailedErr

app/admin/service/order.go

@@ -306,7 +306,7 @@ func (e *Order) UpdateState(c *dto.OrderUpdateStateReq, p *actions.DataPermissio
 		}
 	}
 
-	err = e.Orm.Save(&orderModel).Error
+	err = e.Orm.Model(&orderModel).Updates(&orderModel).Error
 	if err != nil {
 		e.Log.Errorf("db error: %s", err)
 		return global.UpdateFailedErr

app/admin/service/store.go

@@ -288,6 +288,7 @@ func (e *Store) StorePageCall(deptList *[]model.SysDept, menu model.SysDept) mod
 		mi.Status = list[j].Status
 		mi.CreatedAt = list[j].CreatedAt
 		mi.ProvStore = list[j].ProvStore
+		mi.CmpCode = list[j].CmpCode
 		mi.Children = []model.SysDept{}
 		ms := e.StorePageCall(deptList, mi)
 		min = append(min, ms)

app/admin/service/sys_user.go

@@ -76,7 +76,7 @@ func (e *SysUser) GetDeliveryPage(c *dto.SysUserGetDeliveryPageReq, p *actions.D
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.UserPermission(data.TableName(), p),
-		).Where("JSON_EXTRACT(prov_user, '$.userType') = 3 JSONand JSON_EXTRACT(prov_user, '$.isorders') = 0").
+		).Where("JSON_EXTRACT(prov_user, '$.userType') = 3 and JSON_EXTRACT(prov_user, '$.isorders') = 0").
 		Find(&userList).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {

common/model/byat.go

@@ -49,6 +49,12 @@ type Time time.Time
 
 func (t Time) MarshalJSON() ([]byte, error) {
 	b := make([]byte, 0, len(timeFormat)+2)
+	if time.Time(t).IsZero() {
+		b = append(b, '"')
+		b = append(b, '"')
+		return b, nil
+	}
+
 	b = append(b, '"')
 	b = time.Time(t).AppendFormat(b, timeFormat)
 	b = append(b, '"')
@@ -62,6 +68,9 @@ func (t *Time) UnmarshalJSON(data []byte) (err error) {
 }
 
 func (t Time) String() string {
+	if time.Time(t).IsZero() {
+		return ""
+	}
 	return time.Time(t).Format(timeFormat)
 }
 

ssh/swag.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+#swag i -g init_router.go -dir app/admin/router --instanceName admin --parseDependency -o docs/admin
+swag init --parseDependency --parseDepth=6