feature(设备附加费): 设备附加费接口实现

handler/instrument_surcharge.go

@@ -0,0 +1,81 @@
+package handler
+
+import (
+	"context"
+	"dashoo.cn/common_definition/comm_def"
+	"dashoo.cn/micro_libary/micro_srv"
+	"dashoo.cn/micro_libary/myerrors"
+	"github.com/gogf/gf/frame/g"
+	"lims_adapter/model"
+	selfModel "lims_adapter/model/equipment"
+	service "lims_adapter/service/instrument_surcharge"
+)
+
+// 设备附加费
+type InstrumentSurchargeController struct{}
+
+// 设备附加费列表
+func (a *InstrumentSurchargeController) InstrumentSurchargeList(ctx context.Context, req *model.ListReq, rsp *comm_def.CommonMsg) error {
+	tenant, err := micro_srv.GetTenant(ctx)
+	if err != nil {
+		return err
+	}
+	g.Log().Info("Received InstrumentSurchargeController.InstrumentSurchargeList request @ " + tenant)
+	if req.Current < 0 {
+		req.Current = DefaultPageCurrent
+	}
+
+	var list, errors = service.NewService(tenant).List(*req)
+	_, err, code, msg := myerrors.CheckError(errors)
+	if err != nil {
+		return err
+	}
+
+	rsp.Code = code
+	rsp.Msg = msg
+	rsp.Data = g.Map{"list": list}
+	return nil
+}
+
+// 设备附加费 保存
+func (a *InstrumentSurchargeController) SaveInstrumentSurcharge(ctx context.Context, req *selfModel.InstrumentSurchargeSaveReq, rsp *comm_def.CommonMsg) error {
+	tenant, err := micro_srv.GetTenant(ctx)
+	if err != nil {
+		return err
+	}
+	user, err := micro_srv.GetUserInfo(ctx)
+	if err != nil {
+		return err
+	}
+	g.Log().Info("Received InstrumentSurchargeController.SaveInstrumentSurcharge request @ " + tenant)
+
+	var errors = service.NewService(tenant).Save(*req, user)
+	_, err, code, msg := myerrors.CheckError(errors)
+	if err != nil {
+		return err
+	}
+
+	rsp.Code = code
+	rsp.Msg = msg
+	return nil
+}
+
+// 设备附加费 删除
+func (a *InstrumentSurchargeController) DeleteInstrumentSurcharge(ctx context.Context, req *selfModel.InstrumentSurchargeDeleteReq, rsp *comm_def.CommonMsg) error {
+	tenant, err := micro_srv.GetTenant(ctx)
+	if err != nil {
+		return err
+	}
+
+	g.Log().Info("Received InstrumentSurchargeController.DeleteInstrumentSurcharge request @ " + tenant)
+
+	var errors = service.NewService(tenant).Delete(*req)
+	_, err, code, msg := myerrors.CheckError(errors)
+	if err != nil {
+		return err
+	}
+
+	rsp.Code = code
+	rsp.Msg = msg
+	return nil
+}

main.go

@@ -27,6 +27,7 @@ func main() {
 	s.RegisterName("SettleAccountBill", new(handler.SettleAccountBillController), "")
 	s.RegisterName("SettleAccountMain", new(handler.SettleAccountMainController), "")
 	s.RegisterName("SettleAccountDetail", new(handler.SettleAccountDetailController), "")
+	s.RegisterName("InstrumentSurcharge", new(handler.InstrumentSurchargeController), "")
 	// 注册auth处理
 	s.AuthFunc = handleAuth
 	// 运行服务

model/equipment/instrument_surcharge.go

@@ -10,3 +10,15 @@ import (
 
 // InstrumentSurcharge is the golang structure for table instrument_surcharge.
 type InstrumentSurcharge internal2.InstrumentSurcharge
+
+type InstrumentSurchargeReq struct {
+	InstrumentId  int `json:"instrumentId"`
+}
+
+type InstrumentSurchargeSaveReq struct {
+	Entity InstrumentSurcharge `json:"entity"`
+}
+
+type InstrumentSurchargeDeleteReq struct {
+	Id  int `json:"id"`
+}

service/instrument_surcharge/instrument_surcharge.go

@@ -0,0 +1,78 @@
+package instrument_surcharge
+
+import (
+	"dashoo.cn/micro_libary/request"
+	"database/sql"
+	"fmt"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/util/gconv"
+	"lims_adapter/dao/equipment"
+	"lims_adapter/model"
+	selfModel "lims_adapter/model/equipment"
+)
+
+// Service 会议室服务
+type Service struct {
+	Dao    *equipment.InstrumentSurchargeDao
+	Tenant string
+}
+
+// NewSrv 服务初始化
+func NewService(tenant string) Service {
+	return Service{Dao: equipment.NewInstrumentSurchargeDao(tenant), Tenant: tenant}
+}
+
+// List 获取数据列表
+func (s Service) List(req model.ListReq) ([]selfModel.InstrumentSurcharge, error) {
+	entityModel := s.Dao.M
+	where := "1=1"
+
+	if req.Entity != nil {
+		entity := new(selfModel.InstrumentSurchargeReq)
+		err := gconv.Struct(req.Entity, entity)
+		if err != nil {
+			return nil, err
+		}
+		if entity.InstrumentId != 0 {
+			where += fmt.Sprintf(" AND InstrumentId='%v'", entity.InstrumentId)
+		}
+	}
+	entityModel = entityModel.Where(where)
+
+	res, err := entityModel.Fields("instrument_surcharge.*").FindAll()
+	if err != nil {
+		return nil, err
+	}
+
+	list := make([]selfModel.InstrumentSurcharge, 0)
+
+	err = res.Structs(&list)
+	if err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+
+	return list, nil
+}
+
+// 保存
+func (s Service) Save(req selfModel.InstrumentSurchargeSaveReq, user request.UserInfo) error {
+	now := gtime.Now() // 获取当前时间
+
+	if req.Entity.Id == 0 {
+		req.Entity.CreateUserId = int(user.Id)
+		req.Entity.CreateBy = user.RealName
+		req.Entity.CreateOn = now
+	}
+	req.Entity.UpdateUserId = int(user.Id)
+	req.Entity.UpdateBy = user.RealName
+	req.Entity.UpdateOn = now
+
+	_, err := s.Dao.M.Save(req.Entity)
+	return err
+}
+
+// 删除
+func (s Service) Delete(req selfModel.InstrumentSurchargeDeleteReq) error {
+	_, err := s.Dao.M.Delete(fmt.Sprintf("Id='%v'", req.Id))
+	return err
+}

service/settle_account_detail/settle_account_detail.go

@@ -56,4 +56,4 @@ func (s Service) List(req model.ListReq) ([]accountModel.SettleAccountDetail, er
 	}
 
 	return list, nil
-}
+}

service/settle_account_main/settle_account_main.go

@@ -92,6 +92,7 @@ func (s Service) List(req model.ListReq) ([]accountModel.SettleAccountMain, int,
 
 	return list, total, nil
 }
+
 // 新增
 func (s Service) Add(req accountModel.AccountMainAddReq, user request.UserInfo) error {
 	now := gtime.Now() // 获取当前时间
@@ -134,7 +135,6 @@ func (s Service) Add(req accountModel.AccountMainAddReq, user request.UserInfo)
 	return tx.Commit()
 }
 
-
 // 确认
 func (s Service) Confirm(req accountModel.AccountMainConfirmReq, user request.UserInfo) error {
 	if req.MainId == 0 {