20211229与博晟数据对接接口优化

SGGL/BLL/BoSheng/BOSHENGMonitorService.cs

@@ -43,7 +43,7 @@ namespace BLL
         /// </summary>
         /// <param name="sender">Timer组件</param>
         /// <param name="e">事件参数</param>
-        private static void AddData(object sender, ElapsedEventArgs e)
+        public static void AddData(object sender, ElapsedEventArgs e)
         {
             try
             {
@@ -96,12 +96,23 @@ namespace BLL
                     projectId = getProjectByFromProjectId.ProjectId;
                 }
                 else
+                {
+                    string OtherDepartId = obj["OtherDepartId"].ToString();
+                    var getPByCode= Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectCode == OtherDepartId);
+                    if (getPByCode != null)
+                    {
+                        getPByCode.FromProjectId = fromprojectId;
+                        Funs.DB.SubmitChanges();
+                        projectId = getPByCode.ProjectId;
+                    }
+                    else
                     {
                         if (type == "1")
                         {
                             projectId = AddProject(arr);
                         }
                     }
+                }
 
                 if (!string.IsNullOrEmpty(projectId))
                 {

SGGL/BLL/Common/Funs.cs

@@ -559,7 +559,15 @@ namespace BLL
             {
                 if (!String.IsNullOrEmpty(time))
                 {
-                    return DateTime.Parse(time);
+                    DateTime dateTime = DateTime.Parse(time);                     
+                    if (dateTime.Year > 1753 && dateTime.Year < 9999)
+                    {
+                        return dateTime;
+                    }
+                    else
+                    {
+                        return null;
+                    }
                 }
                 else
                 {
@@ -583,11 +591,19 @@ namespace BLL
             {
                 if (!String.IsNullOrEmpty(time))
                 {
-                    return DateTime.Parse(time);
+                    DateTime dateTime = DateTime.Parse(time);
+                    if (dateTime.Year > 1753 && dateTime.Year < 9999)
+                    {
+                        return dateTime;
                     }
                     else
                     {
-                    return System.DateTime.Now;
+                        return DateTime.Now;
+                    }
+                }
+                else
+                {
+                    return DateTime.Now;
                 }
             }
             catch (Exception ex)

SGGL/FineUIPro.Web/Login.aspx.cs

@@ -64,7 +64,7 @@
         {
             if (!IsPostBack)
             {            
-               BLL.CNCECHSSEWebService.getSupervise_SubUnitReport();
+              // BOSHENGMonitorService.AddData(null,null);
                 string userdata = Request.Params["basedata"];
                 if (!string.IsNullOrEmpty(userdata))
                 {