From dfef23453ad106efad95e40cbeaa191d8b3f6961 Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期四, 21 九月 2023 23:07:45 +0800
Subject: [PATCH] 0921

---
 internal_system_v1/searchinfo.cpp           |    5 
 internal_system_v1/problemnotmoney.cpp      |   42 ++++++
 internal_system_v1/problemcount.ui          |   40 ++++++
 internal_system_v1/coverinfo.cpp            |    2 
 目前系统需优化的地方_0920.docx                        |    0 
 internal_system_v1/clientmainwindow.cpp     |    1 
 internal_system_v1/problemcount.h           |    1 
 internal_system_v1/problemrectification.cpp |   42 ++++++
 internal_system_v1/problemrectification.h   |    1 
 internal_system_v1/problemcount.cpp         |   41 ++++++
 internal_system_v1/problemnotmoney.h        |    1 
 internal_system_v1/problemmoney.h           |    1 
 internal_system_v1/problemmoney.cpp         |   45 +++++++
 internal_system_v1/problemmoney.ui          |   60 ++++++++++
 internal_system_v1/problemrectification.ui  |   40 ++++++
 internal_system_v1/problemnotmoney.ui       |   30 +++++
 16 files changed, 348 insertions(+), 4 deletions(-)

diff --git a/internal_system_v1/clientmainwindow.cpp b/internal_system_v1/clientmainwindow.cpp
index 579c8e8..fc02ffa 100644
--- a/internal_system_v1/clientmainwindow.cpp
+++ b/internal_system_v1/clientmainwindow.cpp
@@ -7,6 +7,7 @@
 #include <QSqlRecord>
 
 extern int g_comId;
+extern QString g_dataRootPath;
 QString g_auditDate;
 
 ClientMainWindow::ClientMainWindow(QWidget *parent) :
diff --git a/internal_system_v1/coverinfo.cpp b/internal_system_v1/coverinfo.cpp
index b1eb2ea..c25e5a5 100644
--- a/internal_system_v1/coverinfo.cpp
+++ b/internal_system_v1/coverinfo.cpp
@@ -7,6 +7,7 @@
 #include <QSqlRecord>
 
 int g_comId = 0; // 鍏ㄥ眬鍙橀噺锛屼繚瀛樺崟浣峣d
+QString g_dataRootPath; // 鏁版嵁鐨勬牴鐩綍
 
 CoverInfo::CoverInfo(QWidget *parent) :
     QMainWindow(parent),
@@ -42,6 +43,7 @@
     if(dirRe.exists()){
         dirPath = dirPathRelease;
     }
+    g_dataRootPath = dirPath; // 灏嗘牴鐩綍淇濆瓨璧锋潵
     QStringList list;
     QDirIterator it(dirPath, {"*.xls","*.xlsx"}, QDir::Files | QDir::NoSymLinks | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
     while(it.hasNext())
diff --git a/internal_system_v1/problemcount.cpp b/internal_system_v1/problemcount.cpp
index d7e89e1..bb3497c 100644
--- a/internal_system_v1/problemcount.cpp
+++ b/internal_system_v1/problemcount.cpp
@@ -2,11 +2,13 @@
 #include "ui_problemcount.h"
 #include <QDebug>
 #include <QFileDialog>
+#include <QProcess>
 #include <QPushButton>
 #include <QSqlQuery>
 
 extern int g_comId;
 extern QString g_auditDate;
+extern QString g_dataRootPath;
 
 ProblemCount::ProblemCount(QWidget *parent) :
     QMainWindow(parent),
@@ -22,9 +24,27 @@
             QStringList files = QFileDialog::getOpenFileNames();
             QString str;
             for(auto f:files){
-                str += f + " ";
+                copyFile(f);
+                QString targetPath = g_dataRootPath + QString("/%1/%2").arg(g_comId).arg(f.split("/").back());
+                str += targetPath + " ";
             }
             ui->tableWidget->setItem(i,4,new QTableWidgetItem(str));
+        });
+
+        // 鏌ョ湅浣愯瘉
+        QPushButton *lookBtn = new QPushButton("鏌ョ湅",this);
+        ui->tableWidget->setCellWidget(i,5,lookBtn);
+        connect(lookBtn,&QPushButton::clicked,this,[=]{
+            QStringList files = ui->tableWidget->item(i,4)->text().split(" ");
+            if(files.size() > 0 ){
+                QString f = files.at(0);
+                qDebug()<<"f:"<<f;
+                if(f.size() > 10){
+                    f.replace("/", "\\");    //win32涓嬫浛鎹㈡枩鏉�
+                    QProcess process;
+                    process.startDetached("explorer", QStringList() << QString("/select,") << QString("%1").arg(f));
+                }
+            }
         });
     }
 }
@@ -34,6 +54,25 @@
     delete ui;
 }
 
+void ProblemCount::copyFile(QString path)
+{
+    QStringList paths = path.split("/");
+    QString comPath = g_dataRootPath + QString("/%1").arg(g_comId);
+    QDir comDir(comPath);
+    if(!comDir.exists()){
+        // 鍒涘缓璺緞
+        if(QDir().mkdir(comPath)){
+            qDebug()<<"鍒涘缓鐩綍鎴愬姛:"<<comPath;
+        }
+    }
+    QString targetPath = g_dataRootPath + QString("/%1/%2").arg(g_comId).arg(paths.back());
+    qDebug()<<"targetPath"<<targetPath;
+    if(QFile::copy(path,targetPath)){
+        qDebug()<<"鎴愬姛鎷疯礉:"<<path;
+    }else{
+        qDebug()<<"鎷疯礉澶辫触"<<path;
+    }
+}
 void ProblemCount::on_tableWidget_clicked(const QModelIndex &index)
 {
     qDebug()<<"index"<<index;
diff --git a/internal_system_v1/problemcount.h b/internal_system_v1/problemcount.h
index 3c75f9d..5d5630d 100644
--- a/internal_system_v1/problemcount.h
+++ b/internal_system_v1/problemcount.h
@@ -16,6 +16,7 @@
     explicit ProblemCount(QWidget *parent = 0);
     ~ProblemCount();
 
+    void copyFile(QString path);
 private slots:
     void on_tableWidget_clicked(const QModelIndex &index);
 
diff --git a/internal_system_v1/problemcount.ui b/internal_system_v1/problemcount.ui
index 0b71dbf..9674221 100644
--- a/internal_system_v1/problemcount.ui
+++ b/internal_system_v1/problemcount.ui
@@ -87,6 +87,11 @@
         <string>浣愯瘉璧勬枡</string>
        </property>
       </column>
+      <column>
+       <property name="text">
+        <string>鏌ョ湅浣愯瘉</string>
+       </property>
+      </column>
       <item row="0" column="0">
        <property name="text">
         <string>瀹¤鍙戠幇闂涓暟</string>
@@ -105,6 +110,11 @@
       <item row="0" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="0" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="1" column="0">
@@ -127,6 +137,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="1" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="2" column="0">
        <property name="text">
         <string>闈為噾棰濈被闂涓暟</string>
@@ -145,6 +160,11 @@
       <item row="2" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="2" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="3" column="0">
@@ -167,6 +187,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="3" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="4" column="0">
        <property name="text">
         <string>鍙戝睍瑙勫垝涓庢垬鐣ュ喅绛栨柟闈�</string>
@@ -185,6 +210,11 @@
       <item row="4" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="4" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="5" column="0">
@@ -207,6 +237,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="5" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="6" column="0">
        <property name="text">
         <string>鍏朵粬</string>
@@ -227,6 +262,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="6" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
      </widget>
     </item>
     <item row="2" column="0">
diff --git a/internal_system_v1/problemmoney.cpp b/internal_system_v1/problemmoney.cpp
index b592b42..248bf78 100644
--- a/internal_system_v1/problemmoney.cpp
+++ b/internal_system_v1/problemmoney.cpp
@@ -3,9 +3,12 @@
 #include <QPushButton>
 #include <QDebug>
 #include <QSqlQuery>
+#include <QFile>
+#include <QProcess>
 
 extern int g_comId;
 extern QString g_auditDate;
+extern QString g_dataRootPath;
 
 ProblemMoney::ProblemMoney(QWidget *parent) :
     QMainWindow(parent),
@@ -21,9 +24,27 @@
             QStringList files = QFileDialog::getOpenFileNames();
             QString str;
             for(auto f:files){
-                str += f + " ";
+                copyFile(f);
+                QString targetPath = g_dataRootPath + QString("/%1/%2").arg(g_comId).arg(f.split("/").back());
+                str += targetPath + " ";
             }
             ui->tableWidget->setItem(i,4,new QTableWidgetItem(str));
+        });
+
+        // 鏌ョ湅浣愯瘉
+        QPushButton *lookBtn = new QPushButton("鏌ョ湅",this);
+        ui->tableWidget->setCellWidget(i,5,lookBtn);
+        connect(lookBtn,&QPushButton::clicked,this,[=]{
+            QStringList files = ui->tableWidget->item(i,4)->text().split(" ");
+            if(files.size() > 0 ){
+                QString f = files.at(0);
+                qDebug()<<"f:"<<f;
+                if(f.size() > 10){
+                    f.replace("/", "\\");    //win32涓嬫浛鎹㈡枩鏉�
+                    QProcess process;
+                    process.startDetached("explorer", QStringList() << QString("/select,") << QString("%1").arg(f));
+                }
+            }
         });
     }
 }
@@ -31,6 +52,26 @@
 ProblemMoney::~ProblemMoney()
 {
     delete ui;
+}
+
+void ProblemMoney::copyFile(QString path)
+{
+    QStringList paths = path.split("/");
+    QString comPath = g_dataRootPath + QString("/%1").arg(g_comId);
+    QDir comDir(comPath);
+    if(!comDir.exists()){
+        // 鍒涘缓璺緞
+        if(QDir().mkdir(comPath)){
+            qDebug()<<"鍒涘缓鐩綍鎴愬姛:"<<comPath;
+        }
+    }
+    QString targetPath = g_dataRootPath + QString("/%1/%2").arg(g_comId).arg(paths.back());
+    qDebug()<<"targetPath"<<targetPath;
+    if(QFile::copy(path,targetPath)){
+        qDebug()<<"鎴愬姛鎷疯礉:"<<path;
+    }else{
+        qDebug()<<"鎷疯礉澶辫触"<<path;
+    }
 }
 
 void ProblemMoney::on_pushButton_clicked()
@@ -67,6 +108,8 @@
     }
     // 缁熻
     on_tableWidget_activated(QModelIndex());
+    qDebug()<<"g_dataRootPath"<<g_dataRootPath;
+
 }
 
 void ProblemMoney::on_tableWidget_activated(const QModelIndex &index)
diff --git a/internal_system_v1/problemmoney.h b/internal_system_v1/problemmoney.h
index 4295eaa..f9dd9c4 100644
--- a/internal_system_v1/problemmoney.h
+++ b/internal_system_v1/problemmoney.h
@@ -17,6 +17,7 @@
     explicit ProblemMoney(QWidget *parent = 0);
     ~ProblemMoney();
 
+    void copyFile(QString path);
 private slots:
     void on_pushButton_clicked();
 
diff --git a/internal_system_v1/problemmoney.ui b/internal_system_v1/problemmoney.ui
index eb7d1f3..facfaa5 100644
--- a/internal_system_v1/problemmoney.ui
+++ b/internal_system_v1/problemmoney.ui
@@ -100,6 +100,11 @@
         <string>浣愯瘉璧勬枡</string>
        </property>
       </column>
+      <column>
+       <property name="text">
+        <string>鏌ョ湅浣愯瘉</string>
+       </property>
+      </column>
       <item row="0" column="0">
        <property name="text">
         <string>瀹¤鍙戠幇闂閲戦</string>
@@ -118,6 +123,11 @@
       <item row="0" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="0" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="1" column="0">
@@ -140,6 +150,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="1" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="2" column="0">
        <property name="text">
         <string>鍚堣鎬ч棶棰橀噾棰�</string>
@@ -158,6 +173,11 @@
       <item row="2" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="2" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="3" column="0">
@@ -180,6 +200,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="3" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="4" column="0">
        <property name="text">
         <string>杩濊浣跨敤璧勯噾</string>
@@ -198,6 +223,11 @@
       <item row="4" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="4" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="5" column="0">
@@ -220,6 +250,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="5" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="6" column="0">
        <property name="text">
         <string>鎹熷け娴垂</string>
@@ -238,6 +273,11 @@
       <item row="6" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="6" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="7" column="0">
@@ -260,6 +300,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="7" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="8" column="0">
        <property name="text">
         <string>鍋锋紡绋庤垂</string>
@@ -278,6 +323,11 @@
       <item row="8" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="8" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="9" column="0">
@@ -300,6 +350,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="9" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="10" column="0">
        <property name="text">
         <string>鍏朵粬</string>
@@ -320,6 +375,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="10" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
      </widget>
     </item>
     <item row="0" column="0">
diff --git a/internal_system_v1/problemnotmoney.cpp b/internal_system_v1/problemnotmoney.cpp
index 5c3b0d1..bd03320 100644
--- a/internal_system_v1/problemnotmoney.cpp
+++ b/internal_system_v1/problemnotmoney.cpp
@@ -5,9 +5,11 @@
 #include <QPushButton>
 #include <QSqlQuery>
 #include <QDebug>
+#include <QProcess>
 
 extern int g_comId;
 extern QString g_auditDate;
+extern QString g_dataRootPath;
 
 ProblemNotMoney::ProblemNotMoney(QWidget *parent) :
     QMainWindow(parent),
@@ -23,9 +25,27 @@
             QStringList files = QFileDialog::getOpenFileNames();
             QString str;
             for(auto f:files){
-                str += f + " ";
+                copyFile(f);
+                QString targetPath = g_dataRootPath + QString("/%1/%2").arg(g_comId).arg(f.split("/").back());
+                str += targetPath + " ";
             }
             ui->tableWidget->setItem(i,4,new QTableWidgetItem(str));
+        });
+
+        // 鏌ョ湅浣愯瘉
+        QPushButton *lookBtn = new QPushButton("鏌ョ湅",this);
+        ui->tableWidget->setCellWidget(i,5,lookBtn);
+        connect(lookBtn,&QPushButton::clicked,this,[=]{
+            QStringList files = ui->tableWidget->item(i,4)->text().split(" ");
+            if(files.size() > 0 ){
+                QString f = files.at(0);
+                qDebug()<<"f:"<<f;
+                if(f.size() > 10){
+                    f.replace("/", "\\");    //win32涓嬫浛鎹㈡枩鏉�
+                    QProcess process;
+                    process.startDetached("explorer", QStringList() << QString("/select,") << QString("%1").arg(f));
+                }
+            }
         });
     }
 }
@@ -35,6 +55,26 @@
     delete ui;
 }
 
+void ProblemNotMoney::copyFile(QString path)
+{
+    QStringList paths = path.split("/");
+    QString comPath = g_dataRootPath + QString("/%1").arg(g_comId);
+    QDir comDir(comPath);
+    if(!comDir.exists()){
+        // 鍒涘缓璺緞
+        if(QDir().mkdir(comPath)){
+            qDebug()<<"鍒涘缓鐩綍鎴愬姛:"<<comPath;
+        }
+    }
+    QString targetPath = g_dataRootPath + QString("/%1/%2").arg(g_comId).arg(paths.back());
+    qDebug()<<"targetPath"<<targetPath;
+    if(QFile::copy(path,targetPath)){
+        qDebug()<<"鎴愬姛鎷疯礉:"<<path;
+    }else{
+        qDebug()<<"鎷疯礉澶辫触"<<path;
+    }
+}
+
 void ProblemNotMoney::on_tableWidget_clicked(const QModelIndex &index)
 {
     int allCnt = 0;
diff --git a/internal_system_v1/problemnotmoney.h b/internal_system_v1/problemnotmoney.h
index 686f58c..3c0b125 100644
--- a/internal_system_v1/problemnotmoney.h
+++ b/internal_system_v1/problemnotmoney.h
@@ -16,6 +16,7 @@
     explicit ProblemNotMoney(QWidget *parent = 0);
     ~ProblemNotMoney();
 
+    void copyFile(QString path);
 private slots:
     void on_tableWidget_clicked(const QModelIndex &index);
 
diff --git a/internal_system_v1/problemnotmoney.ui b/internal_system_v1/problemnotmoney.ui
index a4c003c..924d66d 100644
--- a/internal_system_v1/problemnotmoney.ui
+++ b/internal_system_v1/problemnotmoney.ui
@@ -77,6 +77,11 @@
         <string>浣愯瘉璧勬枡</string>
        </property>
       </column>
+      <column>
+       <property name="text">
+        <string>鏌ョ湅浣愯瘉</string>
+       </property>
+      </column>
       <item row="0" column="0">
        <property name="text">
         <string>瀹¤鍙戠幇闂鏁存敼锛堥潪閲戦绫伙級</string>
@@ -95,6 +100,11 @@
       <item row="0" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="0" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="1" column="0">
@@ -117,6 +127,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="1" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="2" column="0">
        <property name="text">
         <string>淇瀹屽杽鍒跺害</string>
@@ -135,6 +150,11 @@
       <item row="2" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="2" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="3" column="0">
@@ -157,6 +177,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="3" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="4" column="0">
        <property name="text">
         <string>鍏朵粬</string>
@@ -177,6 +202,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="4" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
      </widget>
     </item>
     <item row="2" column="0">
diff --git a/internal_system_v1/problemrectification.cpp b/internal_system_v1/problemrectification.cpp
index 43cdd79..99121d2 100644
--- a/internal_system_v1/problemrectification.cpp
+++ b/internal_system_v1/problemrectification.cpp
@@ -5,9 +5,11 @@
 #include <QPushButton>
 #include <QSqlQuery>
 #include <QDebug>
+#include <QProcess>
 
 extern int g_comId;
 extern QString g_auditDate;
+extern QString g_dataRootPath;
 
 ProblemRectification::ProblemRectification(QWidget *parent) :
     QMainWindow(parent),
@@ -23,9 +25,27 @@
             QStringList files = QFileDialog::getOpenFileNames();
             QString str;
             for(auto f:files){
-                str += f + " ";
+                copyFile(f);
+                QString targetPath = g_dataRootPath + QString("/%1/%2").arg(g_comId).arg(f.split("/").back());
+                str += targetPath + " ";
             }
             ui->tableWidget->setItem(i,4,new QTableWidgetItem(str));
+        });
+
+        // 鏌ョ湅浣愯瘉
+        QPushButton *lookBtn = new QPushButton("鏌ョ湅",this);
+        ui->tableWidget->setCellWidget(i,5,lookBtn);
+        connect(lookBtn,&QPushButton::clicked,this,[=]{
+            QStringList files = ui->tableWidget->item(i,4)->text().split(" ");
+            if(files.size() > 0 ){
+                QString f = files.at(0);
+                qDebug()<<"f:"<<f;
+                if(f.size() > 10){
+                    f.replace("/", "\\");    //win32涓嬫浛鎹㈡枩鏉�
+                    QProcess process;
+                    process.startDetached("explorer", QStringList() << QString("/select,") << QString("%1").arg(f));
+                }
+            }
         });
     }
 }
@@ -35,6 +55,26 @@
     delete ui;
 }
 
+void ProblemRectification::copyFile(QString path)
+{
+    QStringList paths = path.split("/");
+    QString comPath = g_dataRootPath + QString("/%1").arg(g_comId);
+    QDir comDir(comPath);
+    if(!comDir.exists()){
+        // 鍒涘缓璺緞
+        if(QDir().mkdir(comPath)){
+            qDebug()<<"鍒涘缓鐩綍鎴愬姛:"<<comPath;
+        }
+    }
+    QString targetPath = g_dataRootPath + QString("/%1/%2").arg(g_comId).arg(paths.back());
+    qDebug()<<"targetPath"<<targetPath;
+    if(QFile::copy(path,targetPath)){
+        qDebug()<<"鎴愬姛鎷疯礉:"<<path;
+    }else{
+        qDebug()<<"鎷疯礉澶辫触"<<path;
+    }
+}
+
 void ProblemRectification::on_tableWidget_clicked(const QModelIndex &index)
 {
     double allCnt = 0;
diff --git a/internal_system_v1/problemrectification.h b/internal_system_v1/problemrectification.h
index b704ed4..6c8ac37 100644
--- a/internal_system_v1/problemrectification.h
+++ b/internal_system_v1/problemrectification.h
@@ -16,6 +16,7 @@
     explicit ProblemRectification(QWidget *parent = 0);
     ~ProblemRectification();
 
+    void copyFile(QString path);
 private slots:
     void on_tableWidget_clicked(const QModelIndex &index);
 
diff --git a/internal_system_v1/problemrectification.ui b/internal_system_v1/problemrectification.ui
index c80277e..0905c3c 100644
--- a/internal_system_v1/problemrectification.ui
+++ b/internal_system_v1/problemrectification.ui
@@ -87,6 +87,11 @@
         <string>浣愯瘉璧勬枡</string>
        </property>
       </column>
+      <column>
+       <property name="text">
+        <string>鏌ョ湅浣愯瘉</string>
+       </property>
+      </column>
       <item row="0" column="0">
        <property name="text">
         <string>瀹¤鍙戠幇闂鏁存敼锛堥噾棰濈被锛�</string>
@@ -105,6 +110,11 @@
       <item row="0" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="0" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="1" column="0">
@@ -127,6 +137,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="1" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="2" column="0">
        <property name="text">
         <string>鏀跺洖璧勯噾</string>
@@ -145,6 +160,11 @@
       <item row="2" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="2" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="3" column="0">
@@ -167,6 +187,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="3" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="4" column="0">
        <property name="text">
         <string>褰掕繕鍘熻祫閲戞笭閬�</string>
@@ -185,6 +210,11 @@
       <item row="4" column="4">
        <property name="text">
         <string>鏃�</string>
+       </property>
+      </item>
+      <item row="4" column="5">
+       <property name="text">
+        <string>0</string>
        </property>
       </item>
       <item row="5" column="0">
@@ -207,6 +237,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="5" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
       <item row="6" column="0">
        <property name="text">
         <string>鍏朵粬</string>
@@ -227,6 +262,11 @@
         <string>鏃�</string>
        </property>
       </item>
+      <item row="6" column="5">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </item>
      </widget>
     </item>
     <item row="2" column="0">
diff --git a/internal_system_v1/searchinfo.cpp b/internal_system_v1/searchinfo.cpp
index 2dbe44a..95fb771 100644
--- a/internal_system_v1/searchinfo.cpp
+++ b/internal_system_v1/searchinfo.cpp
@@ -253,6 +253,11 @@
     QString item = ui->comboBox->currentText();
     QString comName = ui->comboBox_company->currentText();
     QString sql = QString("select * from %1 where com_id=%2").arg(m_itemAndTable[item]).arg(m_comInfo[comName]);
+    if(ui->checkBox->isChecked()){ // 鍕鹃�変箣鍚�
+        sql = QString("select * from %1 where com_id=%2 and time between '%3' and '%4'").arg(m_itemAndTable[item]).arg(m_comInfo[comName])
+                .arg(ui->dateEdit_begin->date().toString("yyyy-MM-dd"))
+                .arg(ui->dateEdit_end->date().toString("yyyy-MM-dd"));
+    }
     qDebug()<<__FUNCTION__<<sql;
     QSqlQuery query;
     if(query.exec(sql)){
diff --git "a/\347\233\256\345\211\215\347\263\273\347\273\237\351\234\200\344\274\230\345\214\226\347\232\204\345\234\260\346\226\271_0920.docx" "b/\347\233\256\345\211\215\347\263\273\347\273\237\351\234\200\344\274\230\345\214\226\347\232\204\345\234\260\346\226\271_0920.docx"
index 7df7e38..9cfe1bd 100644
--- "a/\347\233\256\345\211\215\347\263\273\347\273\237\351\234\200\344\274\230\345\214\226\347\232\204\345\234\260\346\226\271_0920.docx"
+++ "b/\347\233\256\345\211\215\347\263\273\347\273\237\351\234\200\344\274\230\345\214\226\347\232\204\345\234\260\346\226\271_0920.docx"
Binary files differ

--
Gitblit v1.8.0