1.蜜蜂所查询sql优化2.康宁杰瑞批量录入样本编码自动生成

src/dashoo.cn/backend/api/business/samplesinfo/samplesinfoService.go

@@ -102,15 +102,18 @@ func (s *SamplesInfoService) GetPagingEntitiesWithTb(acccode string, pageIndex,
 	fmt.Println(sqlCount)
 	var sql string
 
-	sql = ` select a.*,b.*,c.Genus,concat(c.ProvinceName,c.CityName,c.StreetName,c.Address) as AddressName,c.SurveyDate,d.XStation ShelfX,d.YStation ShelfY,d.Code ShelfCode,e.XStation BoxX,e.YStation BoxY,e.Code BoxCode,f.Id Eid,f.Name EName,f.Code ECode,g.GroupId,g.GroupName from ` + tbldetail + ` a 
+	sql = ` select z.*, g.GroupId,g.GroupName from(select a.*,
+	b.MId,b.AccCode,b.Name,b.Department,b.SampleType ,b.SampleTypeName,b.SamplingOrgan,b.SamplingOrganName,b.SamplingSite ,b.SamplingSiteName,b.ReceiveDate ,b.SourceId ,b.SourceIdCard ,b.SourceName,b.SerialNum,b.MCreateOn,b.MCreateUserId ,b.MCreateBy ,b.MModifiedOn ,b.MModifiedUserId ,b.MModifiedBy ,b.ZBack11,b.ZBack12,b.ZBack13,b.ZBack14,b.ZBack15,b.ZBack16,b.ZBack17,b.ZBack18,b.ZBack19,b.ZBack20,b.ZBack21,b.ZBack22,b.ZBack23,b.ZBack24,b.ZBack25,b.ZBack26,b.ZBack27,b.ZBack28,b.ZBack29,b.ZBack30,b.ZBack31,b.ZBack32,b.ZBack33,b.ZBack34,b.ZBack35,b.ZBack36,b.ZBack37,b.ZBack38,b.ZBack39,b.ZBack40,b.ZBack41,b.ZBack42,b.ZBack43,b.ZBack44,b.ZBack45,b.ZBack46,b.ZBack47,b.ZBack48,b.ZBack49,b.ZBack50,b.ZBack51,b.ZBack52,b.ZBack53,b.ZBack54,b.ZBack55,b.ZBack56,b.ZBack57,b.ZBack58,b.ZBack59,b.ZBack60,` +
+	` c.Genus,concat(c.ProvinceName,c.CityName,c.StreetName,c.Address) as AddressName,c.SurveyDate, ` +
+	` d.XStation ShelfX,d.YStation ShelfY,d.Code ShelfCode,` +
+	` e.XStation BoxX,e.YStation BoxY,e.Code BoxCode,` +
+	` f.Id Eid,f.Name EName,f.Code ECode from ` + tbldetail + ` a 
 	left join ` + tblmain + ` b on a.SampleCode = b.SampleCode  
 	left join ` + tbldonor + ` c on b.SourceId = c.Id 
 	left join Shelf d on a.ShelfId=d.Id 
 	left join Box e on a.BoxId=e.Id 
 	left join Equipment f on a.EquipmentId=f.Id 
-	left join ` + groupdetail + ` g on g.SampleId=a.Id 
-	where ` + where + order + `
-		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
+	where ` + where + order+ ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)+ ` ) z  ` + ` left join `+ groupdetail + ` g on g.SampleId=z.Id `
 	fmt.Println(sql)
 	List := make([]SamplesInfoList, 0)
 	utils.DBE.Sql(sql).Find(&List)
@@ -374,7 +377,7 @@ func (s *SamplesInfoService) InsertExcelSamplesInput(excelpath, acccode, createb
 				if rowindex == 0 { //第一行是表头，跳过
 					continue
 				}
-				if row.Cells == nil || len(row.Cells) < 8 { //小于必填项的19列，不允许导入(改为跳过)
+				if row.Cells == nil { //小于必填项的19列，不允许导入(改为跳过)
 					continue
 				}
 

src/dashoo.cn/backend/api/controllers/samplesinfo/sampleoperation.go

@@ -1805,12 +1805,10 @@ func (this *SampleOperationController) SaveBatchAdd() {
 		svc.GetEntityByShelfIdXY(positionArr[2],positionArr[0], positionArr[1], box_model)
 		for  m := 0; m < box_model.RowNum;m++{
 			for n := 0; n < box_model.ColumnNum;n++{
-				if datadetail.BarCode == "" {
-					if this.User.AccCode == "sBBo4" {
-						datadetail.BarCode = datamain.SampleCode + "01"
-					} else {
-						datadetail.BarCode = datamain.SampleCode + "-" +  strconv.Itoa(j)
-					}
+				if this.User.AccCode == "sBBo4" {
+					datadetail.BarCode = datamain.SampleCode + "01"
+				} else {
+					datadetail.BarCode = datamain.SampleCode + "-" +  strconv.Itoa(j+1)
 				}
 				datadetail.EquipmentId,_ = strconv.Atoi(dataother.Eid)
 				datadetail.ShelfId,_ =  strconv.Atoi(positionArr[2])

src/dashoo.cn/frontend_web/src/components/samples/batchadddialog.vue

@@ -21,7 +21,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="样本条码" prop="BarCode">
-              <el-input v-model="sampleform.BarCode" placeholder="为空默认自动生成" :disabled="disabledbarcode"></el-input>
+              <el-input v-model="sampleform.BarCode" placeholder="为空默认自动生成" disabled="disabled"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">