瀏覽代碼

老系统

dubch 5 年之前
父節點
當前提交
44c350fa48

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

@@ -121,7 +121,7 @@ func (s *TmpzcgtSession) InsertSupplier() error {
 	STR_TO_DATE(IF(max(成立时间)='', NULL, max(成立时间)),IF(LENGTH(max(成立时间))>8 or locate('-',max(成立时间)) >0, '%Y-%m-%d', '%Y%m%d')) AS SetupTime,
     max(中石油供应商证书号) as OilCertificateNo,
 	max(推荐单位的推荐意见) as BusinessScope,
-	曾用名 AS OldSupplierName
+	max(曾用名) AS OldSupplierName
 FROM 
 	T_资格预审表 GROUP BY 企业名称;` //WHERE 准入标识 != '取消'
 	_, err := s.DBE.Query(sql)
@@ -136,7 +136,7 @@ FROM
 func (s *TmpzcgtSession) InsertSupplierCert() error {
 	s.DBE.Query("SET unique_checks=0;")
 	sql := "INSERT INTO OilSupplierCert (SupplierId,OutsideFlog, `Status` , Step, WorkerTotal, AccessCardNo,SupplierTypeName,InFlag,EffectStartTime,EffectEndTime,AddinTime,EffectTime,ApplyTime,Remark,CreateBy,GfID,RecUnitName,MgrUnit,RecDate,OldCardNo) " +
-		"SELECT -1 As SupplierId,企业名称 AS OutsideFlog,'8' As `Status`, 3 as Step, 1 as WorkerTotal, 准入证号 As AccessCardNo,准入类别 AS SupplierTypeName,准入标识 AS InFlag, STR_TO_DATE(IF(有效期起='', NULL, 有效期起),'%Y年%m月%d日') AS EffectStartTime, STR_TO_DATE(IF(有效期止='', NULL, 有效期止),'%Y年%m月%d日') AS EffectEndTime,审核日期 as AddinTime, 有效期起 as EffectTime, (SELECT STR_TO_DATE(有效期至,'%Y-%m-%d') FROM tmp_T_在册供方查询 tmpzc WHERE tmpzc.ID = a.ID) AS ApplyTime,备注 AS Remark,'导入' As CreateBy,ID,推荐单位名称 as RecUnitName,管理单位 as MgrUnit,推荐日期,曾用准入证号 as RecDate " +
+		"SELECT -1 As SupplierId,企业名称 AS OutsideFlog,'8' As `Status`, 3 as Step, 1 as WorkerTotal, 准入证号 As AccessCardNo,准入类别 AS SupplierTypeName,准入标识 AS InFlag, STR_TO_DATE(IF(有效期起='', NULL, 有效期起),'%Y年%m月%d日') AS EffectStartTime, STR_TO_DATE(IF(有效期止='', NULL, 有效期止),'%Y年%m月%d日') AS EffectEndTime,审核日期 as AddinTime, 有效期起 as EffectTime, (SELECT 有效期至 FROM tmp_T_在册供方查询 tmpzc WHERE tmpzc.ID = a.ID) AS ApplyTime,备注 AS Remark,'导入' As CreateBy,ID,推荐单位名称 as RecUnitName,管理单位 as MgrUnit,推荐日期,曾用准入证号 as RecDate " +
 		"FROM T_资格预审表 a ;" //WHERE 准入标识 != '取消'
 	// s.DBE.Query("SET @@SESSION.sql_mode='ALLOW_INVALID_DATES'")
 	_, err := s.DBE.Query(sql)
@@ -637,7 +637,7 @@ func (s *TmpzcgtSession) InsertFileName() error {
 	sql := "INSERT INTO `OilSupplierFile` (SupplierId, SupplierCertSubId, FileUrl, Remark, NeedFileType, OtherRemark, SupplierTypeCode,CreateBy, FileExt, EffectDate, CreateOn, FileName) " +
 		"SELECT 0 AS SupplierId, 0 AS SupplierCertSubId, concat('/upfile/gfzl_2014/', f.ID_GF, '-' , f.类别编号, IFNULL(f.文件类型, ''), '|', f.类别, IFNULL(f.文件类型, '')) AS FileUrl, z.企业名称 AS Remark ,f.类别 AS NeedFileType, f.说明 AS OtherRemark, " +
 		"( CASE z.准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' WHEN '技术服务类' THEN '03' else '000' END ) SupplierTypeCode, " +
-		"'导入' AS CreateBy, f.`文件类型` AS FileExt, str_to_date(f.`有效期至`, '%Y-%m-%d') AS EffectDate, str_to_date(f.`日期`, '%Y-%m-%d') AS CreateOn, concat(f.类别, IFNULL(f.文件类型, '')) AS FileName" +
+		"'导入' AS CreateBy, f.`文件类型` AS FileExt, str_to_date(f.`有效期至`, '%Y-%m-%d') AS EffectDate, str_to_date(f.`日期`, '%Y-%m-%d') AS CreateOn, concat(f.类别, IFNULL(f.文件类型, '')) AS FileName " +
 		"FROM `T_供方资料_V2014` f " +
 		"LEFT JOIN `T_资格预审表` z ON (f.ID_GF = z.ID) " +
 		"WHERE z.企业名称 IS NOT NULL"

+ 5 - 4
src/dashoo.cn/doc/老数据导入前.sql

@@ -9,11 +9,12 @@ delete from T_不良行为记录 where gfid in (select ID from T_资格预审表
 delete from T_交费记录 where ID_GF in (select ID from T_资格预审表 where 准入标识 = '取消' or 状态标识 != '办理完毕');
 delete from T_资格预审表 where 准入标识 = '取消' or 状态标识 != '办理完毕';
 -- 导入前
-UPDATE `supplier_system_test`.`T_资格预审表` SET `有效期止`='2025年12月27日' WHERE  `准入类别`='技术服务类' AND `企业名称`='天津市博创环保科技有限公司';
+UPDATE `T_资格预审表` SET `有效期止`='2025年12月27日' WHERE  `准入类别`='技术服务类' AND `企业名称`='天津市博创环保科技有限公司';
+UPDATE `T_资格预审表` SET `有效期止`='2025年08月27日' WHERE  `有效期止`='2025年28月27日';
 
-UPDATE `supplier_system_test`.`T_资格预审表` SET `有效期止`='2025年12月27日' WHERE  `准入类别`='技术服务类' AND `企业名称`='河北昆相环保技术有限公司';
+UPDATE `T_资格预审表` SET `有效期止`='2025年12月27日' WHERE  `准入类别`='技术服务类' AND `企业名称`='河北昆相环保技术有限公司';
 
-UPDATE `supplier_system_test`.`T_资格预审表` SET `有效期止`='2023年1月26日' WHERE  `准入类别`='物资类' AND `企业名称`='南阳市亚华石油机械有限公司';
+UPDATE `T_资格预审表` SET `有效期止`='2023年1月26日' WHERE  `准入类别`='物资类' AND `企业名称`='南阳市亚华石油机械有限公司';
 
 UPDATE `T_增项` SET `准入类别`='技术服务类' WHERE  `准入类别`='机修类';
 
@@ -27,7 +28,7 @@ DELETE from `T_供方资料_V2014` WHERE `类别` = '';
 UPDATE `T_供方资料_V2014` set `类别` = '银行开户许可证或基本存款账户信息' WHERE `类别` = '开户行许可证' or `类别` = '银行开户许可'  or `类别` = '银行开户许可证'  or `类别` = '开户许可证';
 UPDATE `T_供方资料_V2014` set `类别` = '企业信用信息截屏' WHERE `类别` = '企业信用信息系统截屏';
 UPDATE `T_供方资料_V2014` set `类别` = '诚信合规承诺书' WHERE `类别` = '承诺书';
-UPDATE `T_供方资料_V2014` SET 有效期至=REPLACE(`有效期至`, '/', '-'), 有效期至=REPLACE(`有效期至`, '年', '-'), 有效期至=REPLACE(`有效期至`, '月', '-'), 有效期至=REPLACE(`有效期至`, '日', ''), 日期=REPLACE(`日期`, '/', '-'), 日期=REPLACE(`日期`, '年', '-'), 日期=REPLACE(`日期`, '月', '-'), 日期=REPLACE(`日期`, '日', '')
+UPDATE `T_供方资料_V2014` SET 有效期至=REPLACE(`有效期至`, '/', '-'), 有效期至=REPLACE(`有效期至`, '年', '-'), 有效期至=REPLACE(`有效期至`, '月', '-'), 有效期至=REPLACE(`有效期至`, '日', ''), 日期=REPLACE(`日期`, '/', '-'), 日期=REPLACE(`日期`, '年', '-'), 日期=REPLACE(`日期`, '月', '-'), 日期=REPLACE(`日期`, '日', '');
 UPDATE `T_供方资料_V2014` SET 有效期至 = concat(有效期至, '-01') where (length(有效期至) = 6 or length(有效期至) = 7) and 有效期至 not like '%-';
 UPDATE `T_供方资料_V2014` SET 有效期至 = concat(有效期至, '01') where 有效期至 like '%-';
 UPDATE `T_供方资料_V2014` SET 日期 = '2011-01-01' where 日期 = '2011-0';

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -817,7 +817,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="资质名称" prop="NeedFileType">
-              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" filterable>
+              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" filterable style="width: 100%">
                 <el-option v-for="item in dynamicTableColumns" :key="item.prop" :label="item.label" :value="item.label">
                 </el-option>
               </el-select>

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -1063,7 +1063,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="资质名称" prop="NeedFileType">
-              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" filterable>
+              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" filterable style="width: 100%">
                 <el-option v-for="item in dynamicTableColumns" :key="item.prop" :label="item.label" :value="item.label">
                 </el-option>
               </el-select>

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -808,7 +808,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="资质名称" prop="NeedFileType">
-              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" filterable size="medium">
+              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" filterable size="medium" style="width: 100%">
                 <el-option v-for="item in dynamicTableColumns" :key="item.prop" :label="item.label" :value="item.label">
                 </el-option>
               </el-select>