3
2
Ver Fonte

bug修改及后端添加

huahaiyan há 6 anos atrás
pai
commit
228f54372d
20 ficheiros alterados com 825 adições e 6 exclusões
  1. 47 0
      src/dashoo.cn/backend/api/business/limsreportalercarbon/limsreportalercarbon.go
  2. 70 0
      src/dashoo.cn/backend/api/business/limsreportalercarbon/limsreportalercarbonSessionService.go
  3. 47 0
      src/dashoo.cn/backend/api/business/limsreportalerfhgas/limsreportalerfhgas.go
  4. 70 0
      src/dashoo.cn/backend/api/business/limsreportalerfhgas/limsreportalerfhgasSessionService.go
  5. 47 0
      src/dashoo.cn/backend/api/business/limsreportalerkrgas/limsreportalerkrgas.go
  6. 70 0
      src/dashoo.cn/backend/api/business/limsreportalerkrgas/limsreportalerkrgasSessionService.go
  7. 47 0
      src/dashoo.cn/backend/api/business/limsreportanal1carbonredgas/limsreportanal1carbonredgas.go
  8. 70 0
      src/dashoo.cn/backend/api/business/limsreportanal1carbonredgas/limsreportanal1carbonredgasSessionService.go
  9. 47 0
      src/dashoo.cn/backend/api/business/limsreportanal2carbonredgas/limsreportanal2carbonredgas.go
  10. 70 0
      src/dashoo.cn/backend/api/business/limsreportanal2carbonredgas/limsreportanal2carbonredgasSessionService.go
  11. 47 0
      src/dashoo.cn/backend/api/business/limsreportdetHSgas/limsreportdetHSgas.go
  12. 70 0
      src/dashoo.cn/backend/api/business/limsreportdetHSgas/limsreportdetHSgasSessionService.go
  13. 47 0
      src/dashoo.cn/backend/api/business/limsreportdetelectoxygen/limsreportdetelectoxygen.go
  14. 70 0
      src/dashoo.cn/backend/api/business/limsreportdetelectoxygen/limsreportdetelectoxygenSessionService.go
  15. 1 1
      src/dashoo.cn/backend/api/business/limsreportelecpumpwell/limsreportelecpumpwellService.go
  16. 1 1
      src/dashoo.cn/backend/api/business/limsreportliquidtransportation/limsreportliquidtransportationService.go
  17. 1 1
      src/dashoo.cn/backend/api/business/limsreportmotor/limsreportmotorService.go
  18. 1 1
      src/dashoo.cn/backend/api/business/limsreportpistonpumpunit/limsreportpistonpumpunitService.go
  19. 1 1
      src/dashoo.cn/backend/api/business/limsreportscrewpump/limsreportscrewpumpService.go
  20. 1 1
      src/dashoo.cn/backend/api/business/limsreportspecialfield/limsreportspecialfieldService.go

+ 47 - 0
src/dashoo.cn/backend/api/business/limsreportalercarbon/limsreportalercarbon.go

@@ -0,0 +1,47 @@
+package limsreportben
+
+import (
+	"time"
+)
+
+type LimsReportBenModel struct {
+	Id                 int       `xorm:"not null pk autoincr INT(10)"`
+	EId                int       `xorm:"comment('委托单ID') INT(10)"`
+	TaskBalanceId      int       `xorm:"comment('任务分配表ID') INT(10)"`
+	DataEntryId        int       `xorm:"comment('数据记录表ID') INT(10)"`
+	MeterRange         string    `xorm:"comment('量程(*10-6mol/mol)') VARCHAR(255)"`
+	MeasurementRange   string    `xorm:"comment('测量范围(*10-6mol/mol)') VARCHAR(255)"`
+	DetectBasis        string    `xorm:"comment('检测依据') VARCHAR(500)"`
+	FaceCheck          string    `xorm:"comment('外观及结构') VARCHAR(50)"`
+	FlagCheck          string    `xorm:"comment('标志标识') VARCHAR(50)"`
+	ElectrifyCheck     string    `xorm:"comment('通电检查') VARCHAR(50)"`
+	Insulation         string    `xorm:"comment('绝缘电阻') VARCHAR(50)"`
+	RelativeHumanity   string    `xorm:"comment('相对湿度') VARCHAR(50)"`
+	ManuCompany        string    `xorm:"comment('制造单位') VARCHAR(255)"`
+	Spec               string    `xorm:"comment('规格/型号') VARCHAR(255)"`
+	FactoryNum         string    `xorm:"comment('出厂编号') VARCHAR(255)"`
+	AudibleAlarm       string    `xorm:"comment('声光报警') VARCHAR(255)"`
+	AlarmConcentration string    `xorm:"comment('报警浓度值') VARCHAR(255)"`
+	InstrumentLevel    string    `xorm:"comment('仪器等级') VARCHAR(255)"`
+	DielecStrength     string    `xorm:"comment('绝缘强度') VARCHAR(255)"`
+	TestDepartId       int       `xorm:"INT(11)"`      //受检单位
+	TestDepart         string    `xorm:"VARCHAR(100)"` //受检单位
+	PositionCheckId    int       `xorm:"INT(11)"`      //检测地点
+	PositionCheck      string    `xorm:"VARCHAR(100)"`
+	Instrument1        string    `xorm:"VARCHAR(255)"` //设备1
+	Instrument2        string    `xorm:"VARCHAR(255)"`
+	Instrument3        string    `xorm:"VARCHAR(255)"`
+	Temperature        string    `xorm:"VARCHAR(50)"`
+	StandardDesc       string    `xorm:"VARCHAR(500)"`
+	CustomerId         int       `xorm:"INT(10)"`
+	CustomerName       string    `xorm:VARCHAR(50)`
+	CheckDate          time.Time `xorm:"DATETIME"`
+	Remark             string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId       int       `xorm:"INT(11)"`
+	CreateOn           time.Time `xorm:"DATETIME"`
+	CreateBy           string    `xorm:"VARCHAR(50)"`
+	ModifiedOn         time.Time `xorm:"DATETIME"`
+	ModifiedUserId     int       `xorm:"INT(11)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
+}
+

+ 70 - 0
src/dashoo.cn/backend/api/business/limsreportalercarbon/limsreportalercarbonSessionService.go

@@ -0,0 +1,70 @@
+package limsreportben
+
+import (
+	"dashoo.cn/backend/api/business/limsreportalertor"
+	"fmt"
+	"strconv"
+
+	. "dashoo.cn/backend/api/mydb"
+	. "dashoo.cn/utils/db"
+	"dashoo.cn/utils"
+	"github.com/go-xorm/xorm"
+)
+
+type LimsReportBenSessionService struct {
+	MySessionBase
+}
+
+func GetLimsReportBenSessionService(xormEngine *xorm.Session) *LimsReportBenSessionService {
+	s := new(LimsReportBenSessionService)
+	s.Session = xormEngine
+	return s
+}
+
+//获取ben信息
+func (s *LimsReportBenSessionService) GetAllPagingEntitiesWithOrderBytbl(tblbalance string, tblentry string, pageIndex, itemsPerPage int64, order, where string) (int64, []LimsReportBenModel) {
+	var err error
+	var total int64
+	if order != "" {
+		order = " order by " + order
+	}
+	//获取总记录数
+	if where == "" {
+		where = "1=1"
+	}
+	sqlCount := " select count(*) from " + tblentry + " a  left join " + tblbalance + " b on a.DocId = b.DataDocId where " + where
+	var sql string
+	sql = ` select a.Id,a.DocKey,a.DocAddress,a.CheckStatus,a.DocId,a.DocType,b.* from 
+	` + tblentry + ` a left join ` + tblbalance + ` b on a.DocId = b.DataDocId where ` + where + order + `
+		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
+	fmt.Println(sql)
+	List := make([]LimsReportBenModel, 0)
+	utils.DBE.Sql(sql).Find(&List)
+	resultsSlice, err := s.Session.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}
+
+
+//获取信息
+func (s *LimsReportBenSessionService) GetEntityByOrderbyWhereMain(tbldataentry, tblalertor, order, dataentryid string) (entity limsreportalertor.LimsAlertorMainModel) {
+	if order != "" {
+		order = " order by " + order
+	}
+	where := "a.Id = "+dataentryid
+	var sql string
+	sql = ` select a.*,b.* from 
+	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
+	fmt.Println(sql)
+	s.Session.Sql(sql).Get(&entity)
+	return
+}
+

+ 47 - 0
src/dashoo.cn/backend/api/business/limsreportalerfhgas/limsreportalerfhgas.go

@@ -0,0 +1,47 @@
+package limsreportben
+
+import (
+	"time"
+)
+
+type LimsReportBenModel struct {
+	Id                 int       `xorm:"not null pk autoincr INT(10)"`
+	EId                int       `xorm:"comment('委托单ID') INT(10)"`
+	TaskBalanceId      int       `xorm:"comment('任务分配表ID') INT(10)"`
+	DataEntryId        int       `xorm:"comment('数据记录表ID') INT(10)"`
+	MeterRange         string    `xorm:"comment('量程(*10-6mol/mol)') VARCHAR(255)"`
+	MeasurementRange   string    `xorm:"comment('测量范围(*10-6mol/mol)') VARCHAR(255)"`
+	DetectBasis        string    `xorm:"comment('检测依据') VARCHAR(500)"`
+	FaceCheck          string    `xorm:"comment('外观及结构') VARCHAR(50)"`
+	FlagCheck          string    `xorm:"comment('标志标识') VARCHAR(50)"`
+	ElectrifyCheck     string    `xorm:"comment('通电检查') VARCHAR(50)"`
+	Insulation         string    `xorm:"comment('绝缘电阻') VARCHAR(50)"`
+	RelativeHumanity   string    `xorm:"comment('相对湿度') VARCHAR(50)"`
+	ManuCompany        string    `xorm:"comment('制造单位') VARCHAR(255)"`
+	Spec               string    `xorm:"comment('规格/型号') VARCHAR(255)"`
+	FactoryNum         string    `xorm:"comment('出厂编号') VARCHAR(255)"`
+	AudibleAlarm       string    `xorm:"comment('声光报警') VARCHAR(255)"`
+	AlarmConcentration string    `xorm:"comment('报警浓度值') VARCHAR(255)"`
+	InstrumentLevel    string    `xorm:"comment('仪器等级') VARCHAR(255)"`
+	DielecStrength     string    `xorm:"comment('绝缘强度') VARCHAR(255)"`
+	TestDepartId       int       `xorm:"INT(11)"`      //受检单位
+	TestDepart         string    `xorm:"VARCHAR(100)"` //受检单位
+	PositionCheckId    int       `xorm:"INT(11)"`      //检测地点
+	PositionCheck      string    `xorm:"VARCHAR(100)"`
+	Instrument1        string    `xorm:"VARCHAR(255)"` //设备1
+	Instrument2        string    `xorm:"VARCHAR(255)"`
+	Instrument3        string    `xorm:"VARCHAR(255)"`
+	Temperature        string    `xorm:"VARCHAR(50)"`
+	StandardDesc       string    `xorm:"VARCHAR(500)"`
+	CustomerId         int       `xorm:"INT(10)"`
+	CustomerName       string    `xorm:VARCHAR(50)`
+	CheckDate          time.Time `xorm:"DATETIME"`
+	Remark             string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId       int       `xorm:"INT(11)"`
+	CreateOn           time.Time `xorm:"DATETIME"`
+	CreateBy           string    `xorm:"VARCHAR(50)"`
+	ModifiedOn         time.Time `xorm:"DATETIME"`
+	ModifiedUserId     int       `xorm:"INT(11)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
+}
+

+ 70 - 0
src/dashoo.cn/backend/api/business/limsreportalerfhgas/limsreportalerfhgasSessionService.go

@@ -0,0 +1,70 @@
+package limsreportben
+
+import (
+	"dashoo.cn/backend/api/business/limsreportalertor"
+	"fmt"
+	"strconv"
+
+	. "dashoo.cn/backend/api/mydb"
+	. "dashoo.cn/utils/db"
+	"dashoo.cn/utils"
+	"github.com/go-xorm/xorm"
+)
+
+type LimsReportBenSessionService struct {
+	MySessionBase
+}
+
+func GetLimsReportBenSessionService(xormEngine *xorm.Session) *LimsReportBenSessionService {
+	s := new(LimsReportBenSessionService)
+	s.Session = xormEngine
+	return s
+}
+
+//获取ben信息
+func (s *LimsReportBenSessionService) GetAllPagingEntitiesWithOrderBytbl(tblbalance string, tblentry string, pageIndex, itemsPerPage int64, order, where string) (int64, []LimsReportBenModel) {
+	var err error
+	var total int64
+	if order != "" {
+		order = " order by " + order
+	}
+	//获取总记录数
+	if where == "" {
+		where = "1=1"
+	}
+	sqlCount := " select count(*) from " + tblentry + " a  left join " + tblbalance + " b on a.DocId = b.DataDocId where " + where
+	var sql string
+	sql = ` select a.Id,a.DocKey,a.DocAddress,a.CheckStatus,a.DocId,a.DocType,b.* from 
+	` + tblentry + ` a left join ` + tblbalance + ` b on a.DocId = b.DataDocId where ` + where + order + `
+		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
+	fmt.Println(sql)
+	List := make([]LimsReportBenModel, 0)
+	utils.DBE.Sql(sql).Find(&List)
+	resultsSlice, err := s.Session.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}
+
+
+//获取信息
+func (s *LimsReportBenSessionService) GetEntityByOrderbyWhereMain(tbldataentry, tblalertor, order, dataentryid string) (entity limsreportalertor.LimsAlertorMainModel) {
+	if order != "" {
+		order = " order by " + order
+	}
+	where := "a.Id = "+dataentryid
+	var sql string
+	sql = ` select a.*,b.* from 
+	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
+	fmt.Println(sql)
+	s.Session.Sql(sql).Get(&entity)
+	return
+}
+

+ 47 - 0
src/dashoo.cn/backend/api/business/limsreportalerkrgas/limsreportalerkrgas.go

@@ -0,0 +1,47 @@
+package limsreportben
+
+import (
+	"time"
+)
+
+type LimsReportBenModel struct {
+	Id                 int       `xorm:"not null pk autoincr INT(10)"`
+	EId                int       `xorm:"comment('委托单ID') INT(10)"`
+	TaskBalanceId      int       `xorm:"comment('任务分配表ID') INT(10)"`
+	DataEntryId        int       `xorm:"comment('数据记录表ID') INT(10)"`
+	MeterRange         string    `xorm:"comment('量程(*10-6mol/mol)') VARCHAR(255)"`
+	MeasurementRange   string    `xorm:"comment('测量范围(*10-6mol/mol)') VARCHAR(255)"`
+	DetectBasis        string    `xorm:"comment('检测依据') VARCHAR(500)"`
+	FaceCheck          string    `xorm:"comment('外观及结构') VARCHAR(50)"`
+	FlagCheck          string    `xorm:"comment('标志标识') VARCHAR(50)"`
+	ElectrifyCheck     string    `xorm:"comment('通电检查') VARCHAR(50)"`
+	Insulation         string    `xorm:"comment('绝缘电阻') VARCHAR(50)"`
+	RelativeHumanity   string    `xorm:"comment('相对湿度') VARCHAR(50)"`
+	ManuCompany        string    `xorm:"comment('制造单位') VARCHAR(255)"`
+	Spec               string    `xorm:"comment('规格/型号') VARCHAR(255)"`
+	FactoryNum         string    `xorm:"comment('出厂编号') VARCHAR(255)"`
+	AudibleAlarm       string    `xorm:"comment('声光报警') VARCHAR(255)"`
+	AlarmConcentration string    `xorm:"comment('报警浓度值') VARCHAR(255)"`
+	InstrumentLevel    string    `xorm:"comment('仪器等级') VARCHAR(255)"`
+	DielecStrength     string    `xorm:"comment('绝缘强度') VARCHAR(255)"`
+	TestDepartId       int       `xorm:"INT(11)"`      //受检单位
+	TestDepart         string    `xorm:"VARCHAR(100)"` //受检单位
+	PositionCheckId    int       `xorm:"INT(11)"`      //检测地点
+	PositionCheck      string    `xorm:"VARCHAR(100)"`
+	Instrument1        string    `xorm:"VARCHAR(255)"` //设备1
+	Instrument2        string    `xorm:"VARCHAR(255)"`
+	Instrument3        string    `xorm:"VARCHAR(255)"`
+	Temperature        string    `xorm:"VARCHAR(50)"`
+	StandardDesc       string    `xorm:"VARCHAR(500)"`
+	CustomerId         int       `xorm:"INT(10)"`
+	CustomerName       string    `xorm:VARCHAR(50)`
+	CheckDate          time.Time `xorm:"DATETIME"`
+	Remark             string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId       int       `xorm:"INT(11)"`
+	CreateOn           time.Time `xorm:"DATETIME"`
+	CreateBy           string    `xorm:"VARCHAR(50)"`
+	ModifiedOn         time.Time `xorm:"DATETIME"`
+	ModifiedUserId     int       `xorm:"INT(11)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
+}
+

+ 70 - 0
src/dashoo.cn/backend/api/business/limsreportalerkrgas/limsreportalerkrgasSessionService.go

@@ -0,0 +1,70 @@
+package limsreportben
+
+import (
+	"dashoo.cn/backend/api/business/limsreportalertor"
+	"fmt"
+	"strconv"
+
+	. "dashoo.cn/backend/api/mydb"
+	. "dashoo.cn/utils/db"
+	"dashoo.cn/utils"
+	"github.com/go-xorm/xorm"
+)
+
+type LimsReportBenSessionService struct {
+	MySessionBase
+}
+
+func GetLimsReportBenSessionService(xormEngine *xorm.Session) *LimsReportBenSessionService {
+	s := new(LimsReportBenSessionService)
+	s.Session = xormEngine
+	return s
+}
+
+//获取ben信息
+func (s *LimsReportBenSessionService) GetAllPagingEntitiesWithOrderBytbl(tblbalance string, tblentry string, pageIndex, itemsPerPage int64, order, where string) (int64, []LimsReportBenModel) {
+	var err error
+	var total int64
+	if order != "" {
+		order = " order by " + order
+	}
+	//获取总记录数
+	if where == "" {
+		where = "1=1"
+	}
+	sqlCount := " select count(*) from " + tblentry + " a  left join " + tblbalance + " b on a.DocId = b.DataDocId where " + where
+	var sql string
+	sql = ` select a.Id,a.DocKey,a.DocAddress,a.CheckStatus,a.DocId,a.DocType,b.* from 
+	` + tblentry + ` a left join ` + tblbalance + ` b on a.DocId = b.DataDocId where ` + where + order + `
+		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
+	fmt.Println(sql)
+	List := make([]LimsReportBenModel, 0)
+	utils.DBE.Sql(sql).Find(&List)
+	resultsSlice, err := s.Session.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}
+
+
+//获取信息
+func (s *LimsReportBenSessionService) GetEntityByOrderbyWhereMain(tbldataentry, tblalertor, order, dataentryid string) (entity limsreportalertor.LimsAlertorMainModel) {
+	if order != "" {
+		order = " order by " + order
+	}
+	where := "a.Id = "+dataentryid
+	var sql string
+	sql = ` select a.*,b.* from 
+	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
+	fmt.Println(sql)
+	s.Session.Sql(sql).Get(&entity)
+	return
+}
+

+ 47 - 0
src/dashoo.cn/backend/api/business/limsreportanal1carbonredgas/limsreportanal1carbonredgas.go

@@ -0,0 +1,47 @@
+package limsreportben
+
+import (
+	"time"
+)
+
+type LimsReportBenModel struct {
+	Id                 int       `xorm:"not null pk autoincr INT(10)"`
+	EId                int       `xorm:"comment('委托单ID') INT(10)"`
+	TaskBalanceId      int       `xorm:"comment('任务分配表ID') INT(10)"`
+	DataEntryId        int       `xorm:"comment('数据记录表ID') INT(10)"`
+	MeterRange         string    `xorm:"comment('量程(*10-6mol/mol)') VARCHAR(255)"`
+	MeasurementRange   string    `xorm:"comment('测量范围(*10-6mol/mol)') VARCHAR(255)"`
+	DetectBasis        string    `xorm:"comment('检测依据') VARCHAR(500)"`
+	FaceCheck          string    `xorm:"comment('外观及结构') VARCHAR(50)"`
+	FlagCheck          string    `xorm:"comment('标志标识') VARCHAR(50)"`
+	ElectrifyCheck     string    `xorm:"comment('通电检查') VARCHAR(50)"`
+	Insulation         string    `xorm:"comment('绝缘电阻') VARCHAR(50)"`
+	RelativeHumanity   string    `xorm:"comment('相对湿度') VARCHAR(50)"`
+	ManuCompany        string    `xorm:"comment('制造单位') VARCHAR(255)"`
+	Spec               string    `xorm:"comment('规格/型号') VARCHAR(255)"`
+	FactoryNum         string    `xorm:"comment('出厂编号') VARCHAR(255)"`
+	AudibleAlarm       string    `xorm:"comment('声光报警') VARCHAR(255)"`
+	AlarmConcentration string    `xorm:"comment('报警浓度值') VARCHAR(255)"`
+	InstrumentLevel    string    `xorm:"comment('仪器等级') VARCHAR(255)"`
+	DielecStrength     string    `xorm:"comment('绝缘强度') VARCHAR(255)"`
+	TestDepartId       int       `xorm:"INT(11)"`      //受检单位
+	TestDepart         string    `xorm:"VARCHAR(100)"` //受检单位
+	PositionCheckId    int       `xorm:"INT(11)"`      //检测地点
+	PositionCheck      string    `xorm:"VARCHAR(100)"`
+	Instrument1        string    `xorm:"VARCHAR(255)"` //设备1
+	Instrument2        string    `xorm:"VARCHAR(255)"`
+	Instrument3        string    `xorm:"VARCHAR(255)"`
+	Temperature        string    `xorm:"VARCHAR(50)"`
+	StandardDesc       string    `xorm:"VARCHAR(500)"`
+	CustomerId         int       `xorm:"INT(10)"`
+	CustomerName       string    `xorm:VARCHAR(50)`
+	CheckDate          time.Time `xorm:"DATETIME"`
+	Remark             string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId       int       `xorm:"INT(11)"`
+	CreateOn           time.Time `xorm:"DATETIME"`
+	CreateBy           string    `xorm:"VARCHAR(50)"`
+	ModifiedOn         time.Time `xorm:"DATETIME"`
+	ModifiedUserId     int       `xorm:"INT(11)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
+}
+

+ 70 - 0
src/dashoo.cn/backend/api/business/limsreportanal1carbonredgas/limsreportanal1carbonredgasSessionService.go

@@ -0,0 +1,70 @@
+package limsreportben
+
+import (
+	"dashoo.cn/backend/api/business/limsreportalertor"
+	"fmt"
+	"strconv"
+
+	. "dashoo.cn/backend/api/mydb"
+	. "dashoo.cn/utils/db"
+	"dashoo.cn/utils"
+	"github.com/go-xorm/xorm"
+)
+
+type LimsReportBenSessionService struct {
+	MySessionBase
+}
+
+func GetLimsReportBenSessionService(xormEngine *xorm.Session) *LimsReportBenSessionService {
+	s := new(LimsReportBenSessionService)
+	s.Session = xormEngine
+	return s
+}
+
+//获取ben信息
+func (s *LimsReportBenSessionService) GetAllPagingEntitiesWithOrderBytbl(tblbalance string, tblentry string, pageIndex, itemsPerPage int64, order, where string) (int64, []LimsReportBenModel) {
+	var err error
+	var total int64
+	if order != "" {
+		order = " order by " + order
+	}
+	//获取总记录数
+	if where == "" {
+		where = "1=1"
+	}
+	sqlCount := " select count(*) from " + tblentry + " a  left join " + tblbalance + " b on a.DocId = b.DataDocId where " + where
+	var sql string
+	sql = ` select a.Id,a.DocKey,a.DocAddress,a.CheckStatus,a.DocId,a.DocType,b.* from 
+	` + tblentry + ` a left join ` + tblbalance + ` b on a.DocId = b.DataDocId where ` + where + order + `
+		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
+	fmt.Println(sql)
+	List := make([]LimsReportBenModel, 0)
+	utils.DBE.Sql(sql).Find(&List)
+	resultsSlice, err := s.Session.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}
+
+
+//获取信息
+func (s *LimsReportBenSessionService) GetEntityByOrderbyWhereMain(tbldataentry, tblalertor, order, dataentryid string) (entity limsreportalertor.LimsAlertorMainModel) {
+	if order != "" {
+		order = " order by " + order
+	}
+	where := "a.Id = "+dataentryid
+	var sql string
+	sql = ` select a.*,b.* from 
+	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
+	fmt.Println(sql)
+	s.Session.Sql(sql).Get(&entity)
+	return
+}
+

+ 47 - 0
src/dashoo.cn/backend/api/business/limsreportanal2carbonredgas/limsreportanal2carbonredgas.go

@@ -0,0 +1,47 @@
+package limsreportben
+
+import (
+	"time"
+)
+
+type LimsReportBenModel struct {
+	Id                 int       `xorm:"not null pk autoincr INT(10)"`
+	EId                int       `xorm:"comment('委托单ID') INT(10)"`
+	TaskBalanceId      int       `xorm:"comment('任务分配表ID') INT(10)"`
+	DataEntryId        int       `xorm:"comment('数据记录表ID') INT(10)"`
+	MeterRange         string    `xorm:"comment('量程(*10-6mol/mol)') VARCHAR(255)"`
+	MeasurementRange   string    `xorm:"comment('测量范围(*10-6mol/mol)') VARCHAR(255)"`
+	DetectBasis        string    `xorm:"comment('检测依据') VARCHAR(500)"`
+	FaceCheck          string    `xorm:"comment('外观及结构') VARCHAR(50)"`
+	FlagCheck          string    `xorm:"comment('标志标识') VARCHAR(50)"`
+	ElectrifyCheck     string    `xorm:"comment('通电检查') VARCHAR(50)"`
+	Insulation         string    `xorm:"comment('绝缘电阻') VARCHAR(50)"`
+	RelativeHumanity   string    `xorm:"comment('相对湿度') VARCHAR(50)"`
+	ManuCompany        string    `xorm:"comment('制造单位') VARCHAR(255)"`
+	Spec               string    `xorm:"comment('规格/型号') VARCHAR(255)"`
+	FactoryNum         string    `xorm:"comment('出厂编号') VARCHAR(255)"`
+	AudibleAlarm       string    `xorm:"comment('声光报警') VARCHAR(255)"`
+	AlarmConcentration string    `xorm:"comment('报警浓度值') VARCHAR(255)"`
+	InstrumentLevel    string    `xorm:"comment('仪器等级') VARCHAR(255)"`
+	DielecStrength     string    `xorm:"comment('绝缘强度') VARCHAR(255)"`
+	TestDepartId       int       `xorm:"INT(11)"`      //受检单位
+	TestDepart         string    `xorm:"VARCHAR(100)"` //受检单位
+	PositionCheckId    int       `xorm:"INT(11)"`      //检测地点
+	PositionCheck      string    `xorm:"VARCHAR(100)"`
+	Instrument1        string    `xorm:"VARCHAR(255)"` //设备1
+	Instrument2        string    `xorm:"VARCHAR(255)"`
+	Instrument3        string    `xorm:"VARCHAR(255)"`
+	Temperature        string    `xorm:"VARCHAR(50)"`
+	StandardDesc       string    `xorm:"VARCHAR(500)"`
+	CustomerId         int       `xorm:"INT(10)"`
+	CustomerName       string    `xorm:VARCHAR(50)`
+	CheckDate          time.Time `xorm:"DATETIME"`
+	Remark             string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId       int       `xorm:"INT(11)"`
+	CreateOn           time.Time `xorm:"DATETIME"`
+	CreateBy           string    `xorm:"VARCHAR(50)"`
+	ModifiedOn         time.Time `xorm:"DATETIME"`
+	ModifiedUserId     int       `xorm:"INT(11)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
+}
+

+ 70 - 0
src/dashoo.cn/backend/api/business/limsreportanal2carbonredgas/limsreportanal2carbonredgasSessionService.go

@@ -0,0 +1,70 @@
+package limsreportben
+
+import (
+	"dashoo.cn/backend/api/business/limsreportalertor"
+	"fmt"
+	"strconv"
+
+	. "dashoo.cn/backend/api/mydb"
+	. "dashoo.cn/utils/db"
+	"dashoo.cn/utils"
+	"github.com/go-xorm/xorm"
+)
+
+type LimsReportBenSessionService struct {
+	MySessionBase
+}
+
+func GetLimsReportBenSessionService(xormEngine *xorm.Session) *LimsReportBenSessionService {
+	s := new(LimsReportBenSessionService)
+	s.Session = xormEngine
+	return s
+}
+
+//获取ben信息
+func (s *LimsReportBenSessionService) GetAllPagingEntitiesWithOrderBytbl(tblbalance string, tblentry string, pageIndex, itemsPerPage int64, order, where string) (int64, []LimsReportBenModel) {
+	var err error
+	var total int64
+	if order != "" {
+		order = " order by " + order
+	}
+	//获取总记录数
+	if where == "" {
+		where = "1=1"
+	}
+	sqlCount := " select count(*) from " + tblentry + " a  left join " + tblbalance + " b on a.DocId = b.DataDocId where " + where
+	var sql string
+	sql = ` select a.Id,a.DocKey,a.DocAddress,a.CheckStatus,a.DocId,a.DocType,b.* from 
+	` + tblentry + ` a left join ` + tblbalance + ` b on a.DocId = b.DataDocId where ` + where + order + `
+		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
+	fmt.Println(sql)
+	List := make([]LimsReportBenModel, 0)
+	utils.DBE.Sql(sql).Find(&List)
+	resultsSlice, err := s.Session.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}
+
+
+//获取信息
+func (s *LimsReportBenSessionService) GetEntityByOrderbyWhereMain(tbldataentry, tblalertor, order, dataentryid string) (entity limsreportalertor.LimsAlertorMainModel) {
+	if order != "" {
+		order = " order by " + order
+	}
+	where := "a.Id = "+dataentryid
+	var sql string
+	sql = ` select a.*,b.* from 
+	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
+	fmt.Println(sql)
+	s.Session.Sql(sql).Get(&entity)
+	return
+}
+

+ 47 - 0
src/dashoo.cn/backend/api/business/limsreportdetHSgas/limsreportdetHSgas.go

@@ -0,0 +1,47 @@
+package limsreportben
+
+import (
+	"time"
+)
+
+type LimsReportBenModel struct {
+	Id                 int       `xorm:"not null pk autoincr INT(10)"`
+	EId                int       `xorm:"comment('委托单ID') INT(10)"`
+	TaskBalanceId      int       `xorm:"comment('任务分配表ID') INT(10)"`
+	DataEntryId        int       `xorm:"comment('数据记录表ID') INT(10)"`
+	MeterRange         string    `xorm:"comment('量程(*10-6mol/mol)') VARCHAR(255)"`
+	MeasurementRange   string    `xorm:"comment('测量范围(*10-6mol/mol)') VARCHAR(255)"`
+	DetectBasis        string    `xorm:"comment('检测依据') VARCHAR(500)"`
+	FaceCheck          string    `xorm:"comment('外观及结构') VARCHAR(50)"`
+	FlagCheck          string    `xorm:"comment('标志标识') VARCHAR(50)"`
+	ElectrifyCheck     string    `xorm:"comment('通电检查') VARCHAR(50)"`
+	Insulation         string    `xorm:"comment('绝缘电阻') VARCHAR(50)"`
+	RelativeHumanity   string    `xorm:"comment('相对湿度') VARCHAR(50)"`
+	ManuCompany        string    `xorm:"comment('制造单位') VARCHAR(255)"`
+	Spec               string    `xorm:"comment('规格/型号') VARCHAR(255)"`
+	FactoryNum         string    `xorm:"comment('出厂编号') VARCHAR(255)"`
+	AudibleAlarm       string    `xorm:"comment('声光报警') VARCHAR(255)"`
+	AlarmConcentration string    `xorm:"comment('报警浓度值') VARCHAR(255)"`
+	InstrumentLevel    string    `xorm:"comment('仪器等级') VARCHAR(255)"`
+	DielecStrength     string    `xorm:"comment('绝缘强度') VARCHAR(255)"`
+	TestDepartId       int       `xorm:"INT(11)"`      //受检单位
+	TestDepart         string    `xorm:"VARCHAR(100)"` //受检单位
+	PositionCheckId    int       `xorm:"INT(11)"`      //检测地点
+	PositionCheck      string    `xorm:"VARCHAR(100)"`
+	Instrument1        string    `xorm:"VARCHAR(255)"` //设备1
+	Instrument2        string    `xorm:"VARCHAR(255)"`
+	Instrument3        string    `xorm:"VARCHAR(255)"`
+	Temperature        string    `xorm:"VARCHAR(50)"`
+	StandardDesc       string    `xorm:"VARCHAR(500)"`
+	CustomerId         int       `xorm:"INT(10)"`
+	CustomerName       string    `xorm:VARCHAR(50)`
+	CheckDate          time.Time `xorm:"DATETIME"`
+	Remark             string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId       int       `xorm:"INT(11)"`
+	CreateOn           time.Time `xorm:"DATETIME"`
+	CreateBy           string    `xorm:"VARCHAR(50)"`
+	ModifiedOn         time.Time `xorm:"DATETIME"`
+	ModifiedUserId     int       `xorm:"INT(11)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
+}
+

+ 70 - 0
src/dashoo.cn/backend/api/business/limsreportdetHSgas/limsreportdetHSgasSessionService.go

@@ -0,0 +1,70 @@
+package limsreportben
+
+import (
+	"dashoo.cn/backend/api/business/limsreportalertor"
+	"fmt"
+	"strconv"
+
+	. "dashoo.cn/backend/api/mydb"
+	. "dashoo.cn/utils/db"
+	"dashoo.cn/utils"
+	"github.com/go-xorm/xorm"
+)
+
+type LimsReportBenSessionService struct {
+	MySessionBase
+}
+
+func GetLimsReportBenSessionService(xormEngine *xorm.Session) *LimsReportBenSessionService {
+	s := new(LimsReportBenSessionService)
+	s.Session = xormEngine
+	return s
+}
+
+//获取ben信息
+func (s *LimsReportBenSessionService) GetAllPagingEntitiesWithOrderBytbl(tblbalance string, tblentry string, pageIndex, itemsPerPage int64, order, where string) (int64, []LimsReportBenModel) {
+	var err error
+	var total int64
+	if order != "" {
+		order = " order by " + order
+	}
+	//获取总记录数
+	if where == "" {
+		where = "1=1"
+	}
+	sqlCount := " select count(*) from " + tblentry + " a  left join " + tblbalance + " b on a.DocId = b.DataDocId where " + where
+	var sql string
+	sql = ` select a.Id,a.DocKey,a.DocAddress,a.CheckStatus,a.DocId,a.DocType,b.* from 
+	` + tblentry + ` a left join ` + tblbalance + ` b on a.DocId = b.DataDocId where ` + where + order + `
+		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
+	fmt.Println(sql)
+	List := make([]LimsReportBenModel, 0)
+	utils.DBE.Sql(sql).Find(&List)
+	resultsSlice, err := s.Session.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}
+
+
+//获取信息
+func (s *LimsReportBenSessionService) GetEntityByOrderbyWhereMain(tbldataentry, tblalertor, order, dataentryid string) (entity limsreportalertor.LimsAlertorMainModel) {
+	if order != "" {
+		order = " order by " + order
+	}
+	where := "a.Id = "+dataentryid
+	var sql string
+	sql = ` select a.*,b.* from 
+	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
+	fmt.Println(sql)
+	s.Session.Sql(sql).Get(&entity)
+	return
+}
+

+ 47 - 0
src/dashoo.cn/backend/api/business/limsreportdetelectoxygen/limsreportdetelectoxygen.go

@@ -0,0 +1,47 @@
+package limsreportben
+
+import (
+	"time"
+)
+
+type LimsReportBenModel struct {
+	Id                 int       `xorm:"not null pk autoincr INT(10)"`
+	EId                int       `xorm:"comment('委托单ID') INT(10)"`
+	TaskBalanceId      int       `xorm:"comment('任务分配表ID') INT(10)"`
+	DataEntryId        int       `xorm:"comment('数据记录表ID') INT(10)"`
+	MeterRange         string    `xorm:"comment('量程(*10-6mol/mol)') VARCHAR(255)"`
+	MeasurementRange   string    `xorm:"comment('测量范围(*10-6mol/mol)') VARCHAR(255)"`
+	DetectBasis        string    `xorm:"comment('检测依据') VARCHAR(500)"`
+	FaceCheck          string    `xorm:"comment('外观及结构') VARCHAR(50)"`
+	FlagCheck          string    `xorm:"comment('标志标识') VARCHAR(50)"`
+	ElectrifyCheck     string    `xorm:"comment('通电检查') VARCHAR(50)"`
+	Insulation         string    `xorm:"comment('绝缘电阻') VARCHAR(50)"`
+	RelativeHumanity   string    `xorm:"comment('相对湿度') VARCHAR(50)"`
+	ManuCompany        string    `xorm:"comment('制造单位') VARCHAR(255)"`
+	Spec               string    `xorm:"comment('规格/型号') VARCHAR(255)"`
+	FactoryNum         string    `xorm:"comment('出厂编号') VARCHAR(255)"`
+	AudibleAlarm       string    `xorm:"comment('声光报警') VARCHAR(255)"`
+	AlarmConcentration string    `xorm:"comment('报警浓度值') VARCHAR(255)"`
+	InstrumentLevel    string    `xorm:"comment('仪器等级') VARCHAR(255)"`
+	DielecStrength     string    `xorm:"comment('绝缘强度') VARCHAR(255)"`
+	TestDepartId       int       `xorm:"INT(11)"`      //受检单位
+	TestDepart         string    `xorm:"VARCHAR(100)"` //受检单位
+	PositionCheckId    int       `xorm:"INT(11)"`      //检测地点
+	PositionCheck      string    `xorm:"VARCHAR(100)"`
+	Instrument1        string    `xorm:"VARCHAR(255)"` //设备1
+	Instrument2        string    `xorm:"VARCHAR(255)"`
+	Instrument3        string    `xorm:"VARCHAR(255)"`
+	Temperature        string    `xorm:"VARCHAR(50)"`
+	StandardDesc       string    `xorm:"VARCHAR(500)"`
+	CustomerId         int       `xorm:"INT(10)"`
+	CustomerName       string    `xorm:VARCHAR(50)`
+	CheckDate          time.Time `xorm:"DATETIME"`
+	Remark             string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId       int       `xorm:"INT(11)"`
+	CreateOn           time.Time `xorm:"DATETIME"`
+	CreateBy           string    `xorm:"VARCHAR(50)"`
+	ModifiedOn         time.Time `xorm:"DATETIME"`
+	ModifiedUserId     int       `xorm:"INT(11)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
+}
+

+ 70 - 0
src/dashoo.cn/backend/api/business/limsreportdetelectoxygen/limsreportdetelectoxygenSessionService.go

@@ -0,0 +1,70 @@
+package limsreportben
+
+import (
+	"dashoo.cn/backend/api/business/limsreportalertor"
+	"fmt"
+	"strconv"
+
+	. "dashoo.cn/backend/api/mydb"
+	. "dashoo.cn/utils/db"
+	"dashoo.cn/utils"
+	"github.com/go-xorm/xorm"
+)
+
+type LimsReportBenSessionService struct {
+	MySessionBase
+}
+
+func GetLimsReportBenSessionService(xormEngine *xorm.Session) *LimsReportBenSessionService {
+	s := new(LimsReportBenSessionService)
+	s.Session = xormEngine
+	return s
+}
+
+//获取ben信息
+func (s *LimsReportBenSessionService) GetAllPagingEntitiesWithOrderBytbl(tblbalance string, tblentry string, pageIndex, itemsPerPage int64, order, where string) (int64, []LimsReportBenModel) {
+	var err error
+	var total int64
+	if order != "" {
+		order = " order by " + order
+	}
+	//获取总记录数
+	if where == "" {
+		where = "1=1"
+	}
+	sqlCount := " select count(*) from " + tblentry + " a  left join " + tblbalance + " b on a.DocId = b.DataDocId where " + where
+	var sql string
+	sql = ` select a.Id,a.DocKey,a.DocAddress,a.CheckStatus,a.DocId,a.DocType,b.* from 
+	` + tblentry + ` a left join ` + tblbalance + ` b on a.DocId = b.DataDocId where ` + where + order + `
+		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
+	fmt.Println(sql)
+	List := make([]LimsReportBenModel, 0)
+	utils.DBE.Sql(sql).Find(&List)
+	resultsSlice, err := s.Session.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}
+
+
+//获取信息
+func (s *LimsReportBenSessionService) GetEntityByOrderbyWhereMain(tbldataentry, tblalertor, order, dataentryid string) (entity limsreportalertor.LimsAlertorMainModel) {
+	if order != "" {
+		order = " order by " + order
+	}
+	where := "a.Id = "+dataentryid
+	var sql string
+	sql = ` select a.*,b.* from 
+	` + tbldataentry + ` a left join ` + tblalertor + ` b on a.Id = b.DataEntryId where ` + where + order
+	fmt.Println(sql)
+	s.Session.Sql(sql).Get(&entity)
+	return
+}
+

+ 1 - 1
src/dashoo.cn/backend/api/business/limsreportelecpumpwell/limsreportelecpumpwellService.go

@@ -1,7 +1,7 @@
 package limsreportelecpumpwell
 
 import (
-	. "dashoo.cn/cellbank/backend/api/mydb"
+	. "dashoo.cn/backend/api/mydb"
 	"github.com/go-xorm/xorm"
 )
 

+ 1 - 1
src/dashoo.cn/backend/api/business/limsreportliquidtransportation/limsreportliquidtransportationService.go

@@ -1,7 +1,7 @@
 package limsreportliquidtransportation
 
 import (
-. "dashoo.cn/cellbank/backend/api/mydb"
+. "dashoo.cn/backend/api/mydb"
 "github.com/go-xorm/xorm"
 )
 

+ 1 - 1
src/dashoo.cn/backend/api/business/limsreportmotor/limsreportmotorService.go

@@ -1,7 +1,7 @@
 package limsreportmotor
 
 import (
-	. "dashoo.cn/cellbank/backend/api/mydb"
+	. "dashoo.cn/backend/api/mydb"
 	"github.com/go-xorm/xorm"
 )
 

+ 1 - 1
src/dashoo.cn/backend/api/business/limsreportpistonpumpunit/limsreportpistonpumpunitService.go

@@ -1,7 +1,7 @@
 package limsreportpistonpumpunit
 
 import (
-	. "dashoo.cn/cellbank/backend/api/mydb"
+	. "dashoo.cn/backend/api/mydb"
 	"github.com/go-xorm/xorm"
 )
 

+ 1 - 1
src/dashoo.cn/backend/api/business/limsreportscrewpump/limsreportscrewpumpService.go

@@ -1,7 +1,7 @@
 package limsreportscrewpump
 
 import (
-	. "dashoo.cn/cellbank/backend/api/mydb"
+	. "dashoo.cn/backend/api/mydb"
 	"github.com/go-xorm/xorm"
 )
 

+ 1 - 1
src/dashoo.cn/backend/api/business/limsreportspecialfield/limsreportspecialfieldService.go

@@ -1,7 +1,7 @@
 package limsreportspecialfield
 
 import (
-	. "dashoo.cn/cellbank/backend/api/mydb"
+	. "dashoo.cn/backend/api/mydb"
 	"github.com/go-xorm/xorm"
 )