浏览代码

update: rename publish project fields

Yao 1 周之前
父节点
当前提交
f2509d3d5d

+ 3 - 3
blastProject/blastprojectpage.cpp

@@ -254,9 +254,9 @@ void BlastProjectPage::publishAllPendingBlastProjects() {
     for (const auto &projectPtr : projectsReg) {
         if (projectPtr) {
             QJsonObject projectJson = projectPtr->ProjectToJson(*projectPtr);
-            projectJson["underground_blasters"] = getUserInfoByIds(projectPtr->getBlasterIdentity().split(","));
-            projectJson["ground_blasters"] = getUserInfoByIds(projectPtr->getOperatorIdentity().split(","));
-            projectJson["safety_inspectors"] = getUserInfoByIds(projectPtr->getSafetyInspectorIdentity().split(","));
+            projectJson["undergroundBlasters"] = getUserInfoByIds(projectPtr->getBlasterIdentity().split(","));
+            projectJson["groundBlasters"] = getUserInfoByIds(projectPtr->getOperatorIdentity().split(","));
+            // projectJson["safetyInspectors"] = getUserInfoByIds(projectPtr->getSafetyInspectorIdentity().split(","));
             jsonArray.append(projectJson);
         }
     }

+ 3 - 3
blastProject/hproject.cpp

@@ -103,9 +103,9 @@ QJsonObject HProject::ProjectToJson(const HProject &project) {
     jsonObject["companyCode"] = project.getCompanyCode();
     jsonObject["detSum"] = project.getDetSum();
     jsonObject["address"] = project.getAddressUuid();
-    jsonObject["blasterIdentity"] = project.getBlasterIdentity();
-    jsonObject["operatorIdentity"] = project.getOperatorIdentity();
-    jsonObject["safetyInspectorIdentity"] = project.getSafetyInspectorIdentity();
+    //jsonObject["blasterIdentity"] = project.getBlasterIdentity();
+    //jsonObject["operatorIdentity"] = project.getOperatorIdentity();
+    //jsonObject["safetyInspectorIdentity"] = project.getSafetyInspectorIdentity();
     jsonObject["level4Address"] = project.getLevel4Address();
     jsonObject["blastCount"] = project.getBlastCount();
 

+ 0 - 0
blastProject/safetyinspectordialog.cpp


+ 0 - 0
blastProject/safetyinspectordialog.h


+ 0 - 0
blastProject/safetyinspectordialog.ui