diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 9e18c528..db8f62f1 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -49,7 +49,7 @@
..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll
- ..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll
+ ..\FineUIPro\Reference BLL\EmitMapper.dll
False
@@ -126,7 +126,7 @@
- ..\..\..\..\五环施工平台\SGGL_CWCEC\SGGL\BLL\bin\Debug\ThoughtWorks.QRCode.dll
+ ..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index ffe7ea47..b7b4f47e 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -69,10 +69,10 @@
FakesAssemblies\Apache.NMS.Fakes.dll
- .\bin\Aspose.Words.dll
+ ..\FineUIPro\Reference BLL\Aspose.Words.dll
- .\bin\AxInterop.SYNCARDOCXLib.dll
+ ..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll
False
@@ -98,7 +98,7 @@
..\..\..\..\ELECO\SGGL_ELECO\SGGL\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll
- bin\Interop.WIA.dll
+ ..\FineUIPro\Reference BLL\Interop.WIA.dll
False
@@ -155,7 +155,7 @@
- \bin\ThoughtWorks.QRCode.dll
+ ..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll
FakesAssemblies\ThoughtWorks.QRCode.Fakes.dll
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 0e031171..b398f0cc 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -155,11 +155,11 @@
-
+
-
+
diff --git a/SGGL/SgManager.AI/SgManager.AI.csproj b/SGGL/SgManager.AI/SgManager.AI.csproj
index ac463cda..3ce31658 100644
--- a/SGGL/SgManager.AI/SgManager.AI.csproj
+++ b/SGGL/SgManager.AI/SgManager.AI.csproj
@@ -35,7 +35,7 @@
..\FineUIPro\Reference BLL\AipSdk.dll
- ..\..\..\..\五环施工平台\SGGL_CWCEC\SGGL\SgManager.AI\bin\Debug\AOP.Common.dll
+ ..\FineUIPro\Reference BLL\AOP.Common.dll
..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
@@ -44,6 +44,9 @@
+
+ ..\packages\System.Reflection.DispatchProxy.4.5.1\lib\net461\System.Reflection.DispatchProxy.dll
+
diff --git a/SGGL/SgManager.AI/packages.config b/SGGL/SgManager.AI/packages.config
index 093dcd23..bbd920e4 100644
--- a/SGGL/SgManager.AI/packages.config
+++ b/SGGL/SgManager.AI/packages.config
@@ -1,4 +1,6 @@
+
+
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs b/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs
index bd1a4f17..8424b1cd 100644
--- a/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs
+++ b/SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs
@@ -372,54 +372,7 @@ namespace WebAPI.Controllers
}
#endregion
- #region 更新人员数据交换时间
- ///
- /// 更新人员数据交换时间
- ///
- ///
- ///
- ///
- ///
- public Model.ResponeData getUpdatePersonExchangeTime(string projectCode, string idCard, string type)
- {
- var responeData = new Model.ResponeData();
- try
- {
- using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
- {
- var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectCode == projectCode);
- if (getProject != null)
- {
- var getPerson = db.SitePerson_Person.FirstOrDefault(e => e.ProjectId == getProject.ProjectId && e.IdentityCard == idCard);
- if (getPerson != null && !string.IsNullOrEmpty(type))
- {
- if (type == "1")
- {
- getPerson.ExchangeTime2 = DateTime.Now;
- if (!getPerson.ExchangeTime.HasValue)
- {
- getPerson.ExchangeTime = DateTime.Now;
- }
- }
- else
- {
- getPerson.ExchangeTime = DateTime.Now;
- }
- db.SubmitChanges();
- }
- }
- }
- }
- catch (Exception ex)
- {
- responeData.code = 0;
- responeData.message = ex.Message;
- ErrLogInfo.WriteLog(ex, "WX接口-更新人员数据交换时间", "PersonController.getUpdatePersonExchangeTime");
- }
- return responeData;
- }
- #endregion
-
+
#region 获取离场人员
///
/// 获取离场人员
@@ -549,7 +502,7 @@ namespace WebAPI.Controllers
provinceCode = x.ProvinceCode,
positiveIdcardImage = db.AttachFile.First(t => (x.PersonId + "#1") == t.ToKeyId).ImageByte,
negativeIdcardImage = db.AttachFile.First(t => (x.PersonId + "#5") == t.ToKeyId).ImageByte,
- headImage = x.HeadImage,
+ // headImage = x.HeadImage,
mobile = x.Telephone,
teamLeaderFlag = (T.GroupLeaderId == x.PersonId ? "Y" : "N"),
userType = ((w.PostType == "1" || w.PostType == "4") ? "LAB_USER_MANAGE" : "LAB_USER_BULIDER"),
@@ -577,6 +530,52 @@ namespace WebAPI.Controllers
}
#endregion
-
+ #region 更新人员数据交换时间
+ ///
+ /// 更新人员数据交换时间
+ ///
+ ///
+ ///
+ ///
+ ///
+ public Model.ResponeData getUpdatePersonExchangeTime(string projectCode, string idCard, string type)
+ {
+ var responeData = new Model.ResponeData();
+ try
+ {
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectCode == projectCode);
+ if (getProject != null)
+ {
+ var getPerson = db.SitePerson_Person.FirstOrDefault(e => e.ProjectId == getProject.ProjectId && e.IdentityCard == idCard);
+ if (getPerson != null && !string.IsNullOrEmpty(type))
+ {
+ getPerson.ExchangeTime2 = DateTime.Now;
+ if (type == "1")
+ {
+ if (!getPerson.ExchangeTime.HasValue)
+ {
+ getPerson.ExchangeTime = DateTime.Now;
+ }
+ }
+ else
+ {
+ getPerson.ExchangeTime = DateTime.Now;
+ }
+ db.SubmitChanges();
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ responeData.code = 0;
+ responeData.message = ex.Message;
+ ErrLogInfo.WriteLog(ex, "WX接口-更新人员数据交换时间", "PersonController.getUpdatePersonExchangeTime");
+ }
+ return responeData;
+ }
+ #endregion
}
}
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index 3aa04ce1..6013a564 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -51,18 +51,21 @@
- bin\Apache.NMS.Fakes.dll
+ ..\FineUIPro\Reference BLL\Apache.NMS.Fakes.dll
- bin\Aspose.Words.dll
+ ..\FineUIPro\Reference BLL\Aspose.Words.dll
+
+
+ ..\FineUIPro\FineUIPro.dll
-
..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
- bin\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
+ True
..\packages\Pipelines.Sockets.Unofficial.2.2.2\lib\net461\Pipelines.Sockets.Unofficial.dll
@@ -172,10 +175,6 @@
True
..\packages\WebGrease.1.6.0\lib\WebGrease.dll
-
- True
- ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll
-