Browse Source

git commit -a -m '前后:不良记录'

dubch 4 years ago
parent
commit
25ddf82b2d

+ 1 - 1
src/dashoo.cn/backend/api/business/oilsupplier/badrecord/badrecordservice.go

@@ -120,7 +120,7 @@ func (s *BadRecordService) GetCounts(where string) (total int64) {
 	var err error
 	var resultsSlice []map[string][]byte
 
-	sql := "select count(*) from OilSupplierCertSub a LEFT JOIN OilSupplierPauseReason b ON b.Id=( SELECT Id FROM OilSupplierPauseReason t WHERE t.CertSubId=a.Id ORDER BY t.Id DESC LIMIT 1) where(" + where + ")"
+	sql := "select count(*) from OilSupplierCertSub a LEFT JOIN OilSupplierPauseReason b ON b.CertSubId = a.Id where(" + where + ")"
 	resultsSlice, err = s.DBE.Query(sql)
 
 	//LogError(err)

+ 1 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/badrecord.go

@@ -489,7 +489,7 @@ func (this *BadRecordController) SerachGoodsCertByCompany() {
 	sql = sql + " where a.SupplierId='"+companyId+"' and a.SupplierTypeCode='01' "+ sqlAdd +" order by a.CertSubStatus desc,a.Id asc limit "+ye+","+size+""
 	goodslist, _ = svc.DBE.QueryString(sql)
 
-	goodsTotal :=svc.GetCounts("a.SupplierId='"+companyId+"' and SupplierTypeCode='01' "+ sqlAdd)
+	goodsTotal :=svc.GetCounts("a.SupplierId = " + companyId + " and SupplierTypeCode = '01' "+ sqlAdd)
 	//goodsTotal := len(goodslist)
 	var datainfo DataInfo
 	datainfo.Items = goodslist

+ 2 - 0
src/dashoo.cn/frontend_web/src/pages/select/processselect/index.vue

@@ -586,6 +586,8 @@
             return '未通过'
           case '10':
             return '待分办'
+          case '-10':
+            return '分办未通过'
           case '11':
             return '审核完成'
           default: