'方案字段调整'

QFD/common/SchemePlanManager.h

@@ -86,7 +86,6 @@ public:
 
         int step;                // 步骤编号
         SchemeProcessType type;  // 步骤类型
-        QString name;            // 步骤名称, 这个字段要删掉
 
         /// 数据来源
         /// 导入数据(权重数据或者评估数据)时有效
@@ -99,7 +98,6 @@ public:
         /// 效能分级, 选择灰色聚类算法计算效能评估时用到
         int efficiencyGrades = 4;
 
-        bool isOptional;         // 是否可以选择执行, 这个字段要删掉
         bool isChecked = false;  // 是否选择了执行
         QString createTime;      // 创建时间
         QString updateTime;      // 更新时间

QFD/dbService/SchemeProcessService.cpp

@@ -9,15 +9,14 @@ int SchemeProcessService::AddSchemeProcess(const SchemePlanManager::SchemeProces
     int ret = -1;
     try {
         Transaction t(SqlDBHelper::getDatabase());
-        InsertQuery query = t.insertInto(
-                "t_scheme_process_info(`project_id`, `index_type`, `step`, `type`, `name`, "
-                "`data_source`, `algorithm`,`efficiency_grades`, `is_optional`,`is_checked`, `create_time`)");
+        InsertQuery query =
+                t.insertInto("t_scheme_process_info(`project_id`, `index_type`, `step`, `type`,  "
+                             "`data_source`, `algorithm`,`efficiency_grades`, `is_checked`, `create_time`)");
 
         NonQueryResult result =
                 query.values(schemeProcessInfo.projectId, schemeProcessInfo.indexType, schemeProcessInfo.step,
-                             schemeProcessInfo.type, schemeProcessInfo.name, schemeProcessInfo.dSource,
-                             schemeProcessInfo.algorithm, schemeProcessInfo.efficiencyGrades,
-                             schemeProcessInfo.isChecked, schemeProcessInfo.isOptional,
+                             schemeProcessInfo.type, schemeProcessInfo.dSource, schemeProcessInfo.algorithm,
+                             schemeProcessInfo.efficiencyGrades, schemeProcessInfo.isChecked,
                              QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"))
                         .exec();
         t.commit();
@@ -38,11 +37,9 @@ bool SchemeProcessService::UpdateSchemeProcess(const SchemePlanManager::SchemePr
                 .set("index_type", schemeProcessInfo.indexType)
                 .set("step", schemeProcessInfo.step)
                 .set("type", schemeProcessInfo.type)
-                .set("name", schemeProcessInfo.name)
                 .set("data_source", schemeProcessInfo.dSource)
                 .set("algorithm", schemeProcessInfo.algorithm)
                 .set("efficiency_grades", schemeProcessInfo.efficiencyGrades)
-                .set("is_optional", schemeProcessInfo.isOptional)
                 .set("is_checked", schemeProcessInfo.isChecked)
                 .set("update_time", QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"))
                 .where("id = ?", schemeProcessInfo.id);
@@ -55,14 +52,14 @@ bool SchemeProcessService::UpdateSchemeProcess(const SchemePlanManager::SchemePr
 }
 
 bool SchemeProcessService::QueryAllByProjectIdAndIndexType(
-        QList<SchemePlanManager::SchemeProcessInfo> &schemeProcessInfo)
+        QList<SchemePlanManager::SchemeProcessInfo> &schemeProcessInfo, int projectId, int indexType)
 {
     QSqlDatabase db = SqlDBHelper::getDatabase();
     QSqlQuery query(db);
     bool ret          = false;
-    QString selectSql = QString("SELECT `id`, `project_id`, `index_type`, `step`, `type`, `name`, `data_source`, "
-                                "`algorithm`, `efficiency_grades`, `is_optional`, `is_checked` FROM "
-                                "t_scheme_process_info order by create_time desc");
+    QString selectSql = QString("SELECT `id`, `project_id`, `index_type`, `step`, `type`, `data_source`, "
+                                "`algorithm`, `efficiency_grades`,  `is_checked` FROM "
+                                "t_scheme_process_info where project_id = %1 and index_type =%2  order by step ");
     if (query.exec(selectSql)) {
         while (query.next()) {
             if (query.isNull(0) == false) {
@@ -72,12 +69,10 @@ bool SchemeProcessService::QueryAllByProjectIdAndIndexType(
                 info.indexType        = query.value(2).toInt();
                 info.step             = query.value(3).toInt();
                 info.type             = (SchemePlanManager::SchemeProcessType)query.value(4).toInt();
-                info.name             = query.value(5).toString();
-                info.dSource          = (SchemePlanManager::SchemeDataSource)query.value(6).toInt();
-                info.algorithm        = (SchemePlanManager::Algorithm)query.value(7).toInt();
-                info.efficiencyGrades = query.value(8).toInt();
-                info.isOptional       = query.value(9).toInt();
-                info.isChecked        = query.value(10).toInt();
+                info.dSource          = (SchemePlanManager::SchemeDataSource)query.value(5).toInt();
+                info.algorithm        = (SchemePlanManager::Algorithm)query.value(6).toInt();
+                info.efficiencyGrades = query.value(7).toInt();
+                info.isChecked        = query.value(8).toInt();
                 schemeProcessInfo.append(info);
             }
         }

QFD/dbService/SchemeProcessService.h

@@ -13,7 +13,8 @@ public:
     bool UpdateSchemeProcess(const SchemePlanManager::SchemeProcessInfo &schemeProcessInfo);
 
     //查询所有
-    bool QueryAllByProjectIdAndIndexType(QList<SchemePlanManager::SchemeProcessInfo> &schemeProcessInfo);
+    bool QueryAllByProjectIdAndIndexType(QList<SchemePlanManager::SchemeProcessInfo> &schemeProcessInfo, int projectId,
+                                         int indexType);
 
     //根据id删除
     bool DeleteById(int id);