From aa013c2f4e69e2ba4eb72081dc004d8334d59257 Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期一, 28 十月 2024 23:15:27 +0800
Subject: [PATCH] 1028

---
 internal_system_v1/threemergeproblemlist.cpp |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/internal_system_v1/threemergeproblemlist.cpp b/internal_system_v1/threemergeproblemlist.cpp
index b25ef6b..6e10620 100644
--- a/internal_system_v1/threemergeproblemlist.cpp
+++ b/internal_system_v1/threemergeproblemlist.cpp
@@ -172,7 +172,7 @@
 
 // path 涓烘枃浠跺畬鏁磋矾寰�
 // id涓哄瓙鐩綍鍚嶅瓧
-int ThreeMergeProblemList::saveFile(QString path, QString id,QString &absSavePath)
+int ThreeMergeProblemList::saveFile(QString path, QString id,QString &absSavePath,QString proName)
 {
     // 鏍规嵁id鏉ユ寚瀹氬瓙鐩綍杩涜鏂囦欢鐨勬嫹璐濆拰瀛樺偍
     // 榛樿淇濆瓨鍒板綋鍓峞vidence鐩綍涓嬬殑id瀛愮洰褰曚腑
@@ -182,7 +182,7 @@
         return -1;
     }
 
-    QString curPath = QString("./evidence/%1/").arg(id);
+    QString curPath = QString("./evidence/%1_%2/").arg(id).arg(proName);
     QDir dir;
     if(!dir.exists(curPath)){
         // 鍒欑洿鎺ュ垱寤�
@@ -620,19 +620,20 @@
             QString spath = ui->tableWidget->item(row,17)->text();
             QString tpath = ui->tableWidget->item(row,23)->text();
             QString fid = ui->tableWidget->item(row,0)->text();
-            qDebug()<<"鎷疯礉鏂囦欢:"<<fid<<fpath;
+            QString proName = ui->tableWidget->item(row,7)->text(); // 椤圭洰鍚嶇О
+            qDebug()<<"鎷疯礉鏂囦欢:"<<fid<<proName<<fpath;
 
             QString absSavePath1,absSavePath2,absSavePath3;
 
-            int sflag1 = saveFile(fpath,fid,absSavePath1); // 淇濆瓨绗竴涓�
+            int sflag1 = saveFile(fpath,fid,absSavePath1,proName); // 淇濆瓨绗竴涓�
             if(sflag1==1){
                 ui->tableWidget->setItem(row,13,new QTableWidgetItem(absSavePath1));
             }
-            int sflag2 = saveFile(spath,fid,absSavePath2); // 淇濆瓨绗簩涓�
+            int sflag2 = saveFile(spath,fid,absSavePath2,proName); // 淇濆瓨绗簩涓�
             if(sflag2==1){
                 ui->tableWidget->setItem(row,17,new QTableWidgetItem(absSavePath2));
             }
-            int sflag3 = saveFile(tpath,fid,absSavePath3); // 淇濆瓨绗笁涓�
+            int sflag3 = saveFile(tpath,fid,absSavePath3,proName); // 淇濆瓨绗笁涓�
             if(sflag3==1){
                 ui->tableWidget->setItem(row,23,new QTableWidgetItem(absSavePath3));
             }
@@ -839,19 +840,20 @@
             QString spath = ui->tableWidget->item(i,17)->text();
             QString tpath = ui->tableWidget->item(i,23)->text();
             QString fid = ui->tableWidget->item(i,0)->text();
-            qDebug()<<"鎷疯礉鏂囦欢:"<<fid<<fpath;
+            QString proName = ui->tableWidget->item(i,7)->text(); // 椤圭洰鍚嶇О
+            qDebug()<<"鎷疯礉鏂囦欢:"<<fid<<proName<<fpath;
 
             QString absSavePath1,absSavePath2,absSavePath3;
 
-            int sflag1 = saveFile(fpath,fid,absSavePath1); // 淇濆瓨绗竴涓�
+            int sflag1 = saveFile(fpath,fid,absSavePath1,proName); // 淇濆瓨绗竴涓�
             if(sflag1==1){
                 ui->tableWidget->setItem(i,13,new QTableWidgetItem(absSavePath1));
             }
-            int sflag2 = saveFile(spath,fid,absSavePath2); // 淇濆瓨绗簩涓�
+            int sflag2 = saveFile(spath,fid,absSavePath2,proName); // 淇濆瓨绗簩涓�
             if(sflag2==1){
                 ui->tableWidget->setItem(i,17,new QTableWidgetItem(absSavePath2));
             }
-            int sflag3 = saveFile(tpath,fid,absSavePath3); // 淇濆瓨绗笁涓�
+            int sflag3 = saveFile(tpath,fid,absSavePath3,proName); // 淇濆瓨绗笁涓�
             if(sflag3==1){
                 ui->tableWidget->setItem(i,23,new QTableWidgetItem(absSavePath3));
             }

--
Gitblit v1.8.0