|
@@ -1712,7 +1712,7 @@ bool DBServiceSet::DeleteEngineerNotInId(int id, QString dbPath)
|
|
|
//////////////////////工程信息表-end////////////////////
|
|
|
|
|
|
//////////////////////用户信息表-start////////////////////
|
|
|
-int DBServiceSet::AddUserInfo(const UserInfo &userInfo)
|
|
|
+int DBServiceSet::AddUserInfo(const QFUser &userInfo)
|
|
|
{
|
|
|
int returnId = -1;
|
|
|
try {
|
|
@@ -1736,7 +1736,7 @@ int DBServiceSet::AddUserInfo(const UserInfo &userInfo)
|
|
|
return returnId;
|
|
|
}
|
|
|
/*暂时用id修改*/
|
|
|
-bool DBServiceSet::UpdateUserInfo(const UserInfo &userInfo)
|
|
|
+bool DBServiceSet::UpdateUserInfo(const QFUser &userInfo)
|
|
|
{
|
|
|
bool ret = false;
|
|
|
try {
|
|
@@ -1790,7 +1790,7 @@ bool DBServiceSet::UpdateUserById(QString userNo, QString password, int id)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool DBServiceSet::QueryUserInfoById(UserInfo *userInfo, int userId)
|
|
|
+bool DBServiceSet::QueryUserInfoById(QFUser *userInfo, int userId)
|
|
|
{
|
|
|
QSqlDatabase db = SqlDBHelper::getDatabase();
|
|
|
QSqlQuery query(db);
|
|
@@ -1807,7 +1807,7 @@ bool DBServiceSet::QueryUserInfoById(UserInfo *userInfo, int userId)
|
|
|
userInfo->userName = query.value(1).toString();
|
|
|
userInfo->userNo = query.value(2).toString();
|
|
|
userInfo->password = query.value(3).toString();
|
|
|
- userInfo->role = static_cast<UserInfo::Role>(query.value(4).toInt());
|
|
|
+ userInfo->role = static_cast<QFUser::Role>(query.value(4).toInt());
|
|
|
userInfo->post = query.value(5).toString();
|
|
|
userInfo->major = query.value(6).toString();
|
|
|
userInfo->workPosition = query.value(7).toString();
|
|
@@ -1825,7 +1825,7 @@ bool DBServiceSet::QueryUserInfoById(UserInfo *userInfo, int userId)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool DBServiceSet::QueryUserInfoByUnserInfo(const UserInfo ¶mInfo, UserInfo &queryInfo)
|
|
|
+bool DBServiceSet::QueryUserInfoByUnserInfo(const QFUser ¶mInfo, QFUser &queryInfo)
|
|
|
{
|
|
|
QSqlDatabase db = SqlDBHelper::getDatabase();
|
|
|
QSqlQuery query(db);
|
|
@@ -1876,7 +1876,7 @@ bool DBServiceSet::QueryUserInfoByUnserInfo(const UserInfo ¶mInfo, UserInfo
|
|
|
return ret;
|
|
|
}
|
|
|
/*获取到用户列表*/
|
|
|
-bool DBServiceSet::QueryUserListByEngineerId(QList<UserInfo *> *userInfoList, int engineerId)
|
|
|
+bool DBServiceSet::QueryUserListByEngineerId(QList<QFUser *> *userInfoList, int engineerId)
|
|
|
{
|
|
|
QSqlDatabase db = SqlDBHelper::getDatabase();
|
|
|
QSqlQuery query(db);
|
|
@@ -1892,12 +1892,12 @@ bool DBServiceSet::QueryUserListByEngineerId(QList<UserInfo *> *userInfoList, in
|
|
|
if (query.exec(selectSql)) {
|
|
|
while (query.next()) {
|
|
|
if (query.isNull(0) == false) {
|
|
|
- UserInfo *userInfo = new UserInfo();
|
|
|
+ QFUser *userInfo = new QFUser();
|
|
|
userInfo->id = query.value(0).toInt();
|
|
|
userInfo->userName = query.value(1).toString();
|
|
|
userInfo->userNo = query.value(2).toString();
|
|
|
userInfo->password = query.value(3).toString();
|
|
|
- userInfo->role = static_cast<UserInfo::Role>(query.value(4).toInt());
|
|
|
+ userInfo->role = static_cast<QFUser::Role>(query.value(4).toInt());
|
|
|
userInfo->post = query.value(5).toString();
|
|
|
userInfo->major = query.value(6).toString();
|
|
|
userInfo->workPosition = query.value(7).toString();
|
|
@@ -1916,7 +1916,7 @@ bool DBServiceSet::QueryUserListByEngineerId(QList<UserInfo *> *userInfoList, in
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool DBServiceSet::QueryUserListByColumnAndColumnValue(QList<UserInfo *> *userInfoList, QString columnName,
|
|
|
+bool DBServiceSet::QueryUserListByColumnAndColumnValue(QList<QFUser *> *userInfoList, QString columnName,
|
|
|
QString columnValue)
|
|
|
{
|
|
|
QSqlDatabase db = SqlDBHelper::getDatabase();
|
|
@@ -1933,12 +1933,12 @@ bool DBServiceSet::QueryUserListByColumnAndColumnValue(QList<UserInfo *> *userIn
|
|
|
if (query.exec(selectSql)) {
|
|
|
while (query.next()) {
|
|
|
if (query.isNull(0) == false) {
|
|
|
- UserInfo *userInfo = new UserInfo();
|
|
|
+ QFUser *userInfo = new QFUser();
|
|
|
userInfo->id = query.value(0).toInt();
|
|
|
userInfo->userName = query.value(1).toString();
|
|
|
userInfo->userNo = query.value(2).toString();
|
|
|
userInfo->password = query.value(3).toString();
|
|
|
- userInfo->role = static_cast<UserInfo::Role>(query.value(4).toInt());
|
|
|
+ userInfo->role = static_cast<QFUser::Role>(query.value(4).toInt());
|
|
|
userInfo->post = query.value(5).toString();
|
|
|
userInfo->major = query.value(6).toString();
|
|
|
userInfo->workPosition = query.value(7).toString();
|
|
@@ -1956,7 +1956,7 @@ bool DBServiceSet::QueryUserListByColumnAndColumnValue(QList<UserInfo *> *userIn
|
|
|
}
|
|
|
return ret;
|
|
|
}
|
|
|
-bool DBServiceSet::QueryUserList(QList<UserInfo *> *userInfoList)
|
|
|
+bool DBServiceSet::QueryUserList(QList<QFUser *> *userInfoList)
|
|
|
{
|
|
|
QSqlDatabase db = SqlDBHelper::getDatabase();
|
|
|
QSqlQuery query(db);
|
|
@@ -1967,12 +1967,12 @@ bool DBServiceSet::QueryUserList(QList<UserInfo *> *userInfoList)
|
|
|
if (query.exec(selectSql)) {
|
|
|
while (query.next()) {
|
|
|
if (query.isNull(0) == false) {
|
|
|
- UserInfo *userInfo = new UserInfo();
|
|
|
+ QFUser *userInfo = new QFUser();
|
|
|
userInfo->id = query.value(0).toInt();
|
|
|
userInfo->userName = query.value(1).toString();
|
|
|
userInfo->userNo = query.value(2).toString();
|
|
|
userInfo->password = query.value(3).toString();
|
|
|
- userInfo->role = static_cast<UserInfo::Role>(query.value(4).toInt());
|
|
|
+ userInfo->role = static_cast<QFUser::Role>(query.value(4).toInt());
|
|
|
userInfo->post = query.value(5).toString();
|
|
|
userInfo->major = query.value(6).toString();
|
|
|
userInfo->workPosition = query.value(7).toString();
|
|
@@ -1991,7 +1991,7 @@ bool DBServiceSet::QueryUserList(QList<UserInfo *> *userInfoList)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool DBServiceSet::QueryUserListNotAdmin(QList<UserInfo *> *userInfoList)
|
|
|
+bool DBServiceSet::QueryUserListNotAdmin(QList<QFUser *> *userInfoList)
|
|
|
{
|
|
|
QSqlDatabase db = SqlDBHelper::getDatabase();
|
|
|
QSqlQuery query(db);
|
|
@@ -2003,12 +2003,12 @@ bool DBServiceSet::QueryUserListNotAdmin(QList<UserInfo *> *userInfoList)
|
|
|
if (query.exec(selectSql)) {
|
|
|
while (query.next()) {
|
|
|
if (query.isNull(0) == false) {
|
|
|
- UserInfo *userInfo = new UserInfo();
|
|
|
+ QFUser *userInfo = new QFUser();
|
|
|
userInfo->id = query.value(0).toInt();
|
|
|
userInfo->userName = query.value(1).toString();
|
|
|
userInfo->userNo = query.value(2).toString();
|
|
|
userInfo->password = query.value(3).toString();
|
|
|
- userInfo->role = static_cast<UserInfo::Role>(query.value(4).toInt());
|
|
|
+ userInfo->role = static_cast<QFUser::Role>(query.value(4).toInt());
|
|
|
userInfo->post = query.value(5).toString();
|
|
|
userInfo->major = query.value(6).toString();
|
|
|
userInfo->workPosition = query.value(7).toString();
|
|
@@ -2061,7 +2061,7 @@ bool DBServiceSet::DeleteUserByRole(int roleType)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool DBServiceSet::QueryUserByNoAndPassword(UserInfo *userInfo, QString userNo, QString password)
|
|
|
+bool DBServiceSet::QueryUserByNoAndPassword(QFUser *userInfo, QString userNo, QString password)
|
|
|
{
|
|
|
QSqlDatabase db = SqlDBHelper::getDatabase();
|
|
|
QSqlQuery query(db);
|
|
@@ -2080,7 +2080,7 @@ bool DBServiceSet::QueryUserByNoAndPassword(UserInfo *userInfo, QString userNo,
|
|
|
userInfo->userName = query.value(1).toString();
|
|
|
userInfo->userNo = query.value(2).toString();
|
|
|
userInfo->password = query.value(3).toString();
|
|
|
- userInfo->role = static_cast<UserInfo::Role>(query.value(4).toInt());
|
|
|
+ userInfo->role = static_cast<QFUser::Role>(query.value(4).toInt());
|
|
|
userInfo->post = query.value(5).toString();
|
|
|
userInfo->major = query.value(6).toString();
|
|
|
userInfo->workPosition = query.value(7).toString();
|
|
@@ -2098,7 +2098,7 @@ bool DBServiceSet::QueryUserByNoAndPassword(UserInfo *userInfo, QString userNo,
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool DBServiceSet::QueryUserByNo(UserInfo *userInfo, QString userNo)
|
|
|
+bool DBServiceSet::QueryUserByNo(QFUser *userInfo, QString userNo)
|
|
|
{
|
|
|
QSqlDatabase db = SqlDBHelper::getDatabase();
|
|
|
QSqlQuery query(db);
|
|
@@ -2116,7 +2116,7 @@ bool DBServiceSet::QueryUserByNo(UserInfo *userInfo, QString userNo)
|
|
|
userInfo->userName = query.value(1).toString();
|
|
|
userInfo->userNo = query.value(2).toString();
|
|
|
userInfo->password = query.value(3).toString();
|
|
|
- userInfo->role = static_cast<UserInfo::Role>(query.value(4).toInt());
|
|
|
+ userInfo->role = static_cast<QFUser::Role>(query.value(4).toInt());
|
|
|
userInfo->post = query.value(5).toString();
|
|
|
userInfo->major = query.value(6).toString();
|
|
|
userInfo->workPosition = query.value(7).toString();
|
|
@@ -2134,7 +2134,7 @@ bool DBServiceSet::QueryUserByNo(UserInfo *userInfo, QString userNo)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool DBServiceSet::QueryUserInfoById2(UserInfo *userInfo, int userId)
|
|
|
+bool DBServiceSet::QueryUserInfoById2(QFUser *userInfo, int userId)
|
|
|
{
|
|
|
QSqlDatabase db = SqlDBHelper::getDatabase2();
|
|
|
QSqlQuery query(db);
|
|
@@ -2152,7 +2152,7 @@ bool DBServiceSet::QueryUserInfoById2(UserInfo *userInfo, int userId)
|
|
|
userInfo->userName = query.value(1).toString();
|
|
|
userInfo->userNo = query.value(2).toString();
|
|
|
userInfo->password = query.value(3).toString();
|
|
|
- userInfo->role = static_cast<UserInfo::Role>(query.value(4).toInt());
|
|
|
+ userInfo->role = static_cast<QFUser::Role>(query.value(4).toInt());
|
|
|
userInfo->post = query.value(5).toString();
|
|
|
userInfo->major = query.value(6).toString();
|
|
|
userInfo->workPosition = query.value(7).toString();
|
|
@@ -2170,7 +2170,7 @@ bool DBServiceSet::QueryUserInfoById2(UserInfo *userInfo, int userId)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool DBServiceSet::UpdateUserInfo2(const UserInfo &userInfo)
|
|
|
+bool DBServiceSet::UpdateUserInfo2(const QFUser &userInfo)
|
|
|
{
|
|
|
bool ret = false;
|
|
|
try {
|
|
@@ -2196,7 +2196,7 @@ bool DBServiceSet::UpdateUserInfo2(const UserInfo &userInfo)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-int DBServiceSet::AddUserInfo2(const UserInfo &userInfo)
|
|
|
+int DBServiceSet::AddUserInfo2(const QFUser &userInfo)
|
|
|
{
|
|
|
int returnId = -1;
|
|
|
try {
|