From e77bddbba9af4535e0c51058c1708987a5512f0c Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期二, 19 九月 2023 23:21:11 +0800
Subject: [PATCH] 0919-2
---
internal_system_v1/searchinfo.cpp | 35 ++++++--
internal_system_v1/auditworkload.cpp | 8 +-
internal_system_v1/clientmainwindow.h | 2
internal_system_v1/problemnotmoney.cpp | 7 +
internal_system_v1/searchinfo.h | 2
internal_system_v1/auditproject.cpp | 9 +
internal_system_v1/clientmainwindow.cpp | 9 ++
internal_system_v1/punish.cpp | 7 +
internal_system_v1/problemrectification.cpp | 7 +
internal_system_v1/clientmainwindow.ui | 36 +++++++++
internal_system_v1/problemcount.cpp | 7 +
internal_system_v1/auditproject.ui | 27 +++++-
internal_system_v1/problemmoney.cpp | 7 +
internal_system_v1/caseclue.cpp | 7 +
internal_system_v1/searchinfo.ui | 44 +++++++++++
15 files changed, 174 insertions(+), 40 deletions(-)
diff --git a/internal_system_v1/auditproject.cpp b/internal_system_v1/auditproject.cpp
index 98faaef..2c09921 100644
--- a/internal_system_v1/auditproject.cpp
+++ b/internal_system_v1/auditproject.cpp
@@ -4,6 +4,8 @@
#include <QSqlQuery>
extern int g_comId;
+extern QString g_auditDate;
+
AuditProject::AuditProject(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::AuditProject)
@@ -18,6 +20,7 @@
}
ui->tableWidget->setColumnWidth(0,300);
m_comId = g_comId; // 鍗曚綅id
+
}
@@ -49,14 +52,14 @@
QString values = "";
for(int i=0;i<ui->tableWidget->rowCount();++i){
- values += QString("('%1','%2',%3,%4),").arg(ui->tableWidget->item(i,0)->text())
+ values += QString("('%1','%2',%3,%4,'%5'),").arg(ui->tableWidget->item(i,0)->text())
.arg(ui->tableWidget->item(i,1)->text()).arg(ui->tableWidget->item(i,2)->text().toInt())
- .arg(g_comId);
+ .arg(g_comId).arg(g_auditDate);
}
//qDebug()<<values;
values = values.left(values.length()-1);
//qDebug()<<values;
- QString sql = QString("insert into audit_project (kpi_name,code,num,com_id) values %1").arg(values);
+ QString sql = QString("insert into audit_project (kpi_name,code,num,com_id,time) values %1").arg(values);
qDebug()<<sql;
QSqlQuery query;
if(query.exec(sql)){
diff --git a/internal_system_v1/auditproject.ui b/internal_system_v1/auditproject.ui
index 4ef1a3d..a472368 100644
--- a/internal_system_v1/auditproject.ui
+++ b/internal_system_v1/auditproject.ui
@@ -16,11 +16,28 @@
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>瀹¤椤圭洰</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>瀹¤椤圭洰</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item row="1" column="0">
<widget class="QTableWidget" name="tableWidget">
diff --git a/internal_system_v1/auditworkload.cpp b/internal_system_v1/auditworkload.cpp
index 46f7204..611da80 100644
--- a/internal_system_v1/auditworkload.cpp
+++ b/internal_system_v1/auditworkload.cpp
@@ -4,7 +4,7 @@
#include <QSqlQuery>
extern int g_comId;
-
+extern QString g_auditDate;
AuditWorkload::AuditWorkload(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::AuditWorkload)
@@ -23,12 +23,12 @@
{
QString values = "";
for(int i=0;i<ui->tableWidget->rowCount();++i){
- values += QString("('%1','%2',%3,%4),").arg(ui->tableWidget->item(i,0)->text())
+ values += QString("('%1','%2',%3,%4,'%5'),").arg(ui->tableWidget->item(i,0)->text())
.arg(ui->tableWidget->item(i,1)->text()).arg(ui->tableWidget->item(i,2)->text().toInt())
- .arg(g_comId);
+ .arg(g_comId).arg(g_auditDate);
}
values = values.left(values.length()-1);
- QString sql = QString("insert into audit_workload (kpi_name,code,num,com_id) values %1").arg(values);
+ QString sql = QString("insert into audit_workload (kpi_name,code,num,com_id,time) values %1").arg(values);
qDebug()<<sql;
QSqlQuery query;
if(query.exec(sql)){
diff --git a/internal_system_v1/caseclue.cpp b/internal_system_v1/caseclue.cpp
index 0c74352..4b8a34c 100644
--- a/internal_system_v1/caseclue.cpp
+++ b/internal_system_v1/caseclue.cpp
@@ -4,6 +4,7 @@
#include <QSqlQuery>
extern int g_comId;
+extern QString g_auditDate;
CaseClue::CaseClue(QWidget *parent) :
QMainWindow(parent),
@@ -23,13 +24,13 @@
{
QString values = "";
for(int i=0;i<ui->tableWidget->rowCount();++i){
- values += QString("('%1','%2','%3',%4,%5),").arg(ui->tableWidget->item(i,0)->text())
+ values += QString("('%1','%2','%3',%4,%5,'%6'),").arg(ui->tableWidget->item(i,0)->text())
.arg(ui->tableWidget->item(i,1)->text()).arg(ui->tableWidget->item(i,2)->text())
.arg(ui->tableWidget->item(i,3)->text().toInt())
- .arg(g_comId);
+ .arg(g_comId).arg(g_auditDate);
}
values = values.left(values.length()-1);
- QString sql = QString("insert into case_clue (kpi_name,code,unit,num,com_id) values %1").arg(values);
+ QString sql = QString("insert into case_clue (kpi_name,code,unit,num,com_id,time) values %1").arg(values);
qDebug()<<sql;
QSqlQuery query;
if(query.exec(sql)){
diff --git a/internal_system_v1/clientmainwindow.cpp b/internal_system_v1/clientmainwindow.cpp
index 122a61c..ee72cbb 100644
--- a/internal_system_v1/clientmainwindow.cpp
+++ b/internal_system_v1/clientmainwindow.cpp
@@ -7,6 +7,7 @@
#include <QSqlRecord>
extern int g_comId;
+QString g_auditDate;
ClientMainWindow::ClientMainWindow(QWidget *parent) :
QMainWindow(parent),
@@ -14,6 +15,8 @@
{
ui->setupUi(this);
+ ui->dateEdit->setDate(QDate::currentDate());
+ g_auditDate = QDate::currentDate().toString("yyyy-MM-dd");
initUi();
}
@@ -280,3 +283,9 @@
return false;
}
+
+void ClientMainWindow::on_dateEdit_dateChanged(const QDate &date)
+{
+ g_auditDate = date.toString("yyyy-MM-dd");
+ qDebug()<<g_auditDate;
+}
diff --git a/internal_system_v1/clientmainwindow.h b/internal_system_v1/clientmainwindow.h
index e553eb7..66767d4 100644
--- a/internal_system_v1/clientmainwindow.h
+++ b/internal_system_v1/clientmainwindow.h
@@ -55,6 +55,8 @@
void on_pushButton_importExcel_clicked();
+ void on_dateEdit_dateChanged(const QDate &date);
+
signals:
void sendDataToAuditProject(QVariantList);
void sendDataToAuditWorkLoad(QVariantList);
diff --git a/internal_system_v1/clientmainwindow.ui b/internal_system_v1/clientmainwindow.ui
index ac24bd1..02216b0 100644
--- a/internal_system_v1/clientmainwindow.ui
+++ b/internal_system_v1/clientmainwindow.ui
@@ -45,6 +45,42 @@
</widget>
</item>
<item>
+ <widget class="QLabel" name="label">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>瀹¤鏃堕棿</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDateEdit" name="dateEdit">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="dateTime">
+ <datetime>
+ <hour>0</hour>
+ <minute>0</minute>
+ <second>0</second>
+ <year>2023</year>
+ <month>1</month>
+ <day>1</day>
+ </datetime>
+ </property>
+ <property name="calendarPopup">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QPushButton" name="pushButton_auditPro">
<property name="minimumSize">
<size>
diff --git a/internal_system_v1/problemcount.cpp b/internal_system_v1/problemcount.cpp
index ecaae45..1117191 100644
--- a/internal_system_v1/problemcount.cpp
+++ b/internal_system_v1/problemcount.cpp
@@ -6,6 +6,7 @@
#include <QSqlQuery>
extern int g_comId;
+extern QString g_auditDate;
ProblemCount::ProblemCount(QWidget *parent) :
QMainWindow(parent),
@@ -70,13 +71,13 @@
QString values = "";
for(int i=0;i<ui->tableWidget->rowCount();++i){
- values += QString("('%1','%2',%3,'%4',%5),").arg(ui->tableWidget->item(i,0)->text())
+ values += QString("('%1','%2',%3,'%4',%5,'%6'),").arg(ui->tableWidget->item(i,0)->text())
.arg(ui->tableWidget->item(i,1)->text()).arg(ui->tableWidget->item(i,2)->text().toInt())
.arg(ui->tableWidget->item(i,4)->text())
- .arg(g_comId);
+ .arg(g_comId).arg(g_auditDate);
}
values = values.left(values.length()-1);
- QString sql = QString("insert into problem_count (kpi_name,code,num,evidences,com_id) values %1").arg(values);
+ QString sql = QString("insert into problem_count (kpi_name,code,num,evidences,com_id,time) values %1").arg(values);
qDebug()<<sql;
QSqlQuery query;
if(query.exec(sql)){
diff --git a/internal_system_v1/problemmoney.cpp b/internal_system_v1/problemmoney.cpp
index 0abd52f..b55a4fb 100644
--- a/internal_system_v1/problemmoney.cpp
+++ b/internal_system_v1/problemmoney.cpp
@@ -5,6 +5,7 @@
#include <QSqlQuery>
extern int g_comId;
+extern QString g_auditDate;
ProblemMoney::ProblemMoney(QWidget *parent) :
QMainWindow(parent),
@@ -36,13 +37,13 @@
{
QString values = "";
for(int i=0;i<ui->tableWidget->rowCount();++i){
- values += QString("('%1','%2',%3,'%4',%5),").arg(ui->tableWidget->item(i,0)->text())
+ values += QString("('%1','%2',%3,'%4',%5,'%6'),").arg(ui->tableWidget->item(i,0)->text())
.arg(ui->tableWidget->item(i,1)->text()).arg(ui->tableWidget->item(i,2)->text().toInt())
.arg(ui->tableWidget->item(i,4)->text())
- .arg(g_comId);
+ .arg(g_comId).arg(g_auditDate);
}
values = values.left(values.length()-1);
- QString sql = QString("insert into problem_money (kpi_name,code,num,evidences,com_id) values %1").arg(values);
+ QString sql = QString("insert into problem_money (kpi_name,code,num,evidences,com_id,time) values %1").arg(values);
qDebug()<<sql;
QSqlQuery query;
if(query.exec(sql)){
diff --git a/internal_system_v1/problemnotmoney.cpp b/internal_system_v1/problemnotmoney.cpp
index cd322ae..6f07fa2 100644
--- a/internal_system_v1/problemnotmoney.cpp
+++ b/internal_system_v1/problemnotmoney.cpp
@@ -7,6 +7,7 @@
#include <QDebug>
extern int g_comId;
+extern QString g_auditDate;
ProblemNotMoney::ProblemNotMoney(QWidget *parent) :
QMainWindow(parent),
@@ -50,13 +51,13 @@
QString values = "";
for(int i=0;i<ui->tableWidget->rowCount();++i){
- values += QString("('%1','%2',%3,'%4',%5),").arg(ui->tableWidget->item(i,0)->text())
+ values += QString("('%1','%2',%3,'%4',%5,'%6'),").arg(ui->tableWidget->item(i,0)->text())
.arg(ui->tableWidget->item(i,1)->text()).arg(ui->tableWidget->item(i,2)->text().toInt())
.arg(ui->tableWidget->item(i,4)->text())
- .arg(g_comId);
+ .arg(g_comId).arg(g_auditDate);
}
values = values.left(values.length()-1);
- QString sql = QString("insert into problem_no_money (kpi_name,code,num,evidences,com_id) values %1").arg(values);
+ QString sql = QString("insert into problem_no_money (kpi_name,code,num,evidences,com_id,time) values %1").arg(values);
qDebug()<<sql;
QSqlQuery query;
if(query.exec(sql)){
diff --git a/internal_system_v1/problemrectification.cpp b/internal_system_v1/problemrectification.cpp
index 3f47b83..ed5b2dd 100644
--- a/internal_system_v1/problemrectification.cpp
+++ b/internal_system_v1/problemrectification.cpp
@@ -7,6 +7,7 @@
#include <QDebug>
extern int g_comId;
+extern QString g_auditDate;
ProblemRectification::ProblemRectification(QWidget *parent) :
QMainWindow(parent),
@@ -50,13 +51,13 @@
QString values = "";
for(int i=0;i<ui->tableWidget->rowCount();++i){
- values += QString("('%1','%2',%3,'%4',%5),").arg(ui->tableWidget->item(i,0)->text())
+ values += QString("('%1','%2',%3,'%4',%5,'%6'),").arg(ui->tableWidget->item(i,0)->text())
.arg(ui->tableWidget->item(i,1)->text()).arg(ui->tableWidget->item(i,2)->text().toInt())
.arg(ui->tableWidget->item(i,4)->text())
- .arg(g_comId);
+ .arg(g_comId).arg(g_auditDate);
}
values = values.left(values.length()-1);
- QString sql = QString("insert into problem_rectification (kpi_name,code,num,evidences,com_id) values %1").arg(values);
+ QString sql = QString("insert into problem_rectification (kpi_name,code,num,evidences,com_id,time) values %1").arg(values);
qDebug()<<sql;
QSqlQuery query;
if(query.exec(sql)){
diff --git a/internal_system_v1/punish.cpp b/internal_system_v1/punish.cpp
index 67a16a0..3cfa550 100644
--- a/internal_system_v1/punish.cpp
+++ b/internal_system_v1/punish.cpp
@@ -5,6 +5,7 @@
#include <QDebug>
extern int g_comId;
+extern QString g_auditDate;
Punish::Punish(QWidget *parent) :
QMainWindow(parent),
@@ -36,12 +37,12 @@
QString values = "";
for(int i=0;i<ui->tableWidget->rowCount();++i){
- values += QString("('%1','%2',%3,%4),").arg(ui->tableWidget->item(i,0)->text())
+ values += QString("('%1','%2',%3,%4,'%5'),").arg(ui->tableWidget->item(i,0)->text())
.arg(ui->tableWidget->item(i,1)->text()).arg(ui->tableWidget->item(i,2)->text().toInt())
- .arg(g_comId);
+ .arg(g_comId).arg(g_auditDate);
}
values = values.left(values.length()-1);
- QString sql = QString("insert into punish (kpi_name,code,num,com_id) values %1").arg(values);
+ QString sql = QString("insert into punish (kpi_name,code,num,com_id,time) values %1").arg(values);
qDebug()<<sql;
QSqlQuery query;
if(query.exec(sql)){
diff --git a/internal_system_v1/searchinfo.cpp b/internal_system_v1/searchinfo.cpp
index b0aa27e..2dbe44a 100644
--- a/internal_system_v1/searchinfo.cpp
+++ b/internal_system_v1/searchinfo.cpp
@@ -18,12 +18,14 @@
// ui->dateTimeEdit->hide();
// ui->dateTimeEdit_2->hide();
+ ui->dateEdit_end->setDate(QDate::currentDate());
+
m_model = new QStandardItemModel(this);
ui->tableView->setModel(m_model);
ui->tableView->verticalHeader()->setVisible(false); // 闅愯棌琛屽ご
m_model->setColumnCount(5);
QStringList labels;
- labels<<"ID"<<"鎸囨爣鍚嶇О"<<"浠ｇ爜"<<"鏁伴噺"<<"鍏徃缂栧彿";
+ labels<<"ID"<<"鎸囨爣鍚嶇О"<<"浠ｇ爜"<<"鏁伴噺"<<"鍏徃缂栧彿"<<"瀹¤鏃堕棿";
m_model->setHorizontalHeaderLabels(labels);
if(QSqlDatabase::contains("qt_sql_default_connection")){
m_db = QSqlDatabase::addDatabase("qt_sql_default_connection");
@@ -143,7 +145,8 @@
code TEXT,\
num INTEGER,\
evidences TEXT,\
- com_id INTEGER\
+ com_id INTEGER,\
+ time TEXT\
)").arg(tableName);
QSqlQuery query;
if(query.exec(sql))
@@ -161,7 +164,8 @@
kpi_name TEXT,\
code TEXT,\
num INTEGER,\
- com_id INTEGER\
+ com_id INTEGER,\
+ time TEXT\
)").arg(tableName);
QSqlQuery query;
if(query.exec(sql))
@@ -180,7 +184,8 @@
code TEXT,\
unit TEXT,\
num INTEGER,\
- com_id INTEGER\
+ com_id INTEGER,\
+ time TEXT\
)").arg(tableName);
QSqlQuery query;
if(query.exec(sql))
@@ -229,9 +234,9 @@
void SearchInfo::setLabels()
{
QStringList labels,labels2,labels3;
- labels<<"ID"<<"鎸囨爣鍚嶇О"<<"浠ｇ爜"<<"鏁伴噺"<<"鍏徃缂栧彿"<<" ";
- labels2<<"ID"<<"鎸囨爣鍚嶇О"<<"浠ｇ爜"<<"鍗曚綅"<<"鏁伴噺"<<"鍏徃缂栧彿";
- labels3<<"ID"<<"鎸囨爣鍚嶇О"<<"浠ｇ爜"<<"鏁伴噺"<<"浣愯瘉"<<"鍏徃缂栧彿";
+ labels<<"ID"<<"鎸囨爣鍚嶇О"<<"浠ｇ爜"<<"鏁伴噺"<<"鍏徃缂栧彿"<<"瀹¤鏃堕棿"<<" ";
+ labels2<<"ID"<<"鎸囨爣鍚嶇О"<<"浠ｇ爜"<<"鍗曚綅"<<"鏁伴噺"<<"鍏徃缂栧彿"<<"瀹¤鏃堕棿";
+ labels3<<"ID"<<"鎸囨爣鍚嶇О"<<"浠ｇ爜"<<"鏁伴噺"<<"浣愯瘉"<<"鍏徃缂栧彿"<<"瀹¤鏃堕棿";
m_labels["瀹¤椤圭洰"] = labels;
m_labels["鍐呭宸ヤ綔閲�"] = labels;
m_labels["闂閲戦"] = labels3;
@@ -258,7 +263,7 @@
rowCnt++;
m_model->setRowCount(rowCnt);
qDebug()<<query.value(0).toInt();
- for(int i=0;i<6;++i){
+ for(int i=0;i<7;++i){
if(query.value(i).isValid()){
m_model->setItem(rowCnt-1,i,new QStandardItem(query.value(i).toString()));
}
@@ -420,8 +425,7 @@
void SearchInfo::on_comboBox_currentIndexChanged(const QString &arg1)
{
- m_model->setHorizontalHeaderLabels(m_labels[arg1]);
-
+ m_model->setHorizontalHeaderLabels(m_labels[arg1]);
}
void SearchInfo::on_toolButton_seleceExcel_clicked()
@@ -450,3 +454,14 @@
{
ui->comboBox_company->addItem(name);
}
+
+void SearchInfo::on_checkBox_clicked()
+{
+ if(ui->checkBox->isChecked()){
+ ui->dateEdit_begin->setEnabled(true);
+ ui->dateEdit_end->setEnabled(true);
+ }else{
+ ui->dateEdit_begin->setEnabled(false);
+ ui->dateEdit_end->setEnabled(false);
+ }
+}
diff --git a/internal_system_v1/searchinfo.h b/internal_system_v1/searchinfo.h
index 6513d12..134aafb 100644
--- a/internal_system_v1/searchinfo.h
+++ b/internal_system_v1/searchinfo.h
@@ -39,6 +39,8 @@
void addComName(QString name);
+ void on_checkBox_clicked();
+
private:
Ui::SearchInfo *ui;
QSqlDatabase m_db;
diff --git a/internal_system_v1/searchinfo.ui b/internal_system_v1/searchinfo.ui
index b854ea5..9680875 100644
--- a/internal_system_v1/searchinfo.ui
+++ b/internal_system_v1/searchinfo.ui
@@ -73,6 +73,50 @@
</widget>
</item>
<item>
+ <widget class="QDateEdit" name="dateEdit_begin">
+ <property name="dateTime">
+ <datetime>
+ <hour>0</hour>
+ <minute>0</minute>
+ <second>0</second>
+ <year>2023</year>
+ <month>1</month>
+ <day>1</day>
+ </datetime>
+ </property>
+ <property name="calendarPopup">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>鍒�</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDateEdit" name="dateEdit_end">
+ <property name="calendarPopup">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkBox">
+ <property name="text">
+ <string>鏌ヨ鏃堕棿</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="tristate">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
--
Gitblit v1.8.0