同步程序更新

Winsoft.GOV.ConsoleSyncData/Program.cs

@@ -49,19 +49,21 @@ namespace Winsoft.GOV.ConsoleSyncData
                     {
                         if (pm.QL_NAME.First<char>() == '$')
                         {
-                            Console.WriteLine(String.Format("忽略--权力单位:{0}; 数据推送时间:{1}", pm.QL_DEP, pm.UPDATE_DATE.ToString()));
+                            Console.WriteLine(String.Format("忽略--权力单位:{0}; 数据推送时间:{1},原因：该事项是主项", pm.QL_DEP, pm.UPDATE_DATE.ToString()));
                             continue;
                         }
                         Branch b = ProvidersFactory.GetBranchProvider(c).Find(pm.OUGUID);
                         if (b == null)
                         {
-                            b = new Branch()
-                            {
-                                ShortName = pm.QL_DEP,
-                                GUID = pm.OUGUID,
-                                Position = 999
-                            };
-                            ProvidersFactory.GetBranchProvider(c).Insert(b);
+                            Console.WriteLine(String.Format("忽略--权力单位:{0}; 数据推送时间:{1},原因：没有该事项部门", pm.QL_DEP, pm.UPDATE_DATE.ToString()));
+                            continue;
+                            //b = new Branch()
+                            //{
+                            //    ShortName = pm.QL_DEP,
+                            //    GUID = pm.OUGUID,
+                            //    Position = 999
+                            //};
+                            //ProvidersFactory.GetBranchProvider(c).Insert(b);
                         }
                         ProvidersFactory.GetPowerMettersDetailProvider(c).UpdateOrInsert(pm);
                         PowerMattersBase p = new PowerMattersBase()

Winsoft.GOV.Framework/Model/PowerMattersDetail.cs

@@ -152,7 +152,7 @@ namespace Winsoft.GOV.Framework.Model
         /// <summary>
         /// 权力更新类型
         /// </summary>
-        public string UPDATE_TYPE { get; set; }  
+        public string UPDATE_TYPE { get; set; }
         /// <summary>
         /// 事权层级
         /// </summary>
@@ -182,7 +182,7 @@ namespace Winsoft.GOV.Framework.Model
         /// 权力内部编码
         /// </summary>
         [DataMember]
-        public string QL_INNER_CODE { get; set; }       
+        public string QL_INNER_CODE { get; set; }
         /// <summary>
         /// 法定期限单位
         /// </summary>
@@ -254,7 +254,7 @@ namespace Winsoft.GOV.Framework.Model
         public string QL_Full_ID { get; set; }
         public string ENTRUST { get; set; }
         public string ENTRUSTDES { get; set; }
-        
+
         public string OUTypeCode { get; set; }
         public string OUT_FLOW_DESC { get; set; }
         public string BANJIAN_FINISHTYPE { get; set; }
@@ -285,5 +285,44 @@ namespace Winsoft.GOV.Framework.Model
         public string bak1 { get; set; }
         public string bak2 { get; set; }
         public string bak3 { get; set; }
+
+        public string Acp_institution { get; set; }
+        public string Dec_institution { get; set; }
+        public string Content_involve { get; set; }
+        public string Applicable_object { get; set; }
+        public string XINGZHENXDRXY { get; set; }
+        public string Count_limit { get; set; }
+        public string Count_note { get; set; }
+        public string Ban_requirement { get; set; }
+        public string SHIXIANGSCtype { get; set; }
+        public string SHIXIANGSCLX { get; set; }
+        public string Apply_type { get; set; }
+        public string Apply_type_tel { get; set; }
+        public string Apply_type_mail { get; set; }
+        public string Apply_type_fax { get; set; }
+        public string Handle_type { get; set; }
+        public string MbFarenAdd { get; set; }
+        public string MbGerenFlag { get; set; }
+        public string HangYeClassType { get; set; }
+        public string QL_Sub_Kind { get; set; }
+        public string IM_FLOW_url { get; set; }
+        public string OUT_FLOW_url { get; set; }
+        public string Service_mode { get; set; }
+        public string Service_day { get; set; }
+        public string DesTime { get; set; }
+        public string APPWEBAPPLYURL { get; set; }
+        public string APPAPPOINTMENTURL { get; set; }
+        public string APPOINTMENTURL { get; set; }
+        public string IS_WEBAPPOINTMENT { get; set; }
+        public string WEBAPPOINTMENTPERIOD { get; set; }
+        public string MAINCONTEXT { get; set; }
+        public string DO_DEPT { get; set; }
+        public byte[] RELATEDGUID { get; set; }
+        public string RELATED { get; set; }
+        public string IS_EXPRESS { get; set; }
+        public string ISPYC { get; set; }
+        public string LBSX { get; set; }
+        public string Service_Sub_Kind { get; set; }
+
     }
 }

Winsoft.GOV.Framework/Provider/NotificationOfActionProvider.cs

@@ -96,6 +96,7 @@ namespace Winsoft.GOV.Framework.Provider
             {
                 sql = sql + " where ql_kind in ('" + string.Join("','", ql_kinds) + "')";
             }
+            sql = sql + " order by UPDATE_DATE desc";
             return GetPagedList(sql, itemIndex, size);
         }
 
@@ -111,6 +112,7 @@ namespace Winsoft.GOV.Framework.Provider
                 sql = sql + " and (ql_name like '%" + key + "%' or ql_dep like '%" + key + "%')";
             if (isHidRead)
                 sql = sql + " and IsRead = 0";
+            sql = sql + " order by UPDATE_DATE desc";
             return GetPagedList(sql, itemIndex, size);
         }
 

Winsoft.GOV.Framework/Provider/PowerMettersDetailProvider.cs

@@ -11,52 +11,7 @@ namespace Winsoft.GOV.Framework.Provider
 {
     public class PowerMettersDetailProvider : BaseProvider<PowerMattersDetail>
     {
-        public PowerMettersDetailProvider(County county) : base(county)
-        {
-
-        }
-
-        public void DeleteByPowerMattersBase()
-        {
-            const string sql = "delete from powermettersdetail where QL_INNER_CODE not in (select ql_inner_code from powermattersbase);";
-            using (IDbConnection connection = GetDbConnection())
-            {
-                connection.Execute(sql, 60000);
-            }
-        }
-
-        public PowerMattersDetail FindByRowID(string rowID)
-        {
-            const string sql = "select * from powermettersdetail where QL_INNER_CODE=@rowID;";
-            using (IDbConnection connection = GetDbConnection())
-            {
-                return connection.Query<PowerMattersDetail>(sql, new { rowID = rowID }).FirstOrDefault<PowerMattersDetail>();
-            }
-        }
-
-        public DateTime FindLastUpdateDate()
-        {
-            const string sql = "select Max(UPDATE_DATE) from powermettersdetail;";
-            using (IDbConnection connection = GetDbConnection())
-            {
-                return connection.QueryFirst<DateTime>(sql);
-            }
-        }
-
-        public bool IsExist(string ql_inner_code)
-        {
-            using (IDbConnection connection = GetDbConnection())
-            {
-                string sql = "select count(*) from powermettersdetail where QL_INNER_CODE=@ql_inner_code;";
-                return connection.QueryFirstOrDefault<int>(sql, new { ql_inner_code = ql_inner_code }) > 0;
-            }
-        }
-        public void Insert(PowerMattersDetail p)
-        {
-            using (IDbConnection connection = GetDbConnection())
-            {
-                string sql = "INSERT INTO `powermettersdetail` "
-                        + "(`ROWGUID`, "
+        private string cols = "`ROWGUID`, "
                         + "`UPDATE_DATE`, "
                         + "`UPDATE_TYPE`, "
                         + "`QL_KIND`, "
@@ -105,8 +60,9 @@ namespace Winsoft.GOV.Framework.Provider
                         + "`SYNC_DATE`, "
                         + "`SYNC_ERROR_DESC`, "
                         + "`OUORGCODE`, "
+                        //+ "`ROWGUIDbak`, "
                         + "`OUGUID`, "
-                        + "`sync_state`, "
+                        //+ "`sync_state`, "
                         + "`FaRenUrl`, "
                         + "`GeRenFlag`, "
                         + "`Is_TongJian`, "
@@ -133,15 +89,52 @@ namespace Winsoft.GOV.Framework.Provider
                         + "`IS_CS`, "
                         + "`UnifyDoDes`, "
                         + "`IS_VLB`, "
-                        + "`NoUnify_Do`, "
+                        //+ "`NoUnify_Do`, "
                         + "`QL_INNER_CODE_ITEM`, "
-                        + "`IsHasOwnFlow`, "
-                        + "`Is_TouZiP`, "
-                        + "`bak1`, "
-                        + "`bak2`, "
-                        + "`bak3`) "
-                        + "VALUES "
-                        + "(@ROWGUID, "
+                        //+ "`IsHasOwnFlow`, "
+                        //+ "`Is_TouZiP`, "
+                        //+ "`bak1`, "
+                        //+ "`bak2`, "
+                        //+ "`bak3`, "
+                        + "`Acp_institution`, "
+                        + "`Dec_institution`, "
+                        + "`Content_involve`, "
+                        + "`Applicable_object`, "
+                        + "`XINGZHENXDRXY`, "
+                        + "`Count_limit`, "
+                        + "`Count_note`, "
+                        + "`Ban_requirement`, "
+                        + "`SHIXIANGSCtype`, "
+                        + "`SHIXIANGSCLX`, "
+                        + "`Apply_type`, "
+                        + "`Apply_type_tel`, "
+                        + "`Apply_type_mail`, "
+                        + "`Apply_type_fax`, "
+                        + "`Handle_type`, "
+                        + "`MbFarenAdd`, "
+                        + "`MbGerenFlag`, "
+                        + "`HangYeClassType`, "
+                        + "`QL_Sub_Kind`, "
+                        + "`IM_FLOW_url`, "
+                        + "`OUT_FLOW_url`, "
+                        + "`Service_mode`, "
+                        + "`Service_day`, "
+                        + "`DesTime`, "
+                        + "`APPWEBAPPLYURL`, "
+                        + "`APPAPPOINTMENTURL`, "
+                        + "`APPOINTMENTURL`, "
+                        + "`IS_WEBAPPOINTMENT`, "
+                        + "`WEBAPPOINTMENTPERIOD`, "
+                        + "`MAINCONTEXT`, "
+                        + "`DO_DEPT`, "
+                        + "`RELATEDGUID`, "
+                        + "`RELATED`, "
+                        + "`IS_EXPRESS`, "
+                        + "`ISPYC`, "
+                        + "`LBSX`, "
+                        + "`Service_Sub_Kind`";
+
+        private string values = "@ROWGUID, "
                         + "@UPDATE_DATE, "
                         + "@UPDATE_TYPE, "
                         + "@QL_KIND, "
@@ -190,8 +183,9 @@ namespace Winsoft.GOV.Framework.Provider
                         + "@SYNC_DATE, "
                         + "@SYNC_ERROR_DESC, "
                         + "@OUORGCODE, "
+                        //+@"`ROWGUIDbak, "
                         + "@OUGUID, "
-                        + "@sync_state, "
+                        //+@"`sync_state, "
                         + "@FaRenUrl, "
                         + "@GeRenFlag, "
                         + "@Is_TongJian, "
@@ -218,28 +212,52 @@ namespace Winsoft.GOV.Framework.Provider
                         + "@IS_CS, "
                         + "@UnifyDoDes, "
                         + "@IS_VLB, "
-                        + "@NoUnify_Do, "
+                        //+@"`NoUnify_Do, "
                         + "@QL_INNER_CODE_ITEM, "
-                        + "@IsHasOwnFlow, "
-                        + "@Is_TouZiP, "
-                        + "@bak1, "
-                        + "@bak2, "
-                        + "@bak3); ";
-                connection.Execute(sql, p);
-            }           
-        }
+                        //+@"`IsHasOwnFlow, "
+                        //+@"`Is_TouZiP, "
+                        //+@"`bak1, "
+                        //+@"`bak2, "
+                        //+@"`bak3, "
+                        + "@Acp_institution, "
+                        + "@Dec_institution, "
+                        + "@Content_involve, "
+                        + "@Applicable_object, "
+                        + "@XINGZHENXDRXY, "
+                        + "@Count_limit, "
+                        + "@Count_note, "
+                        + "@Ban_requirement, "
+                        + "@SHIXIANGSCtype, "
+                        + "@SHIXIANGSCLX, "
+                        + "@Apply_type, "
+                        + "@Apply_type_tel, "
+                        + "@Apply_type_mail, "
+                        + "@Apply_type_fax, "
+                        + "@Handle_type, "
+                        + "@MbFarenAdd, "
+                        + "@MbGerenFlag, "
+                        + "@HangYeClassType, "
+                        + "@QL_Sub_Kind, "
+                        + "@IM_FLOW_url, "
+                        + "@OUT_FLOW_url, "
+                        + "@Service_mode, "
+                        + "@Service_day, "
+                        + "@DesTime, "
+                        + "@APPWEBAPPLYURL, "
+                        + "@APPAPPOINTMENTURL, "
+                        + "@APPOINTMENTURL, "
+                        + "@IS_WEBAPPOINTMENT, "
+                        + "@WEBAPPOINTMENTPERIOD, "
+                        + "@MAINCONTEXT, "
+                        + "@DO_DEPT, "
+                        + "@RELATEDGUID, "
+                        + "@RELATED, "
+                        + "@IS_EXPRESS, "
+                        + "@ISPYC, "
+                        + "@LBSX, "
+                        + "@Service_Sub_Kind";
 
-        public void UpdateOrInsert(PowerMattersDetail p)
-        {
-            using (IDbConnection connection = GetDbConnection())
-            {
-                string sql = "select ROWGUID from powermettersdetail where QL_INNER_CODE=@QL_INNER_CODE;";
-                IEnumerable<string> tmp = connection.Query<string>(sql, p);
-                if (tmp != null && tmp.Count() > 0)
-                {
-                    sql = "UPDATE `powermettersdetail` " +
-                            "SET " +
-                            "`ROWGUID` = @ROWGUID, " +
+        private string sets = "`ROWGUID` = @ROWGUID, " +
                             "`UPDATE_DATE` = @UPDATE_DATE, " +
                             "`UPDATE_TYPE` = @UPDATE_TYPE, " +
                             "`QL_KIND` = @QL_KIND, " +
@@ -316,188 +334,116 @@ namespace Winsoft.GOV.Framework.Provider
                             "`IS_CS` = @IS_CS, " +
                             "`UnifyDoDes` = @UnifyDoDes, " +
                             "`IS_VLB` = @IS_VLB, " +
-                            "`NoUnify_Do` = @NoUnify_Do, " +
+                            //"`NoUnify_Do` = @NoUnify_Do, " +
                             "`QL_INNER_CODE_ITEM` = @QL_INNER_CODE_ITEM, " +
-                            "`IsHasOwnFlow` = @IsHasOwnFlow, " +
-                            "`Is_TouZiP` = @Is_TouZiP, " +
-                            "`bak1` = @bak1, " +
-                            "`bak2` = @bak2, " +
-                            "`bak3` = @bak3 " +
-                            " WHERE `QL_INNER_CODE` = @QL_INNER_CODE;";
+                            //"`IsHasOwnFlow` = @IsHasOwnFlow, " +
+                            //"`Is_TouZiP` = @Is_TouZiP, " +
+                            //"`bak1` = @bak1, " +
+                            //"`bak2` = @bak2, " +
+                            //"`bak3` = @bak3, " +
+                            "`Acp_institution` = @Acp_institution, " +
+                            "`Dec_institution` = @Dec_institution, " +
+                            "`Content_involve` = @Content_involve, " +
+                            "`Applicable_object` = @Applicable_object, " +
+                            "`XINGZHENXDRXY` = @XINGZHENXDRXY, " +
+                            "`Count_limit` = @Count_limit, " +
+                            "`Count_note` = @Count_note, " +
+                            "`Ban_requirement` = @Ban_requirement, " +
+                            "`SHIXIANGSCtype` = @SHIXIANGSCtype, " +
+                            "`SHIXIANGSCLX` = @SHIXIANGSCLX, " +
+                            "`Apply_type` = @Apply_type, " +
+                            "`Apply_type_tel` = @Apply_type_tel, " +
+                            "`Apply_type_mail` = @Apply_type_mail, " +
+                            "`Apply_type_fax` = @Apply_type_fax, " +
+                            "`Handle_type` = @Handle_type, " +
+                            "`MbFarenAdd` = @MbFarenAdd, " +
+                            "`MbGerenFlag` = @MbGerenFlag, " +
+                            "`HangYeClassType` = @HangYeClassType, " +
+                            "`QL_Sub_Kind` = @QL_Sub_Kind, " +
+                            "`IM_FLOW_url` = @IM_FLOW_url, " +
+                            "`OUT_FLOW_url` = @OUT_FLOW_url, " +
+                            "`Service_mode` = @Service_mode, " +
+                            "`Service_day` = @Service_day, " +
+                            "`DesTime` = @DesTime, " +
+                            "`APPWEBAPPLYURL` = @APPWEBAPPLYURL, " +
+                            "`APPAPPOINTMENTURL` = @APPAPPOINTMENTURL, " +
+                            "`APPOINTMENTURL` = @APPOINTMENTURL, " +
+                            "`IS_WEBAPPOINTMENT` = @IS_WEBAPPOINTMENT, " +
+                            "`WEBAPPOINTMENTPERIOD` = @WEBAPPOINTMENTPERIOD, " +
+                            "`MAINCONTEXT` = @MAINCONTEXT, " +
+                            "`DO_DEPT` = @DO_DEPT, " +
+                            "`RELATEDGUID` = @RELATEDGUID, " +
+                            "`RELATED` = @RELATED, " +
+                            "`IS_EXPRESS` = @IS_EXPRESS, " +
+                            "`ISPYC` = @ISPYC, " +
+                            "`LBSX` = @LBSX, " +
+                            "`Service_Sub_Kind` = @Service_Sub_Kind ";
+        public PowerMettersDetailProvider(County county) : base(county)
+        {
+
+        }
+
+        public void DeleteByPowerMattersBase()
+        {
+            const string sql = "delete from powermettersdetail where QL_INNER_CODE not in (select ql_inner_code from powermattersbase);";
+            using (IDbConnection connection = GetDbConnection())
+            {
+                connection.Execute(sql, 60000);
+            }
+        }
+
+        public PowerMattersDetail FindByRowID(string rowID)
+        {
+            const string sql = "select * from powermettersdetail where QL_INNER_CODE=@rowID;";
+            using (IDbConnection connection = GetDbConnection())
+            {
+                return connection.Query<PowerMattersDetail>(sql, new { rowID = rowID }).FirstOrDefault<PowerMattersDetail>();
+            }
+        }
+
+        public DateTime FindLastUpdateDate()
+        {
+            const string sql = "select Max(UPDATE_DATE) from powermettersdetail;";
+            using (IDbConnection connection = GetDbConnection())
+            {
+                return connection.QueryFirst<DateTime>(sql);
+            }
+        }
+
+        public bool IsExist(string ql_inner_code)
+        {
+            using (IDbConnection connection = GetDbConnection())
+            {
+                string sql = "select count(*) from powermettersdetail where QL_INNER_CODE=@ql_inner_code;";
+                return connection.QueryFirstOrDefault<int>(sql, new { ql_inner_code = ql_inner_code }) > 0;
+            }
+        }
+        public void Insert(PowerMattersDetail p)
+        {
+            using (IDbConnection connection = GetDbConnection())
+            {
+                string sql = "INSERT INTO `powermettersdetail` "
+                        + "("+ cols + ") "
+                        + "VALUES "
+                        + "("+values+"); ";
+                connection.Execute(sql, p);
+            }           
+        }
+
+        public void UpdateOrInsert(PowerMattersDetail p)
+        {
+            using (IDbConnection connection = GetDbConnection())
+            {
+                string sql = "select ROWGUID from powermettersdetail where QL_INNER_CODE=@QL_INNER_CODE;";
+                IEnumerable<string> tmp = connection.Query<string>(sql, p);
+                if (tmp != null && tmp.Count() > 0)
+                {
+                    sql = "UPDATE `powermettersdetail` SET " + sets +  " WHERE `QL_INNER_CODE` = @QL_INNER_CODE;";
                 }
                 else
                 {
                     Console.WriteLine("插入：" + p.QL_INNER_CODE);
-                    sql = "INSERT INTO `powermettersdetail` "
-                        + "(`ROWGUID`, "
-                        + "`UPDATE_DATE`, "
-                        + "`UPDATE_TYPE`, "
-                        + "`QL_KIND`, "
-                        + "`QL_MAINITEM_ID`, "
-                        + "`QL_SUBITEM_ID`, "
-                        + "`SHIQUANCJ`, "
-                        + "`BELONGXIAQUCODE`, "
-                        + "`QL_DEP_ORGCDOE`, "
-                        + "`ITEMSOURCE`, "
-                        + "`VERSION_NUMBER`, "
-                        + "`VERSION_DATE`, "
-                        + "`QL_EFFECT_TIME`, "
-                        + "`QL_INNER_CODE`, "
-                        + "`QL_NAME`, "
-                        + "`QL_STATE`, "
-                        + "`LAWBASIS`, "
-                        + "`ANTICIPATE_DAY`, "
-                        + "`ANTICIPATE_TYPE`, "
-                        + "`PROMISE_DAY`, "
-                        + "`APPLYERMIN_COUNT`, "
-                        + "`IS_PILOT`, "
-                        + "`QL_DEP`, "
-                        + "`LEAD_DEPT`, "
-                        + "`BJTYPE`, "
-                        + "`BENJISPXZ`, "
-                        + "`HANDLE_FREQUENCY`, "
-                        + "`XINGZHENXDRXZ`, "
-                        + "`APPLY_CONDITION`, "
-                        + "`BANJIAN_FINISHFILES`, "
-                        + "`LINK_TEL`, "
-                        + "`SUPERVISE_TEL`, "
-                        + "`WEBAPPLYURL`, "
-                        + "`WEBCONSULTURL`, "
-                        + "`CHARGE_FLAG`, "
-                        + "`CHARGE_BASIS`, "
-                        + "`RIGHTCLASS_QIYEZT`, "
-                        + "`RIGHTCLASS_QIYEDX`, "
-                        + "`RIGHTCLASS_GERENSX`, "
-                        + "`RIGHTCLASS_GERENDX`, "
-                        + "`IN_FLOW_INFO`, "
-                        + "`MATERIAL_INFO`, "
-                        + "`CHARGEITEM_INFO`, "
-                        + "`QA_INFO`, "
-                        + "`ACCEPT_ADDRESS_INFO`, "
-                        + "`SYNC_SIGN`, "
-                        + "`SYNC_DATE`, "
-                        + "`SYNC_ERROR_DESC`, "
-                        + "`OUORGCODE`, "
-                        + "`OUGUID`, "
-                        + "`sync_state`, "
-                        + "`FaRenUrl`, "
-                        + "`GeRenFlag`, "
-                        + "`Is_TongJian`, "
-                        + "`QL_Full_ID`, "
-                        + "`ENTRUST`, "
-                        + "`ENTRUSTDES`, "
-                        + "`APPLYERMIN_COUNT_DESC`, "
-                        + "`OUTypeCode`, "
-                        + "`OUT_FLOW_DESC`, "
-                        + "`BANJIAN_FINISHTYPE`, "
-                        + "`IS_SpecialPro`, "
-                        + "`State2`, "
-                        + "`NoSuit_Apply`, "
-                        + "`IS_UnifyDo`, "
-                        + "`IS_UpUnify`, "
-                        + "`QL_ATT`, "
-                        + "`BakNote`, "
-                        + "`WebApplyMode`, "
-                        + "`ITEMSOURCETYPE`, "
-                        + "`Is_SimplePunish`, "
-                        + "`Is_LevyWaiver`, "
-                        + "`FeeBasis`, "
-                        + "`FACT_INFO`, "
-                        + "`IS_CS`, "
-                        + "`UnifyDoDes`, "
-                        + "`IS_VLB`, "
-                        + "`NoUnify_Do`, "
-                        + "`QL_INNER_CODE_ITEM`, "
-                        + "`IsHasOwnFlow`, "
-                        + "`Is_TouZiP`, "
-                        + "`bak1`, "
-                        + "`bak2`, "
-                        + "`bak3`) "
-                        + "VALUES "
-                        + "(@ROWGUID, "
-                        + "@UPDATE_DATE, "
-                        + "@UPDATE_TYPE, "
-                        + "@QL_KIND, "
-                        + "@QL_MAINITEM_ID, "
-                        + "@QL_SUBITEM_ID, "
-                        + "@SHIQUANCJ, "
-                        + "@BELONGXIAQUCODE, "
-                        + "@QL_DEP_ORGCDOE, "
-                        + "@ITEMSOURCE, "
-                        + "@VERSION_NUMBER, "
-                        + "@VERSION_DATE, "
-                        + "@QL_EFFECT_TIME, "
-                        + "@QL_INNER_CODE, "
-                        + "@QL_NAME, "
-                        + "@QL_STATE, "
-                        + "@LAWBASIS, "
-                        + "@ANTICIPATE_DAY, "
-                        + "@ANTICIPATE_TYPE, "
-                        + "@PROMISE_DAY, "
-                        + "@APPLYERMIN_COUNT, "
-                        + "@IS_PILOT, "
-                        + "@QL_DEP, "
-                        + "@LEAD_DEPT, "
-                        + "@BJTYPE, "
-                        + "@BENJISPXZ, "
-                        + "@HANDLE_FREQUENCY, "
-                        + "@XINGZHENXDRXZ, "
-                        + "@APPLY_CONDITION, "
-                        + "@BANJIAN_FINISHFILES, "
-                        + "@LINK_TEL, "
-                        + "@SUPERVISE_TEL, "
-                        + "@WEBAPPLYURL, "
-                        + "@WEBCONSULTURL, "
-                        + "@CHARGE_FLAG, "
-                        + "@CHARGE_BASIS, "
-                        + "@RIGHTCLASS_QIYEZT, "
-                        + "@RIGHTCLASS_QIYEDX, "
-                        + "@RIGHTCLASS_GERENSX, "
-                        + "@RIGHTCLASS_GERENDX, "
-                        + "@IN_FLOW_INFO, "
-                        + "@MATERIAL_INFO, "
-                        + "@CHARGEITEM_INFO, "
-                        + "@QA_INFO, "
-                        + "@ACCEPT_ADDRESS_INFO, "
-                        + "@SYNC_SIGN, "
-                        + "@SYNC_DATE, "
-                        + "@SYNC_ERROR_DESC, "
-                        + "@OUORGCODE, "
-                        + "@OUGUID, "
-                        + "@sync_state, "
-                        + "@FaRenUrl, "
-                        + "@GeRenFlag, "
-                        + "@Is_TongJian, "
-                        + "@QL_Full_ID, "
-                        + "@ENTRUST, "
-                        + "@ENTRUSTDES, "
-                        + "@APPLYERMIN_COUNT_DESC, "
-                        + "@OUTypeCode, "
-                        + "@OUT_FLOW_DESC, "
-                        + "@BANJIAN_FINISHTYPE, "
-                        + "@IS_SpecialPro, "
-                        + "@State2, "
-                        + "@NoSuit_Apply, "
-                        + "@IS_UnifyDo, "
-                        + "@IS_UpUnify, "
-                        + "@QL_ATT, "
-                        + "@BakNote, "
-                        + "@WebApplyMode, "
-                        + "@ITEMSOURCETYPE, "
-                        + "@Is_SimplePunish, "
-                        + "@Is_LevyWaiver, "
-                        + "@FeeBasis, "
-                        + "@FACT_INFO, "
-                        + "@IS_CS, "
-                        + "@UnifyDoDes, "
-                        + "@IS_VLB, "
-                        + "@NoUnify_Do, "
-                        + "@QL_INNER_CODE_ITEM, "
-                        + "@IsHasOwnFlow, "
-                        + "@Is_TouZiP, "
-                        + "@bak1, "
-                        + "@bak2, "
-                        + "@bak3); ";
+                    sql = "INSERT INTO `powermettersdetail` (" + cols + ") VALUES (" + values + "); ";
                 }
                 connection.Execute(sql, p);
             }

Winsoft.GOV.Framework/Provider/QLSXProvider.cs

@@ -60,7 +60,7 @@ namespace Winsoft.GOV.Framework.Provider
                                 + "`SYNC_DATE`, "
                                 + "`SYNC_ERROR_DESC`, "
                                 + "`OUORGCODE`, "
-                                + "`ROWGUIDbak`, "
+                                //+ "`ROWGUIDbak`, "
                                 + "`OUGUID`, "
                                 //+ "`sync_state`, "
                                 + "`FaRenUrl`, "
@@ -89,13 +89,50 @@ namespace Winsoft.GOV.Framework.Provider
                                 + "`IS_CS`, "
                                 + "`UnifyDoDes`, "
                                 + "`IS_VLB`, "
-                                + "`NoUnify_Do`, "
+                                //+ "`NoUnify_Do`, "
                                 + "`QL_INNER_CODE_ITEM`, "
-                                + "`IsHasOwnFlow`, "
-                                + "`Is_TouZiP`, "
-                                + "`bak1`, "
-                                + "`bak2`, "
-                                + "`bak3` ";
+                                //+ "`IsHasOwnFlow`, "
+                                //+ "`Is_TouZiP`, "
+                                //+ "`bak1`, "
+                                //+ "`bak2`, "
+                                //+ "`bak3`, "
+                                + "`Acp_institution`, "
+                                + "`Dec_institution`, "
+                                + "`Content_involve`, "
+                                + "`Applicable_object`, "
+                                + "`XINGZHENXDRXY`, "
+                                + "`Count_limit`, "
+                                + "`Count_note`, "
+                                + "`Ban_requirement`, "
+                                + "`SHIXIANGSCtype`, "
+                                + "`SHIXIANGSCLX`, "
+                                + "`Apply_type`, "
+                                + "`Apply_type_tel`, "
+                                + "`Apply_type_mail`, "
+                                + "`Apply_type_fax`, "
+                                + "`Handle_type`, "
+                                + "`MbFarenAdd`, "
+                                + "`MbGerenFlag`, "
+                                + "`HangYeClassType`, "
+                                + "`QL_Sub_Kind`, "
+                                + "`IM_FLOW_url`, "
+                                + "`OUT_FLOW_url`, "
+                                + "`Service_mode`, "
+                                + "`Service_day`, "
+                                + "`DesTime`, "
+                                + "`APPWEBAPPLYURL`, "
+                                + "`APPAPPOINTMENTURL`, "
+                                + "`APPOINTMENTURL`, "
+                                + "`IS_WEBAPPOINTMENT`, "
+                                + "`WEBAPPOINTMENTPERIOD`, "
+                                + "`MAINCONTEXT`, "
+                                + "`DO_DEPT`, "
+                                + "`RELATEDGUID`, "
+                                + "`RELATED`, "
+                                + "`IS_EXPRESS`, "
+                                + "`ISPYC`, "
+                                + "`LBSX`, "
+                                + "`Service_Sub_Kind` ";
 
         public QLSXProvider(County county):base(county)
         {

Winsoft.GOV.Framework/UPDATE_20170908.sql

@@ -6,12 +6,8 @@
 --alter table powermettersdetail add Count_limit varchar(2) COMMENT '有无数量限制';
 --alter table powermettersdetail add Count_note text COMMENT '数量限制情况说明';
 --alter table powermettersdetail add Ban_requirement text COMMENT '禁止性要求';
-
-
 --alter table powermettersdetail add SHIXIANGSCtype varchar(5) COMMENT '事项审查类型';
 --alter table powermettersdetail add SHIXIANGSCLX text COMMENT '事项审查类型说明';
-
-
 --alter table powermettersdetail add Apply_type varchar(20) COMMENT '申请方式';
 --alter table powermettersdetail add Apply_type_tel varchar(100) COMMENT '联系电话';
 --alter table powermettersdetail add Apply_type_mail text COMMENT '邮箱';
@@ -19,9 +15,6 @@
 --alter table powermettersdetail add Handle_type text COMMENT '办理方式';
 --alter table powermettersdetail add MbFarenAdd text COMMENT '手机端法人认证地址';
 --alter table powermettersdetail add MbGerenFlag text COMMENT '手机端个人认证标识';
-
-
-
 --alter table powermettersdetail add HangYeClassType varchar(3) COMMENT '行业主题分类';
 --alter table powermettersdetail add QL_Sub_Kind varchar(2) COMMENT '其他行政权力子类型';
 --alter table powermettersdetail add IM_FLOW_url varchar(255) COMMENT '内部流程图地址（公有云）';
@@ -29,7 +22,6 @@
 --alter table powermettersdetail add Service_mode varchar(30) COMMENT '送达方式';
 --alter table powermettersdetail add Service_day varchar(10) COMMENT '送达时限';
 --alter table powermettersdetail add DesTime text COMMENT '时限说明';
-
 --alter table powermettersdetail add APPWEBAPPLYURL varchar(200) COMMENT '移动端网上办理地址';
 --alter table powermettersdetail add APPAPPOINTMENTURL varchar(200) COMMENT '移动端网上预约地址';
 --alter table powermettersdetail add APPOINTMENTURL varchar(200) COMMENT '电脑端网上预约地址';
@@ -37,8 +29,6 @@
 --alter table powermettersdetail add WEBAPPOINTMENTPERIOD varchar(2) COMMENT '网上预约时段';
 --alter table powermettersdetail add MAINCONTEXT varchar(400) COMMENT '主要内容';
 --alter table powermettersdetail add DO_DEPT varchar(50) COMMENT '共同实施单位';
-
-
 --alter table powermettersdetail add RELATEDGUID BLOB COMMENT '相关附件';
 --alter table powermettersdetail add RELATED LONGTEXT COMMENT '相关附件信息';
 --alter table powermettersdetail add IS_EXPRESS varchar(1) COMMENT '是否提供快递送达';
@@ -49,4 +39,7 @@
 --ALTER TABLE `powermattersbase`ADD COLUMN `QL_KIND`  varchar(2) NULL AFTER `QL_STATE`;
 --UPDATE powermattersbase INNER JOIN powermettersdetail ON powermattersbase.QL_INNER_CODE = powermettersdetail.QL_INNER_CODE SET powermattersbase.QL_KIND = powermettersdetail.QL_KIND;
 --ALTER TABLE `notificationofaction`ADD COLUMN `QL_KIND`  varchar(2) NULL;
---UPDATE notificationofaction INNER JOIN powermettersdetail ON notificationofaction.QL_INNER_CODE = powermettersdetail.QL_INNER_CODE SET notificationofaction.QL_KIND = powermettersdetail.QL_KIND;
+--UPDATE notificationofaction INNER JOIN powermettersdetail ON notificationofaction.QL_INNER_CODE = powermettersdetail.QL_INNER_CODE SET notificationofaction.QL_KIND = powermettersdetail.QL_KIND;
+
+--ALTER TABLE `powermettersdetail` MODIFY COLUMN `QL_DEP_ORGCDOE`  varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '实施机关组织机构代码' AFTER `BELONGXIAQUCODE`;
+

Winsoft.GOV.ImportDataForm/Form1.cs

@@ -327,11 +327,11 @@ namespace Winsoft.GOV.ImportDataForm
         {
             if(folderBrowserDialog1.ShowDialog() == DialogResult.OK)
             {
-                IEnumerable<Branch> bs = ProvidersFactory.GetBranchProvider((comboBox2.SelectedItem as CountyItem).CountyValue).FindOnceRunBranch();
+                IEnumerable<Branch> bs = ProvidersFactory.GetBranchProvider((comboBox2.SelectedItem as CountyItem).CountyValue).FindAll();
                 foreach(Branch b in bs)
                 {
                     label3.Text = "正在导出“" + b.ShortName + ".xls”";
-                    IEnumerable<PowerMattersBase> ps = ProvidersFactory.GetOnceRunPowerMattersProvider((comboBox2.SelectedItem as CountyItem).CountyValue).FindOnceRunPowerMattersByBranchGUID(b.GUID);
+                    IEnumerable<PowerMattersBase> ps = ProvidersFactory.GetPowerMettersBaseProvider((comboBox2.SelectedItem as CountyItem).CountyValue).FindByBranchGUID(b.GUID);
                     foreach(PowerMattersBase p in ps)
                     {
                         p.QL_DEP = b.ShortName;
@@ -361,23 +361,31 @@ namespace Winsoft.GOV.ImportDataForm
             else
                 row.CreateCell(4).SetCellValue("1");
             int i = 0;
-
+            ICellStyle leftStyle = row.Sheet.Workbook.CreateCellStyle();
+            ICellStyle rightStyle = row.Sheet.Workbook.CreateCellStyle();
+            leftStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+            leftStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+            leftStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+            leftStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+            leftStyle.GetFont(row.Sheet.Workbook).IsBold = false;
+            leftStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Left;
+            rightStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+            rightStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+            rightStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+            rightStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+            rightStyle.GetFont(row.Sheet.Workbook).IsBold = false;
+            rightStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
             foreach (ICell c in row.Cells)
             {
-                ICellStyle style = row.Sheet.Workbook.CreateCellStyle();
-                style.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
-                style.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
-                style.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
-                style.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
-                style.GetFont(row.Sheet.Workbook).IsBold = false;
+                
+                
                 if (i == 3)
-                    style.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Left;
-                else                 
-                    style.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                    c.CellStyle = leftStyle;
+                else
+                    c.CellStyle = rightStyle;
                 i++;
-                if (p == null)
-                    style.FillBackgroundColor = 51;
-                c.CellStyle = style;
+                //if (p == null)
+                //    c.CellStyle.FillBackgroundColor = 51;
             }           
         }
         private void ExportWriteHeard(IRow row)
@@ -402,17 +410,17 @@ namespace Winsoft.GOV.ImportDataForm
             row.CreateCell(7, CellType.String).SetCellValue("全程网上申办，快递送达");
             row.CreateCell(8, CellType.String).SetCellValue("网上申报，预审，窗口核验取件");
             row.CreateCell(9, CellType.String).SetCellValue("窗口申报，快递送达");
-            foreach(ICell c in row.Cells)
+            ICellStyle style = row.Sheet.Workbook.CreateCellStyle();
+            style.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+            style.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+            style.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+            style.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+            style.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+            style.VerticalAlignment = VerticalAlignment.Center;
+            style.WrapText = true;
+            style.GetFont(row.Sheet.Workbook).IsBold = true;
+            foreach (ICell c in row.Cells)
             {
-                ICellStyle style = row.Sheet.Workbook.CreateCellStyle();
-                style.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
-                style.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
-                style.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
-                style.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
-                style.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
-                style.VerticalAlignment = VerticalAlignment.Center;
-                style.WrapText = true;
-                style.GetFont(row.Sheet.Workbook).IsBold = true;
                 c.CellStyle = style;
             }         
         }

Winsoft.GOV.XF.WebApi.ManagerCore/Winsoft.GOV.XF.WebApi.ManagerCore/package-lock.json

@@ -2602,6 +2602,11 @@
         "xml-char-classes": "https://registry.npm.taobao.org/xml-char-classes/download/xml-char-classes-1.0.0.tgz"
       }
     },
+    "ng-diff-match-patch": {
+      "version": "2.0.6",
+      "resolved": "http://registry.npm.taobao.org/ng-diff-match-patch/download/ng-diff-match-patch-2.0.6.tgz",
+      "integrity": "sha1-kaAdRN4R6zlHXz770kn9fsIlUmA="
+    },
     "ng2-charts": {
       "version": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-1.6.0.tgz",
       "integrity": "sha1-EIohM/9iqGI4lSQPrb3b6ilR8p0=",

Winsoft.GOV.XF.WebApi.ManagerCore/Winsoft.GOV.XF.WebApi.ManagerCore/package.json

@@ -64,11 +64,8 @@
     "xml2js": "0.4.19",
     "lodash": "4.17.4",
     "ng-diff-match-patch": "^2.0.6"
-
-  },
-  "devDependencies": {
-   
   },
+  "devDependencies": {},
   "scripts": {
     "dev-build": "node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js"
   },