etc/clients
1
0
Fork 0
Code Issues Pull Requests Releases Activity

git-svn-id: svn://192.168.0.12/source@346 8346c931-da38-4b9b-9d4c-e48b93cbd075

Browse Source
This commit is contained in:
admin
2017-04-14 02:30:18 +00:00
parent 4fa93a7cc4
commit fab5f51c85
12 changed files with 91 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EffectUI/EffectUI.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.2.0, 2017-03-16T03:16:35. -->
<!-- Written by QtCreator 4.2.0, 2017-04-13T14:15:14. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -779,7 +779,7 @@
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">EffectUI</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">EffectUI2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/source/EffectUI2/EffectUI.pro</value>
<value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>

13
EffectUI/scompanylistwidget.cpp
View File

@@ -153,10 +153,15 @@ void SCompanyListWidget::refresh()
}
//select num, name, startdate, enddate from company join company_event_map where company.num = company_event_map.company_num
QString strQuery("select company.num, name, startdate, enddate, "
"count(company_event_map.company_num) as "
"cnt from company inner join company_event_map "
"on company.num = company_event_map.company_num group by company.num");
QString strQuery("select company.num, name, eventgroup.startdate, eventgroup.enddate, "
"count(company_event_map.company_num) as cnt "
"from company "
"inner join company_event_map "
"on company.num = company_event_map.company_num "
"inner join eventgroup "
"on eventgroup.company_num = company.num "
"group by company.num;"
);
QSqlQuery query(db);
if (!query.exec(strQuery))
{

10
EffectUI/scompanyprocess.cpp
View File

@@ -7,6 +7,7 @@
#include <QDate>
#include <QStringList>
#include <QDebug>
#include <iostream>
namespace
{
@@ -100,11 +101,14 @@ void SCompanyProcess::runInit()
}
*/
strQuery = "select company.num, name, startdate, enddate, t.eventgroupnum, "
"t.date, t.url, t.num, t.platformname_num from company "
strQuery = "select company.num, name, eventgroup.startdate, eventgroup.enddate, t.eventgroupnum, "
"t.date, t.url, t.num, t.platformname_num "
"from company "
"join (select company_num, company_event_map.eventgroup_num as eventgroupnum, event.date, event.url, event.num, "
"event.platformname_num from company_event_map join event on company_event_map.event_num = event.num) "
"as t on company.num = t.company_num where company.num in (";
"as t on company.num = t.company_num "
"inner join eventgroup on eventgroup.company_num = company.num "
"where company.num in (";
foreach (auto &num, m_vecRunOrderList)
{

3
EffectUI/sparentprocess.cpp
View File

@@ -137,6 +137,7 @@ QStringList SParentProcess::getProcessArguments(const SEffectRow& _row) const
}
slargv << _row.eventcode << _row.url << _row.company_startdate.toString("yyyy-MM-dd");
return slargv;
}
@@ -154,7 +155,7 @@ void SParentProcess::runProcess(QStringList _arguments)
}
else
{
emit signalLog("x " + m_erCurrentRow.eventcode + " " + m_erCurrentRow.url + "\n[99:99:99] ERROR:NO_PROGRAM");
emit signalLog("x : " + m_erCurrentRow.eventcode + " : " + m_erCurrentRow.url + "\n[99:99:99] ERROR:NO_PROGRAM");
emit signalTerminateEachEvent(m_erCurrentRow.company_num, E_CRAWL_STATE::FAIL);
m_vecError.append(m_erCurrentRow);
setInnerMode(E_INNER_RUN_MODE::MODE_RUN_EVENTCODE);