注释导入准入

src/dashoo.cn/backend/api/business/tmpzcgf/tmpCertSubSession.go

@@ -1,96 +1,96 @@
 package tmpzcgf
 
-import (
-	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
-	"dashoo.cn/backend/api/controllers/tmpzcgf"
-	. "dashoo.cn/backend/api/mydb"
-	"github.com/go-xorm/xorm"
-
-
-)
-
-type TmpCertSession struct {
-	MySessionBase
-}
-
-type SubClassId struct{
-	id int
-}
-
-type AllId struct{
-	Id int
-}
-
-func GetTmpCertService(session *xorm.Session) *TmpCertSession {
-	s := new(TmpCertSession)
-	s.Session = session
-	return s
-}
-
-//获取tmp_zcgf所有Id
-func (s *TmpCertSession) GetAllId() []AllId{
-	var ids []AllId
-	sql := `SELECT
-				id 
-			FROM
-				tmp_zcgf`
-	s.Session.SQL(sql).Find(&ids)
-	return ids
-}
-
-//从tmp_zcgf获取一条数据
-func (s *TmpCertSession) SelectOne(id int) tmpzcgf.TmpCertController {
-	var one tmpzcgf.TmpCertController
-	sql := `SELECT
-				a.准入范围 AccessRange,
-				c.id SupplierCertId,
-				c.SupplierTypeCode SupplierTypeCode
-			FROM
-				tmp_zcgf a
-				LEFT JOIN oilsupplier b ON a.企业名称 = b.SupplierName
-				JOIN oilsuppliercert c ON b.id = c.SupplierId 
-				AND a.准入类别 = c.SupplierTypeName 
-			WHERE
-				a.id =` + string(id)
-	 s.Session.SQL(sql).Find(&one)
-	return one
-}
-
-
-//获取subClassId
-func (s *TmpCertSession) GetSubClassId(code string, supplierTypeCode string) int{
-	//var subClassName
-	var id SubClassId
-	var tableName string
-	switch supplierTypeCode{
-	case "01":
-		tableName = "OilGoodsAptitudeClass"
-		//subClassName = []goodsaptitudeclass.OilGoodsAptitudeClass
-	case "02":
-		tableName = "OilBasisBuild"
-		//subClassName = []basisbuild.OilBasisBuild
-	case "03":
-		tableName = "OilTechnologyServiceClass"
-		//subClassName = []technologyserviceclass.OilTechnologyServiceClass
-	}
-	var sql = `SELECT id FROM`+tableName+`WHERE	1 = 1 AND code =`+ code
-
-	s.Session.SQL(sql).Find(&id)
-	return id.id
-
-}
-
-func (s *TmpCertSession) InsertSupplierCertSub(sub suppliercertsub.OilSupplierCertSub) error {
-	var supplierId = string(sub.SupplierId)
-	var	supplierCertId = string(sub.SupplierCertId)
-	var	supplierTypeCode = sub.SupplierTypeCode
-	var	subClassId = string(sub.SubClassId)
-	var	code = sub.Code
-	var	name = sub.Name
-	sql := `INSERT INTO OilSupplierCertSub ( SupplierId, SupplierCertId, SupplierTypeCode, SubClassId, CODE, NAME )
-	VALUES ( ’`	+ supplierId+`‘,‘`+supplierCertId+`','`+supplierTypeCode+`','`+subClassId+`','`+code+`','`+name+`')`
-
-	_,err := s.Session.Query(sql)
-	return err
-}
+//import (
+//	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
+//	"dashoo.cn/backend/api/controllers/tmpzcgf"
+//	. "dashoo.cn/backend/api/mydb"
+//	"github.com/go-xorm/xorm"
+//
+//
+//)
+//
+//type TmpCertSession struct {
+//	MySessionBase
+//}
+//
+//type SubClassId struct{
+//	id int
+//}
+//
+//type AllId struct{
+//	Id int
+//}
+//
+//func GetTmpCertService(session *xorm.Session) *TmpCertSession {
+//	s := new(TmpCertSession)
+//	s.Session = session
+//	return s
+//}
+//
+////获取tmp_zcgf所有Id
+//func (s *TmpCertSession) GetAllId() []AllId{
+//	var ids []AllId
+//	sql := `SELECT
+//				id
+//			FROM
+//				tmp_zcgf`
+//	s.Session.SQL(sql).Find(&ids)
+//	return ids
+//}
+//
+////从tmp_zcgf获取一条数据
+//func (s *TmpCertSession) SelectOne(id int) tmpzcgf.TmpCertController {
+//	var one tmpzcgf.TmpCertController
+//	sql := `SELECT
+//				a.准入范围 AccessRange,
+//				c.id SupplierCertId,
+//				c.SupplierTypeCode SupplierTypeCode
+//			FROM
+//				tmp_zcgf a
+//				LEFT JOIN oilsupplier b ON a.企业名称 = b.SupplierName
+//				JOIN oilsuppliercert c ON b.id = c.SupplierId
+//				AND a.准入类别 = c.SupplierTypeName
+//			WHERE
+//				a.id =` + string(id)
+//	 s.Session.SQL(sql).Find(&one)
+//	return one
+//}
+//
+//
+////获取subClassId
+//func (s *TmpCertSession) GetSubClassId(code string, supplierTypeCode string) int{
+//	//var subClassName
+//	var id SubClassId
+//	var tableName string
+//	switch supplierTypeCode{
+//	case "01":
+//		tableName = "OilGoodsAptitudeClass"
+//		//subClassName = []goodsaptitudeclass.OilGoodsAptitudeClass
+//	case "02":
+//		tableName = "OilBasisBuild"
+//		//subClassName = []basisbuild.OilBasisBuild
+//	case "03":
+//		tableName = "OilTechnologyServiceClass"
+//		//subClassName = []technologyserviceclass.OilTechnologyServiceClass
+//	}
+//	var sql = `SELECT id FROM`+tableName+`WHERE	1 = 1 AND code =`+ code
+//
+//	s.Session.SQL(sql).Find(&id)
+//	return id.id
+//
+//}
+//
+//func (s *TmpCertSession) InsertSupplierCertSub(sub suppliercertsub.OilSupplierCertSub) error {
+//	var supplierId = string(sub.SupplierId)
+//	var	supplierCertId = string(sub.SupplierCertId)
+//	var	supplierTypeCode = sub.SupplierTypeCode
+//	var	subClassId = string(sub.SubClassId)
+//	var	code = sub.Code
+//	var	name = sub.Name
+//	sql := `INSERT INTO OilSupplierCertSub ( SupplierId, SupplierCertId, SupplierTypeCode, SubClassId, CODE, NAME )
+//	VALUES ( ’`	+ supplierId+`‘,‘`+supplierCertId+`','`+supplierTypeCode+`','`+subClassId+`','`+code+`','`+name+`')`
+//
+//	_,err := s.Session.Query(sql)
+//	return err
+//}
 

src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -47,7 +47,6 @@ func (s *TmpzcgtSession) InsertSupplier() error {
 	CompanyType,
 	DepositBank,
 	BankAccount,
-	SetupTime,
 	EMail,
 	BankCreditRating,
 	Mobile,
@@ -89,7 +88,6 @@ func (s *TmpzcgtSession) InsertSupplier() error {
 	公司类型 AS CompanyType,
 	开户银行 AS DepositBank,
 	银行账号 AS BankAccount,
-	成立时间 AS SetupTime,
 	电子邮箱 AS EMail,
 	银行信用等级 AS BankCreditRating,
 	移动电话 AS Mobile,

src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpcertsub.go

@@ -1,84 +1,84 @@
 package tmpzcgf
 
-import (
-	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
-	"dashoo.cn/backend/api/business/tmpzcgf"
-	"dashoo.cn/utils"
-	"fmt"
-	"strings"
-	"time"
-)
-
+//import (
+//	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
+//	"dashoo.cn/backend/api/business/tmpzcgf"
+//	"dashoo.cn/utils"
+//	"fmt"
+//	"strings"
+//	"time"
+//)
+//
+////type TmpCertController struct {
+////
+////	AccessCardNo  			int				    `json:"accessCardNo"`  //准入证号
+////	SupplierTypeName		string 			    `json:"supplierTypeName"`	//准入类别
+////	InFlag					int					`json:"inFlag"`				//准入标识
+////	EffectStartTime			time.Time			`json:"effectStartTime"`	//有效期起
+////	EffectEndTime			time.Time			`json:"effectEndTime"`		//有效期止
+////	ApplyTime				time.Time			`json:"applyTime"`			//年审日期
+////
+////}
+//
 //type TmpCertController struct {
 //
-//	AccessCardNo  			int				    `json:"accessCardNo"`  //准入证号
-//	SupplierTypeName		string 			    `json:"supplierTypeName"`	//准入类别
-//	InFlag					int					`json:"inFlag"`				//准入标识
-//	EffectStartTime			time.Time			`json:"effectStartTime"`	//有效期起
-//	EffectEndTime			time.Time			`json:"effectEndTime"`		//有效期止
-//	ApplyTime				time.Time			`json:"applyTime"`			//年审日期
+//	SupplierCertId			int
+//	SupplierTypeCode		string
+//	AccessRange				string
+//}
+//
+//// @Title 跟新OilSupplier
+//// @Description get user by token
+//// @Success 200 {object}
+//// @router /insertCertSub[get]
+//func (this *TmpCertController) InsertCertSub(){
+//	fmt.Printf("Insertsubcert start!")
+//	var total []tmpzcgf.AllId
+//	var one TmpCertController
+//	t := time.Now()
+//	session := utils.DBE.NewSession()
+//	defer session.Close()
+//	err := session.Begin()
+//	svc := tmpzcgf.GetTmpCertService(session)
+//	total = svc.GetAllId()
+//	for index := range total{
+//		id := total[index].Id
+//		//fmt.Printf('%T',id)
+//		one = svc.SelectOne(id)
+//
+//		accessRange := one.AccessRange
+//		accessRanges := strings.Split(accessRange,";")
+//		for index := range accessRanges{
+//			item := strings.Split(accessRanges[index]," ")
+//			code := item[0]
+//			code = code[2:]
+//			name := item[1]
 //
+//			var newOne suppliercertsub.OilSupplierCertSub
+//			newOne.SupplierCertId = one.SupplierCertId
+//			newOne.SupplierTypeCode = one.SupplierTypeCode
+//			newOne.Code = code
+//			newOne.Name = name
+//			subClassId := svc.GetSubClassId(code,one.SupplierTypeCode)
+//			newOne.SubClassId = subClassId
+//
+//			 svc.InsertSupplierCertSub(newOne)
+//
+//			fmt.Println("Insertsubcert end!")
+//
+//		}
+//
+//	}
+//
+//	//if err != nil {
+//	//	session.Rollback()
+//	//}
+//	err = session.Commit()
+//	fmt.Println(err)
+//	elapsed := time.Since(t)
+//	fmt.Println(elapsed)
 //}
 
-type TmpCertController struct {
-
-	SupplierCertId			int
-	SupplierTypeCode		string
-	AccessRange				string
-}
-
-// @Title 跟新OilSupplier
-// @Description get user by token
-// @Success 200 {object}
-// @router /insertCertSub[get]
-func (this *TmpCertController) InsertCertSub(){
-	fmt.Printf("Insertsubcert start!")
-	var total []tmpzcgf.AllId
-	var one TmpCertController
-	t := time.Now()
-	session := utils.DBE.NewSession()
-	defer session.Close()
-	err := session.Begin()
-	svc := tmpzcgf.GetTmpCertService(session)
-	total = svc.GetAllId()
-	for index := range total{
-		id := total[index].Id
-		//fmt.Printf('%T',id)
-		one = svc.SelectOne(id)
-
-		accessRange := one.AccessRange
-		accessRanges := strings.Split(accessRange,";")
-		for index := range accessRanges{
-			item := strings.Split(accessRanges[index]," ")
-			code := item[0]
-			code = code[2:]
-			name := item[1]
-
-			var newOne suppliercertsub.OilSupplierCertSub
-			newOne.SupplierCertId = one.SupplierCertId
-			newOne.SupplierTypeCode = one.SupplierTypeCode
-			newOne.Code = code
-			newOne.Name = name
-			subClassId := svc.GetSubClassId(code,one.SupplierTypeCode)
-			newOne.SubClassId = subClassId
-
-			 svc.InsertSupplierCertSub(newOne)
-
-			fmt.Println("Insertsubcert end!")
-
-		}
-
-	}
-
-	//if err != nil {
-	//	session.Rollback()
-	//}
-	err = session.Commit()
-	fmt.Println(err)
-	elapsed := time.Since(t)
-	fmt.Println(elapsed)
-}
-
 
 
 

src/dashoo.cn/frontend_web/src/pages/system/tmpzcgf.vue

@@ -22,7 +22,7 @@
        <!--<el-button size="mini" type="primary" @click="updateOilSupplierCertAppend" v-loading.fullscreen.lock="fullscreenLoading">跟新OilSupplierCertAppend表的SupplierId和CerId</el-button>-->
        <!--<el-button size="mini" type="primary" @click="insterOilPaymentInfo" v-loading.fullscreen.lock="fullscreenLoading">导入缴费记录并更新</el-button>-->
        <!--<el-button size="mini" type="primary" @click="insterBadRecord" v-loading.fullscreen.lock="fullscreenLoading">导入不良记录并更新</el-button>-->
-
+       <!--<el-button size="mini" type="primary" @click="insertCertSub" v-loading.fullscreen.lock="fullscreenLoading">导入准入范围</el-button>-->
     </el-card>
     <el-card class="box-card">
     </el-card>
@@ -159,6 +159,20 @@
                 this.fullscreenLoading = false
               })
           })
+      },
+      insertCertSub () {
+        this.$confirm('是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.fullscreenLoading = true
+            this.$axios.get('tmpzcgf/insertCertSub')
+              .then(res => {
+                this.fullscreenLoading = false
+              })
+          })
       }
     }
   }