2
3
dubch преди 5 години
родител
ревизия
35003a12b6

+ 2 - 2
src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitudeService.go

@@ -388,7 +388,7 @@ func (s *OilGoodsAptitudeService) GetPagingTmpCheckedEntities(entitiesPtr interf
 		   if((max(goods.F12)='1' AND LOCATE('F12',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F12) is null) or (max(goods.F12) = ''), '', '危险化学品经营许可证,') ,
 		   if((max(goods.F13)='1' AND LOCATE('F13',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F13) is null) or (max(goods.F13) = ''), '', '') ,
 		   if((max(goods.F14)='1' AND LOCATE('F14',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F14) is null) or (max(goods.F14) = ''), '', '食品经营许可证,') ,
-		   if((max(goods.F15)='1' AND LOCATE('F15',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F15) is null) or (max(goods.F15) = ''), '', '医疗器械经营企业许可证,') ,
+		   if((max(goods.F15)='1' AND LOCATE('F15',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F15) is null) or (max(goods.F15) = ''), '', '医疗器械经营许可证,') ,
 		   if((max(goods.F16)='1' AND LOCATE('F16',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F16) is null) or (max(goods.F16) = ''), '', '安全生产许可证,') ,
 		   if((max(goods.F17)='1' AND LOCATE('F17',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F17) is null) or (max(goods.F17) = ''), '', '特种设备制造许可证,') ,
 		   if((max(goods.F18)='1' AND LOCATE('F18',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F18) is null) or (max(goods.F18) = ''), '', '全国工业产品生产许可证,') ,
@@ -406,7 +406,7 @@ func (s *OilGoodsAptitudeService) GetPagingTmpCheckedEntities(entitiesPtr interf
 		   if((max(goods.F30)='1' AND LOCATE('F30',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F30) is null) or (max(goods.F30) = ''), '', '中国船级社型式认可证书,') ,
 		   if((max(goods.F31)='1' AND LOCATE('F31',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F31) is null) or (max(goods.F31) = ''), '', '涉及饮用水卫生安全产品卫生许可批件,') ,
 		   if((max(goods.F32)='1' AND LOCATE('F32',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F32) is null) or (max(goods.F32) = ''), '', '') ,
-		   if((max(goods.F33)='1' AND LOCATE('F33',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F33) is null) or (max(goods.F33) = ''), '', '医疗器械经营许可证,') ,
+		   if((max(goods.F33)='1' AND LOCATE('F33',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F33) is null) or (max(goods.F33) = ''), '', '医疗器械生产许可证,') ,
 		   if((max(goods.F34)='1' AND LOCATE('F34',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F34) is null) or (max(goods.F34) = ''), '', '节能产品认证证书,') ,
 		   if((max(goods.F35)='1' AND LOCATE('F35',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F35) is null) or (max(goods.F35) = ''), '', '预应力件生产许可证,') ,
 		   if((max(goods.F38)='1' AND LOCATE('F38',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F38) is null) or (max(goods.F38) = ''), '', '现场考察报告,') ,

+ 11 - 2
src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -284,6 +284,11 @@ func (s *TmpzcgtSession) InsertCertSub() error {
 		/*s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_typecode;")
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_code;")
 		s.DBE.Query("SET autocommit=0;")*/
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_code ;")
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_supplierid ;")
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_suppliercertid ;")
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_name ;")
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_supplierappendid ;")
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` DISABLE KEYS;")
 		s.DBE.Query("SET unique_checks=0;")
 		fmt.Println("循环总数-"+strconv.Itoa(int(n)))
@@ -357,6 +362,10 @@ func (s *TmpzcgtSession) UpdateCertSub() error {
 	}
 	s.DBE.Query("SET autocommit=1;")
 	s.DBE.Query("alter table OilSupplierCertSub drop index index_oldid ;")
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_code ( `Code` );")
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_supplierid ( `SupplierId` );")
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_suppliercertid ( `SupplierCertId` );")
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_name ( `Name` );")
 	return err
 }
 
@@ -570,7 +579,6 @@ func (s *TmpzcgtSession) UpdateOilSupplierCertAppendSub() error {
 		"b.SupplierCertId = IFNULL(a.`SupplierCertId`, 0), " +
 		"b.SupplierCertAppendId = IFNULL(a.`Id`, 0) " +
 		"where b.Type = '3' and (b.SupplierId is null or b.SupplierId = 0)"*/
-
 	svc := suppliercertappend.GetOilSupplierCertAppendService(s.DBE)
 	var certAppendList []suppliercertappend.OilSupplierCertAppend
 	svc.GetEntitysByWhere("OilSupplierCertAppend", "", &certAppendList)
@@ -588,12 +596,13 @@ func (s *TmpzcgtSession) UpdateOilSupplierCertAppendSub() error {
 			}
 		}
 		code := strings.TrimRight(appendCodeString, "or")
-		sql := "UPDATE OilSupplierCertSub a SET a.ModifiedOn = '2020-12-11 18:07:07', a.SupplierCertAppendId=" + strconv.Itoa(certAppend.Id) +
+		sql := "UPDATE OilSupplierCertSub a SET a.SupplierCertAppendId=" + strconv.Itoa(certAppend.Id) +
 			", a.`Type`=3 WHERE a.SupplierCertId=" + strconv.Itoa(certAppend.SupplierCertId) +
 			" AND"  + code + ") and a.SupplierCertAppendId=0"
 		_, err = s.DBE.Query(sql)
 		s.DBE.Query("commit;")
 	}
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_supplierappendid ( `SupplierAppendId` );")
 	s.DBE.Query("SET unique_checks=1;")
 	s.DBE.Query("SET autocommit=1;")
 	return err

+ 1 - 0
src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpzcgf.go

@@ -923,6 +923,7 @@ func (this *TmpzcgfController) InsertSubAll() {
 		this.InsertCertSub() // 准入
 		this.UpdateOilSupplierCertSub()
 		this.UpdateCertSubclassID()
+		this.UpdateOilSupplierCertAppendSub()
 		var certsub suppliercertsub.OilSupplierCertSub
 		certsub.Remark = ""
 		certsub.ModifiedBy = ""