From 7dd76d103a351caae20261fc7bb67d01bd66e906 Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期三, 28 二月 2024 23:52:02 +0800
Subject: [PATCH] 0228

---
 internal_system_v1/struct_data.h   |  107 +++++++++--------
 internal_system_v1/converinfo2.h   |    2 
 internal_system_v1/converinfo2.cpp |   91 +++++++++++++--
 internal_system_v1/converinfo2.ui  |  142 +++++++++++++++++++++++
 4 files changed, 277 insertions(+), 65 deletions(-)

diff --git a/internal_system_v1/converinfo2.cpp b/internal_system_v1/converinfo2.cpp
index b7cefa2..9160e92 100644
--- a/internal_system_v1/converinfo2.cpp
+++ b/internal_system_v1/converinfo2.cpp
@@ -122,7 +122,7 @@
 
     // 浜屻�佸崟浣嶇粍缁囩粨鏋勬儏鍐�
     ui->comboBox_hasUpLegal->setCurrentText(QString::fromLocal8Bit(curCominfo.hasUpLegal));
-    ui->lineEdit_upCreditCode->setText(curCominfo.upCreditCode);
+    ui->lineEdit_upCreditCode->setText(QString::fromLocal8Bit(curCominfo.upCreditCode));
     ui->lineEdit_oldCreditCode->setText(curCominfo.oldCreditCode);
     ui->lineEdit_upName->setText(QString::fromLocal8Bit(curCominfo.upName));
 
@@ -164,6 +164,12 @@
     ui->lineEdit_itNum->setText(QString::number(curCominfo.itNum));
     ui->lineEdit_engineeringNum->setText(QString::number(curCominfo.engineeringNum));
     ui->lineEdit_otherNum->setText(QString::number(curCominfo.otherNum));
+
+    // 鍏朵粬鐨�4涓俊鎭�
+    ui->lineEdit_statisticalConOfficer->setText(QString::fromLocal8Bit(curCominfo.statisticalConOfficer));
+    ui->lineEdit_personFilling->setText(QString::fromLocal8Bit(curCominfo.personFilling));
+    ui->lineEdit_officerTel->setText(QString::fromLocal8Bit(curCominfo.officerTel));
+    ui->lineEdit_fillingDateTime->setText(QString::fromLocal8Bit(curCominfo.fillingDateTime));
 }
 
 void ConverInfo2::readInfo()
@@ -209,9 +215,13 @@
             QAxObject * wb = wbs->querySubObject("Open(QString&)",str);
             //QAxObject* pWorkBook = excel.querySubObject("ActiveWorkBook");
             //QAxObject* pWorkSheets = pWorkBook->querySubObject("Sheets");//鑾峰彇宸ヤ綔琛�
-            QAxObject * shs = wb->querySubObject("Sheets"); // WorkSheets 涔熷彲浠�
-//            QAxObject *checkBoxs = shs->querySubObject("CheckBoxes");
-//            qDebug() << "澶嶉�夋:checkBoxs:" << checkBoxs->asVariant();
+            //QAxObject * shs = wb->querySubObject("Sheets"); // WorkSheets 涔熷彲浠�
+            QAxObject * shs = wb->querySubObject("WorkSheets"); // WorkSheets 涔熷彲浠�
+//            // 鎸囧畾鍗曞厓鏍兼嬁
+//            QAxObject *cell = shs->querySubObject("Cells(int, int)",82,1);
+//            qDebug()<<"Cells:82-0:"<<shs->querySubObject("Cells(int, int)",82,0)->dynamicCall("Value()").toString();
+//            qDebug()<<"Cells:82-1:"<<cell->dynamicCall("Value()").toString();
+
             int cnt = shs->property("Count").toInt();
             qDebug()<<"cnt="<<cnt;
             for(int i=0;i<cnt;++i){
@@ -225,16 +235,16 @@
                 QVariant  val = usedRange->dynamicCall("Value"); // 鎷垮埌浜岀淮琛ㄦ牸
                 QVariantList valRows = val.toList();
                 // 閬嶅巻姣忎竴椤�
-//                for(int i=0;i<rows;++i){
-//                    QVariantList valrow = valRows[i].toList();
-//                    for(int j=0;j<columns;++j){
-//                        QVariant valData = valrow[j];
-//                        if(valData.isValid()){
-//                            qDebug()<<"val:"<< i<< j << valData;
-//                        }
+                for(int i=0;i<rows;++i){
+                    QVariantList valrow = valRows[i].toList();
+                    for(int j=0;j<columns;++j){
+                        QVariant valData = valrow[j];
+                        if(valData.isValid()){
+                            qDebug()<<"val:"<< i<< j << valData;
+                        }
 
-//                    }
-//                }
+                    }
+                }
 
                 // 瀹炰緥鍖栫粨鏋勪綋锛岀劧鍚庢尐涓祴鍊�
                 ComInfo curComInfo;
@@ -636,6 +646,34 @@
                     qDebug()<<"otherNum"<<otherNum;
                 }
 
+                // 鍚庨潰鐨�4涓俊鎭�
+                // 缁熻璐熻矗浜�
+                QVariant statisticalConOfficer = valRows[81].toList().at(1);
+                if(statisticalConOfficer.isValid()){
+                    strcpy(curComInfo.statisticalConOfficer,statisticalConOfficer.toString().toLocal8Bit().data());
+                    qDebug()<<"statisticalConOfficer"<<statisticalConOfficer;
+                }else{
+                    qDebug()<<"statisticalConOfficer fail:"<<name.toString();
+                }
+                // 濉〃浜�
+                QVariant personFilling = valRows[81].toList().at(4);
+                if(personFilling.isValid()){
+                    strcpy(curComInfo.personFilling,personFilling.toString().toLocal8Bit().data());
+                    qDebug()<<"personFilling"<<personFilling;
+                }
+                // 鑱旂郴鐢佃瘽
+                QVariant officerTel = valRows[82].toList().at(1);
+                if(officerTel.isValid()){
+                    strcpy(curComInfo.officerTel,officerTel.toString().toLocal8Bit().data());
+                    qDebug()<<"officerTel"<<officerTel;
+                }
+                // 濉姤鏃ユ湡
+                QVariant fillingDateTime = valRows[82].toList().at(4);
+                if(fillingDateTime.isValid()){
+                    strcpy(curComInfo.fillingDateTime,fillingDateTime.toString().toLocal8Bit().data());
+                    qDebug()<<"fillingDateTime"<<fillingDateTime;
+                }
+
                 // 鏈�鍚庡瓨鍒癿ap涓�
                 m_nameAndComInfos[name.toString()]=curComInfo;
 
@@ -671,3 +709,30 @@
     connect(m_menu->actions().at(0),SIGNAL(triggered(bool)),this,SLOT(deleteInfo()));
     connect(m_menu->actions().at(1),SIGNAL(triggered(bool)),this,SLOT(addInfo()));
 }
+
+void ConverInfo2::on_pushButton_commit_clicked()
+{
+    // 灏嗙紪杈戞鐨勬暟鎹洿鏂板埌map涓拰鏁版嵁搴撲腑锛屽悗鏈熷彲浠ユ洿鏂板埌鏂囦欢涓�
+    // 鍗曚綅鍩烘湰鎯呭喌
+    QString creditCode = ui->lineEdit_creditCode->text();
+    QString name = ui->lineEdit_name->text();
+    QString comType = ui->comboBox_comType->currentText();
+    QString business = ui->lineEdit_business->text();
+    QString businessCode = ui->lineEdit_businessCode->text();
+    QString addr = ui->lineEdit_addr->text();
+    QString areaCode = ui->lineEdit_areaCode->text();
+    QString townCode = ui->lineEdit_townCode->text();
+    QString scale = ui->comboBox_scale->currentText();
+    QString people = ui->lineEdit_people->text();
+    QString representative = ui->lineEdit_representative->text();
+    QString standardType = ui->comboBox_standardType->currentText();
+    QString trunkCode = ui->lineEdit_trunkCode->text();
+    QString fixedTel = ui->lineEdit_fixedTel->text();
+    QString postCode = ui->lineEdit_postCode->text();
+    QString email = ui->lineEdit_email->text();
+    QString webSite = ui->lineEdit_webSite->text();
+
+    // 鍗曚綅缁勭粐缁撴瀯鎯呭喌
+
+
+}
diff --git a/internal_system_v1/converinfo2.h b/internal_system_v1/converinfo2.h
index d539c9d..12d5327 100644
--- a/internal_system_v1/converinfo2.h
+++ b/internal_system_v1/converinfo2.h
@@ -27,6 +27,8 @@
     void deleteInfo();
     void on_treeWidget_doubleClicked(const QModelIndex &index);
 
+    void on_pushButton_commit_clicked();
+
 private:
     Ui::ConverInfo2 *ui;
     QMenu *m_menu;
diff --git a/internal_system_v1/converinfo2.ui b/internal_system_v1/converinfo2.ui
index 6574486..b31378f 100644
--- a/internal_system_v1/converinfo2.ui
+++ b/internal_system_v1/converinfo2.ui
@@ -38,8 +38,8 @@
       <widget class="QWidget" name="scrollAreaWidgetContents">
        <property name="geometry">
         <rect>
-         <x>-15</x>
-         <y>-908</y>
+         <x>0</x>
+         <y>-1097</y>
          <width>1000</width>
          <height>3000</height>
         </rect>
@@ -3365,6 +3365,135 @@
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
+       <widget class="QLineEdit" name="lineEdit_statisticalConOfficer">
+        <property name="geometry">
+         <rect>
+          <x>100</x>
+          <y>1390</y>
+          <width>151</width>
+          <height>21</height>
+         </rect>
+        </property>
+       </widget>
+       <widget class="QLabel" name="label_126">
+        <property name="geometry">
+         <rect>
+          <x>10</x>
+          <y>1390</y>
+          <width>91</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;缁熻璐熻矗浜�&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+       <widget class="QLineEdit" name="lineEdit_officerTel">
+        <property name="geometry">
+         <rect>
+          <x>100</x>
+          <y>1410</y>
+          <width>151</width>
+          <height>21</height>
+         </rect>
+        </property>
+       </widget>
+       <widget class="QLabel" name="label_127">
+        <property name="geometry">
+         <rect>
+          <x>10</x>
+          <y>1410</y>
+          <width>91</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;鑱旂郴鐢佃瘽&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+       <widget class="QLineEdit" name="lineEdit_personFilling">
+        <property name="geometry">
+         <rect>
+          <x>340</x>
+          <y>1390</y>
+          <width>151</width>
+          <height>21</height>
+         </rect>
+        </property>
+       </widget>
+       <widget class="QLabel" name="label_128">
+        <property name="geometry">
+         <rect>
+          <x>250</x>
+          <y>1390</y>
+          <width>91</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;濉〃浜�&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+       <widget class="QLineEdit" name="lineEdit_fillingDateTime">
+        <property name="geometry">
+         <rect>
+          <x>340</x>
+          <y>1410</y>
+          <width>151</width>
+          <height>21</height>
+         </rect>
+        </property>
+       </widget>
+       <widget class="QLabel" name="label_129">
+        <property name="geometry">
+         <rect>
+          <x>250</x>
+          <y>1410</y>
+          <width>91</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;濉〃鏃ユ湡&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+       <widget class="QPushButton" name="pushButton_commit">
+        <property name="geometry">
+         <rect>
+          <x>420</x>
+          <y>1460</y>
+          <width>241</width>
+          <height>41</height>
+         </rect>
+        </property>
+        <property name="text">
+         <string>淇敼鍚庢洿鏂版彁浜�</string>
+        </property>
+       </widget>
        <zorder>label_70</zorder>
        <zorder>label_webSite</zorder>
        <zorder>label_townCode</zorder>
@@ -3551,6 +3680,15 @@
        <zorder>label_125</zorder>
        <zorder>label_228</zorder>
        <zorder>label_229</zorder>
+       <zorder>lineEdit_statisticalConOfficer</zorder>
+       <zorder>label_126</zorder>
+       <zorder>lineEdit_officerTel</zorder>
+       <zorder>label_127</zorder>
+       <zorder>lineEdit_personFilling</zorder>
+       <zorder>label_128</zorder>
+       <zorder>lineEdit_fillingDateTime</zorder>
+       <zorder>label_129</zorder>
+       <zorder>pushButton_commit</zorder>
       </widget>
      </widget>
     </item>
diff --git a/internal_system_v1/struct_data.h b/internal_system_v1/struct_data.h
index af16cc6..93179a0 100644
--- a/internal_system_v1/struct_data.h
+++ b/internal_system_v1/struct_data.h
@@ -4,68 +4,75 @@
 // 鍗曚綅鍩烘湰淇℃伅
 struct ComInfo{
     // 鍩烘湰鎯呭喌
-    char creditCode[64]; // 缁熶竴绀句細淇$敤浠g爜
-    char name[128]; // 鍗曚綅鍚嶇О
-    char comType[64]; // 鏈烘瀯绫诲瀷 鏄竴涓笅鎷夋閫夐」
-    char business[256]; // 涓氬姟娲诲姩
-    char businessCode[32]; // 琛屼笟浠g爜
-    char addr[256]; // 娉ㄥ唽鍦板強鍖哄垝
-    char areaCode[32]; // 鍖哄煙浠g爜
-    char townCode[32]; // 鍩庝埂浠g爜
-    char scale[32]; // 鍗曚綅瑙勬ā 涓嬫媺妗嗛�夐」
+    char creditCode[64]={0}; // 缁熶竴绀句細淇$敤浠g爜
+    char name[128]={0}; // 鍗曚綅鍚嶇О
+    char comType[64]={0}; // 鏈烘瀯绫诲瀷 鏄竴涓笅鎷夋閫夐」
+    char business[256]={0}; // 涓氬姟娲诲姩
+    char businessCode[32]={0}; // 琛屼笟浠g爜
+    char addr[256]={0}; // 娉ㄥ唽鍦板強鍖哄垝
+    char areaCode[32]={0}; // 鍖哄煙浠g爜
+    char townCode[32]={0}; // 鍩庝埂浠g爜
+    char scale[32]={0}; // 鍗曚綅瑙勬ā 涓嬫媺妗嗛�夐」
     int people; // 浠庝笟浜哄憳鏁伴噺
-    char representative[32]; // 娉曚汉
-    char standardType[32]; // 鎵ц浼氳鏍囧噯绫诲埆
-    char trunkCode[32]; // 闀块�斿尯鍙�
-    char fixedTel[32]; // 鍥哄畾鐢佃瘽
-    char postCode[32]; // 閭斂缂栫爜
-    char email[32]; // 鐢靛瓙閭
-    char webSite[128]; // 缃戝潃
+    char representative[32]={0}; // 娉曚汉
+    char standardType[32]={0}; // 鎵ц浼氳鏍囧噯绫诲埆
+    char trunkCode[32]={0}; // 闀块�斿尯鍙�
+    char fixedTel[32]={0}; // 鍥哄畾鐢佃瘽
+    char postCode[32]={0}; // 閭斂缂栫爜
+    char email[32]={0}; // 鐢靛瓙閭
+    char webSite[128]={0}; // 缃戝潃
 
     // 浜屻�佸崟浣嶇粍缁囩粨鏋勬儏鍐�
-    char hasUpLegal[32]; // 鏄惁鏈変笂涓�绾ф硶浜�
-    char upCreditCode[32]; // 涓婁竴绾х粺涓�绀句細淇$敤浠g爜
-    char oldCreditCode[32]; // 鍘熺粍缁囨満鏋勪唬鐮�
-    char upName[128]; // 涓婁竴绾у崟浣嶅悕绉�
+    char hasUpLegal[32]={0}; // 鏄惁鏈変笂涓�绾ф硶浜�
+    char upCreditCode[32]={0}; // 涓婁竴绾х粺涓�绀句細淇$敤浠g爜
+    char oldCreditCode[32]={0}; // 鍘熺粍缁囨満鏋勪唬鐮�
+    char upName[128]={0}; // 涓婁竴绾у崟浣嶅悕绉�
 
     // 鎬诲璁″笀涓庡唴閮ㄥ璁℃満鏋勫熀鏈儏鍐�
-    char hasChiefDesigner[32]; // 鏄惁璁剧疆鎬诲璁″笀
-    char ChiefDesignerLevel[32]; // 鎬诲璁″笀鑱屼綅灞傜骇
-    char employmentMode[32]; // 鎬诲浠昏亴鏂瑰紡
-    char hasSetIntervalAudit[32]; // 鏄惁璁剧疆鍐呭鏈烘瀯
-    char internalName[128]; // 鍐呭鏈烘瀯鍚嶇О
-    char leadingOrganization[32]; // 棰嗗鏈烘瀯
-    char hasSetSeparateIA[32]; // 鏄惁鐙珛璁剧疆鍐呭鏈烘瀯
+    char hasChiefDesigner[32]={0}; // 鏄惁璁剧疆鎬诲璁″笀
+    char ChiefDesignerLevel[32]={0}; // 鎬诲璁″笀鑱屼綅灞傜骇
+    char employmentMode[32]={0}; // 鎬诲浠昏亴鏂瑰紡
+    char hasSetIntervalAudit[32]={0}; // 鏄惁璁剧疆鍐呭鏈烘瀯
+    char internalName[128]={0}; // 鍐呭鏈烘瀯鍚嶇О
+    char leadingOrganization[32]={0}; // 棰嗗鏈烘瀯
+    char hasSetSeparateIA[32]={0}; // 鏄惁鐙珛璁剧疆鍐呭鏈烘瀯
     bool financeDepartment; // 璐㈠姟閮ㄩ棬
     bool legalDepartment; // 娉曞姟閮ㄩ棬
     bool internalConDepart; // 鍐呴儴鎺у埗閮ㄩ棬
     bool disceplineInDepart; // 绾閮ㄩ棬
     bool otherDepart; // 鍏朵粬閮ㄩ棬
-    char intavalAuditLeval[32]; // 鍐呭灞傜骇
+    char intavalAuditLeval[32]={0}; // 鍐呭灞傜骇
 
     // 鍐呴儴瀹¤浜哄憳閰嶅鍩烘湰鎯呭喌
-    int organazationNum; // 缂栧埗鏁伴噺
-    int realNum; // 瀹炴湁浜哄憳鏁�
-    int professionalNum; // 涓撹亴浜哄憳鏁伴噺
-    int CIANum; // 鎷ユ湁CIA浜烘暟
-    int masterNum; // 纭曞+瀛﹀巻浠ヤ笂浜烘暟
-    int undergraduatesNum; // 鏈浜烘暟
-    int juniorNum; // 涓撶鍙婁互涓嬩汉鏁�
-    int seniorNum; // 楂樼骇鑱岀О浜烘暟
-    int intermediateNum; // 涓骇鑱岀О浜烘暟
-    int primaryNum; // 鍒濈骇鑱岀О浜烘暟
-    int noTitleNum; // 鏃犺亴绉颁汉鏁�
-    int upFiftyOldNum; // 50宀佷互涓婁汉鏁�
-    int upThirtyOldNum; // 30-50宀佷汉鏁�
-    int downThirtyOldNum; // 30宀佷互涓嬩汉鏁�
-    int auditNum; // 瀹¤鏁伴噺
-    int accountingNum; // 浼氳鏁伴噺
-    int economyNum; // 缁忔祹鏁伴噺
-    int lawNum; // 娉曞緥鏁伴噺
-    int managerNum; // 绠$悊鏁伴噺
-    int itNum; // 淇℃伅鎶�鏈暟閲�
-    int engineeringNum; // 宸ョ▼鏁伴噺
-    int otherNum; // 鍏朵粬鏁伴噺
+    int organazationNum=0; // 缂栧埗鏁伴噺
+    int realNum=0; // 瀹炴湁浜哄憳鏁�
+    int professionalNum=0; // 涓撹亴浜哄憳鏁伴噺
+    int CIANum=0; // 鎷ユ湁CIA浜烘暟
+    int masterNum=0; // 纭曞+瀛﹀巻浠ヤ笂浜烘暟
+    int undergraduatesNum=0; // 鏈浜烘暟
+    int juniorNum=0; // 涓撶鍙婁互涓嬩汉鏁�
+    int seniorNum=0; // 楂樼骇鑱岀О浜烘暟
+    int intermediateNum=0; // 涓骇鑱岀О浜烘暟
+    int primaryNum=0; // 鍒濈骇鑱岀О浜烘暟
+    int noTitleNum=0; // 鏃犺亴绉颁汉鏁�
+    int upFiftyOldNum=0; // 50宀佷互涓婁汉鏁�
+    int upThirtyOldNum=0; // 30-50宀佷汉鏁�
+    int downThirtyOldNum=0; // 30宀佷互涓嬩汉鏁�
+    int auditNum=0; // 瀹¤鏁伴噺
+    int accountingNum=0; // 浼氳鏁伴噺
+    int economyNum=0; // 缁忔祹鏁伴噺
+    int lawNum=0; // 娉曞緥鏁伴噺
+    int managerNum=0; // 绠$悊鏁伴噺
+    int itNum=0; // 淇℃伅鎶�鏈暟閲�
+    int engineeringNum=0; // 宸ョ▼鏁伴噺
+    int otherNum=0; // 鍏朵粬鏁伴噺
+
+    // 鍚庨潰鐨�4涓俊鎭�
+    char statisticalConOfficer[32]={0}; // 缁熻璐熻矗浜�
+    char personFilling[32]={0}; // 濉〃浜�
+    char officerTel[32]={0}; // 鑱旂郴鐢佃瘽
+    char fillingDateTime[32]={0}; // 濉姤鏃ユ湡
+
 };
 
 #endif // STRUCT_DATA_H

--
Gitblit v1.8.0