实现方式修改

Winsoft.GOV.Framework/BranchPosition.sql

@@ -0,0 +1,68 @@
+UPDATE branch SET Position=500 WHERE ShortName='丽水中等专业学校';
+UPDATE branch SET Position=999 WHERE ShortName='丽水公交公司';
+UPDATE branch SET Position=999 WHERE ShortName='丽水华数公司';
+UPDATE branch SET Position=999 WHERE ShortName='丽水天然气公司';
+UPDATE branch SET Position=999 WHERE ShortName='丽水学院';
+UPDATE branch SET Position=999 WHERE ShortName='市中介机构';
+UPDATE branch SET Position=15 WHERE ShortName='市交通运输局';
+UPDATE branch SET Position=12 WHERE ShortName='市人力社保局';
+UPDATE branch SET Position=999 WHERE ShortName='市供排水公司';
+UPDATE branch SET Position=103 WHERE ShortName='开发区公安分局';
+UPDATE branch SET Position=999 WHERE ShortName='市公路管理局';
+UPDATE branch SET Position=20 WHERE ShortName='市卫生局';
+UPDATE branch SET Position=2 WHERE ShortName='市发改委';
+UPDATE branch SET Position=999 WHERE ShortName='市国安局';
+UPDATE branch SET Position=11 WHERE ShortName='市地税局';
+UPDATE branch SET Position=31 WHERE ShortName='市人防办';
+UPDATE branch SET Position=203 WHERE ShortName='市体育局';
+UPDATE branch SET Position=204 WHERE ShortName='市供销社';
+UPDATE branch SET Position=999 WHERE ShortName='市信访局';
+UPDATE branch SET Position=7 WHERE ShortName='市公安局';
+UPDATE branch SET Position=206 WHERE ShortName='市公积金中心';
+UPDATE branch SET Position=17 WHERE ShortName='市农业局';
+UPDATE branch SET Position=31 WHERE ShortName='市台办';
+UPDATE branch SET Position=10 WHERE ShortName='市司法局';
+UPDATE branch SET Position=18 WHERE ShortName='市商务局';
+UPDATE branch SET Position=13 WHERE ShortName='市国土局';
+UPDATE branch SET Position=27 WHERE ShortName='市城管局';
+UPDATE branch SET Position=26 WHERE ShortName='市外侨办';
+UPDATE branch SET Position=28 WHERE ShortName='市安监局';
+UPDATE branch SET Position=101 WHERE ShortName='市审批中心';
+UPDATE branch SET Position=21 WHERE ShortName='市审计局';
+UPDATE branch SET Position=29 WHERE ShortName='市市场监管局';
+UPDATE branch SET Position=999 WHERE ShortName='市广电总台';
+UPDATE branch SET Position=14 WHERE ShortName='市建设局';
+UPDATE branch SET Position=31 WHERE ShortName='市政府法制办';
+UPDATE branch SET Position=25 WHERE ShortName='市旅游局';
+UPDATE branch SET Position=24 WHERE ShortName='市林业局';
+UPDATE branch SET Position=32 WHERE ShortName='市档案局';
+UPDATE branch SET Position=999 WHERE ShortName='市残联';
+UPDATE branch SET Position=6 WHERE ShortName='市民宗局';
+UPDATE branch SET Position=999 WHERE ShortName='市气象局';
+UPDATE branch SET Position=16 WHERE ShortName='市水利局';
+UPDATE branch SET Position=999 WHERE ShortName='市烟草局';
+UPDATE branch SET Position=22 WHERE ShortName='市环保局';
+UPDATE branch SET Position=5 WHERE ShortName='市科技局';
+UPDATE branch SET Position=209 WHERE ShortName='市经合办';
+UPDATE branch SET Position=3 WHERE ShortName='市经信委';
+UPDATE branch SET Position=999 WHERE ShortName='开发区散装水泥办';
+UPDATE branch SET Position=30 WHERE ShortName='市质监局';
+UPDATE branch SET Position=999 WHERE ShortName='市运管局';
+UPDATE branch SET Position=205 WHERE ShortName='市金融办';
+UPDATE branch SET Position=4 WHERE ShortName='市教育局';
+UPDATE branch SET Position=19 WHERE ShortName='市文广出版局';
+UPDATE branch SET Position=999 WHERE ShortName='市检验检测院';
+UPDATE branch SET Position=9 WHERE ShortName='市民政局';
+UPDATE branch SET Position=999 WHERE ShortName='市港航管理局';
+UPDATE branch SET Position=11 WHERE ShortName='市税务局';
+UPDATE branch SET Position=23 WHERE ShortName='市统计局';
+UPDATE branch SET Position=31 WHERE ShortName='市编委办';
+UPDATE branch SET Position=11 WHERE ShortName='市财政局';
+UPDATE branch SET Position=999 WHERE ShortName='丽水电大';
+UPDATE branch SET Position=999 WHERE ShortName='丽水日报社';
+UPDATE branch SET Position=999 WHERE ShortName='丽水职技院';
+UPDATE branch SET Position=999 WHERE ShortName='党史方志办';
+UPDATE branch SET Position=999 WHERE ShortName='丽水供电公司';
+UPDATE branch SET Position=210 WHERE ShortName='市农科院';
+UPDATE branch SET Position=211 WHERE ShortName='市林科院';
+UPDATE branch SET Position=102 WHERE ShortName='开发区管委会';

Winsoft.GOV.Framework/Provider/BranchProvider.cs

@@ -50,7 +50,7 @@ namespace Winsoft.GOV.Framework.Provider
 
         public IEnumerable<Branch> FindAll()
         {
-            const string sql = "select * from branch";
+            const string sql = "select * from branch order by position";
             using (IDbConnection connection = GetDbConnection())
             {
                 return connection.Query<Branch>(sql);
@@ -59,7 +59,7 @@ namespace Winsoft.GOV.Framework.Provider
 
         public IEnumerable<Branch> FindOnceRunBranch()
         {
-            const string sql = "select * from branch where guid in (select ouguid from oncerunpowermatters group by ouguid)";
+            const string sql = "select ouguid as guid, ql_dep as ShortName from oncerunpowermatters group by ouguid, ql_dep order by ouguid";
             using (IDbConnection connection = GetDbConnection())
             {
                 return connection.Query<Branch>(sql);
@@ -68,23 +68,28 @@ namespace Winsoft.GOV.Framework.Provider
 
         public IEnumerable<Branch> FindByApplyType(int type)
         {
-            if (type > -1 && type < ApplyType.Names.Length)
+            string sql = "(select QL_DEP as ShortName, OUGUID as guid from PowerMatterType where ApplyCode = @applyCode group by OUGUID, QL_DEP order by ouguid)";
+            using (IDbConnection connection = GetDbConnection())
             {
-                
-                string sql = "(select QL_DEP as ShortName, OUGUID as guid from PowerMatterType where ApplyCode = @applyCode group by OUGUID, QL_DEP)";
-                using (IDbConnection connection = GetDbConnection())
-                {
-                    return connection.Query<Branch>(sql, new { applyCode = type });
-                }
+                return connection.Query<Branch>(sql, new { applyCode = type });
             }
-            else
-            {
-                string sql = "select QL_DEP as ShortName, OUGUID as guid from OnceRunPowerMatters where ql_inner_code not in (select ql_inner_code from PowerMatterType)  group by OUGUID, ql_dep";
-                using (IDbConnection connection = GetDbConnection())
-                {
-                    return connection.Query<Branch>(sql);
-                }
-            }            
+            //if (type > -1 && type < ApplyType.Names.Length)
+            //{
+                
+            //    string sql = "(select QL_DEP as ShortName, OUGUID as guid from PowerMatterType where ApplyCode = @applyCode group by OUGUID, QL_DEP)";
+            //    using (IDbConnection connection = GetDbConnection())
+            //    {
+            //        return connection.Query<Branch>(sql, new { applyCode = type });
+            //    }
+            //}
+            //else
+            //{
+            //    string sql = "select QL_DEP as ShortName, OUGUID as guid from OnceRunPowerMatters where ql_inner_code not in (select ql_inner_code from PowerMatterType)  group by OUGUID, ql_dep";
+            //    using (IDbConnection connection = GetDbConnection())
+            //    {
+            //        return connection.Query<Branch>(sql);
+            //    }
+            //}            
         }
     }
 }

Winsoft.GOV.Framework/Provider/OnceRunPowerMattersProvider.cs

@@ -78,6 +78,30 @@ namespace Winsoft.GOV.Framework.Provider
             }
         }
 
+        public void Insert(PowerMattersBase p)
+        {
+            string select = "select count(*) from OnceRunPowerMatters where QL_INNER_CODE=@QL_INNER_CODE and OUGUID=@OUGUID;";
+            string update = "update OnceRunPowerMatters set QL_NAME=@QL_NAME, QL_DEP=@QL_DEP where QL_INNER_CODE=@QL_INNER_CODE and OUGUID=@OUGUID;";
+            string insert = "delete from OnceRunPowerMatters where QL_INNER_CODE=@QL_INNER_CODE and OUGUID=@OUGUID; "
+                + "insert OnceRunPowerMatters(QL_NAME, QL_INNER_CODE, OUGUID, QL_DEP) values(@QL_NAME, @QL_INNER_CODE, @OUGUID, @QL_DEP);";
+
+            using (var conn = GetDbConnection())
+            {
+                try
+                {
+                    //int count = conn.QueryFirstOrDefault<int>(select, p);
+                    //if (count <= 0)
+                    conn.Execute(insert, p);
+                    //else
+                    //    conn.Execute(update, p);
+                }
+                catch (Exception e)
+                {
+
+                }
+            }
+        }
+
         public PowerMattersBase FindByQLNameAndOUORGCODE(string ql_name, string ouguid)
         {
             string sql = "select  " + cols + " from OnceRunPowerMatters where ql_name=@ql_name and ouguid=@ouguid";
@@ -99,22 +123,28 @@ namespace Winsoft.GOV.Framework.Provider
 
         public IEnumerable<PowerMattersBase> FindByBranchGUIDAndApplyType(string guid, int type)
         {
-            if (type > -1 && type < ApplyType.Names.Length)
-            {
-                string sql = "select " + cols + " from oncerunpowermatters where ouguid=@ouguid and QL_INNER_CODE in (SELECT QL_INNER_CODE FROM powerMatterType WHERE ouguid=@ouguid and ApplyCode=@code)";
-                using (IDbConnection connection = GetDbConnection())
-                {
-                    return connection.Query<PowerMattersBase>(sql, new { code = type, ouguid = guid });
-                }
-            }
-            else
+
+            string sql = " SELECT QL_INNER_CODE, QL_NAME FROM powerMatterType WHERE ouguid=@ouguid and ApplyCode=@code";
+            using (IDbConnection connection = GetDbConnection())
             {
-                string sql = "select " + cols + " from oncerunpowermatters where ouguid=@ouguid and QL_INNER_CODE not in (SELECT QL_INNER_CODE FROM powerMatterType WHERE ouguid=@ouguid)";
-                using (IDbConnection connection = GetDbConnection())
-                {
-                    return connection.Query<PowerMattersBase>(sql, new { ouguid = guid });
-                }
+                return connection.Query<PowerMattersBase>(sql, new { code = type, ouguid = guid });
             }
+            //if (type > -1 && type < ApplyType.Names.Length)
+            //{
+            //    string sql = "select " + cols + " from oncerunpowermatters where ouguid=@ouguid and QL_INNER_CODE in (SELECT QL_INNER_CODE FROM powerMatterType WHERE ouguid=@ouguid and ApplyCode=@code)";
+            //    using (IDbConnection connection = GetDbConnection())
+            //    {
+            //        return connection.Query<PowerMattersBase>(sql, new { code = type, ouguid = guid });
+            //    }
+            //}
+            //else
+            //{
+            //    string sql = "select " + cols + " from oncerunpowermatters where ouguid=@ouguid and QL_INNER_CODE not in (SELECT QL_INNER_CODE FROM powerMatterType WHERE ouguid=@ouguid)";
+            //    using (IDbConnection connection = GetDbConnection())
+            //    {
+            //        return connection.Query<PowerMattersBase>(sql, new { ouguid = guid });
+            //    }
+            //}
         }
     }
 }

Winsoft.GOV.Framework/Provider/PowerMatterTypeProvider.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Winsoft.GOV.Framework.Model;
 using Dapper;
 using MySql.Data.MySqlClient;
+using System.Security.Cryptography;
 
 namespace Winsoft.GOV.Framework.Provider
 {
@@ -73,10 +74,16 @@ namespace Winsoft.GOV.Framework.Provider
                     if (p2 != null)
                     {
                         p.QL_INNER_CODE = p2.QL_INNER_CODE;
-                        con.Execute(sql, p);
                     }
                     else
-                        failslist.Add(p);
+                    {
+                        byte[] result = Encoding.Default.GetBytes(p.QL_NAME.Trim());    //tbPass为输入密码的文本框  
+                        MD5 md5 = new MD5CryptoServiceProvider();
+                        byte[] output = md5.ComputeHash(result);
+                        p.QL_INNER_CODE = BitConverter.ToString(output);
+                        OnceRunPowerMattersProvider.Instance.Insert(p);
+                    }
+                    con.Execute(sql, p);
                 }
             }
         }

Winsoft.GOV.Framework/Winsoft.GOV.Framework.csproj

@@ -73,6 +73,9 @@
     <None Include="ClassDiagram1.cd" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="BranchPosition.sql" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Winsoft.GOV.ImportDataForm/App.config

@@ -4,9 +4,9 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
     </startup>
   <connectionStrings>
-    <add name="gov" providerName="MySql.Data.MySqlClient" connectionString="Database=gov;Data Source=183.134.79.238;UserId=ImportUser;Password=zjwskj@)!$123456;pooling=false;CharSet=utf8;Port=18889;allow zero datetime=true"/>
-    <add name="qlk" providerName="MySql.Data.MySqlClient" connectionString="Database=qlsx;Data Source=172.28.100.109;UserId=root;Password=root;pooling=false;CharSet=utf8;Port=3306;allow zero datetime=true"/>
-    <!--<add name="gov" providerName="MySql.Data.MySqlClient" connectionString="Database=gov;Data Source=127.0.0.1;UserId=root;Password=root;pooling=false;CharSet=utf8;Port=3306;allow zero datetime=true; Connect Timeout=600"/>
-    <add name="qlk" providerName="MySql.Data.MySqlClient" connectionString="Database=gov;Data Source=127.0.0.1;UserId=root;Password=root;pooling=false;CharSet=utf8;Port=3306;allow zero datetime=true; Connect Timeout=600"/>-->
+    <!--<add name="gov" providerName="MySql.Data.MySqlClient" connectionString="Database=gov;Data Source=183.134.79.238;UserId=ImportUser;Password=zjwskj@)!$123456;pooling=false;CharSet=utf8;Port=18889;allow zero datetime=true"/>
+    <add name="qlk" providerName="MySql.Data.MySqlClient" connectionString="Database=qlsx;Data Source=172.28.100.109;UserId=root;Password=root;pooling=false;CharSet=utf8;Port=3306;allow zero datetime=true"/>-->
+    <add name="gov" providerName="MySql.Data.MySqlClient" connectionString="Database=gov;Data Source=127.0.0.1;UserId=root;Password=root;pooling=false;CharSet=utf8;Port=3306;allow zero datetime=true; Connect Timeout=600"/>
+    <add name="qlk" providerName="MySql.Data.MySqlClient" connectionString="Database=gov;Data Source=127.0.0.1;UserId=root;Password=root;pooling=false;CharSet=utf8;Port=3306;allow zero datetime=true; Connect Timeout=600"/>
   </connectionStrings>
 </configuration>

Winsoft.GOV.ImportDataForm/Form1.cs

@@ -66,8 +66,18 @@ namespace Winsoft.GOV.ImportDataForm
             }
             if (!find)
             {
-                MessageBox.Show("没有找到部门名为“" + comboBox1.Text + "”的部门");
-                return;
+                if (MessageBox.Show("没有找到部门名为“" + comboBox1.Text + "”的部门，您是否向系统添加该部门？", "添加部门", MessageBoxButtons.OKCancel) == DialogResult.OK)
+                {
+                    Branch b = new Branch()
+                    {
+                        GUID = comboBox1.Text,
+                        ShortName = comboBox1.Text
+                    };
+                    comboBox1.Items.Add(b);
+                    comboBox1.SelectedItem = b;
+                }
+                else
+                    return;
             }
 
             IList<PowerMattersBase> list = ExcelHelper.ExcelToList<PowerMattersBase>(textBox1.Text, GetApplyType);
@@ -116,7 +126,7 @@ namespace Winsoft.GOV.ImportDataForm
             a.QL_NAME = row.GetCell(1).StringCellValue.Trim();
 
             int i = 0;
-            for (int j = 2; j < row.Cells.Count - 1; j++)
+            for (int j = 2; j <= row.Cells.Count - 1; j++)
             {
                 ICell cell = row.GetCell(j);
                 if (cell == null || cell.CellType == CellType.Blank || (cell.CellType == CellType.String && String.IsNullOrWhiteSpace(cell.StringCellValue)) 
@@ -129,10 +139,7 @@ namespace Winsoft.GOV.ImportDataForm
                     break;
             }
             a.ApplyCode = i > ApplyType.Names.Length - 1 ?  -1 : i;
-            if (a.ApplyCode != -1)
-                return a;
-            else
-                return null;
+            return a;
         }
 
         private void button3_Click(object sender, EventArgs e)

Winsoft.GOV.WCF/PowerMettersService.cs

@@ -180,16 +180,16 @@ namespace Winsoft.GOV.WCF
             try
             {
                 r = PowerMettersDetailProvider.Instance.FindByRowID(rowID);
-                if (r == null)
-                    r = new PowerMattersDetail();
+                //if (r == null)
+                //    r = new PowerMattersDetail();
                 return r;
             }
             catch (Exception e)
             {
                 Console.WriteLine(e.Message);
-                if (r == null)
-                    r = new PowerMattersDetail();
-                return r;
+                //if (r == null)
+                //    r = new PowerMattersDetail();
+                return null;
             }
         }