diff --git a/SGGL/BLL/IDP/IDPDataService.cs b/SGGL/BLL/IDP/IDPDataService.cs
index c4e3800e..3c1f40d5 100644
--- a/SGGL/BLL/IDP/IDPDataService.cs
+++ b/SGGL/BLL/IDP/IDPDataService.cs
@@ -1,12 +1,15 @@
-using Model;
+using Apache.NMS.ActiveMQ;
+using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using Quartz.Util;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Net;
+using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Text;
@@ -307,6 +310,11 @@ namespace BLL
#region 数字档案馆
+ ///
+ /// 数字档案馆webApi地址
+ ///
+ private static readonly string GetApiUrl = "https://getapi.cwcec.com/api/WebApi";
+
///
/// 接收保存数据
///
@@ -360,6 +368,313 @@ namespace BLL
}
}
+ ///
+ /// 质量管理设计图纸——更新蓝图寄出信息
+ ///
+ /// 项目Id
+ /// 开始时间
+ /// 结束时间
+ public static string GetDesignDrawingDataBlueprintInfo(string projectId = "", string startDate = "", string endDate = "")
+ {
+ try
+ {
+ string message = string.Empty;
+ //五环主数据项目Code
+ string projectCode = string.Empty;
+ if (!string.IsNullOrWhiteSpace(projectId))
+ {//根据施工平台项目Id获取主数据项目Code
+ var getPro = ProjectService.GetProjectByProjectId(projectId);
+ projectCode = getPro.ProjectCode;
+ }
+
+ if (string.IsNullOrWhiteSpace(startDate))
+ {
+ startDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+ }
+ if (string.IsNullOrWhiteSpace(endDate))
+ {
+ endDate = DateTime.Now.AddDays(+1).ToString("yyyy-MM-dd");
+ }
+
+ string url = $"{GetApiUrl}/GetBlueprintInfo?BeginTime={startDate}&EndTime={endDate}";
+ if (!string.IsNullOrWhiteSpace(projectCode)) { url = $"{url}&item_id={projectCode}"; }
+ ////folderNo:文件包号(示例:18063-40401-AR15)
+ //if (!string.IsNullOrWhiteSpace(folderNo)) { url = $"{url}&folderNo={folderNo}"; }
+ ////IsUpgrade:文件版次(示例:9)
+ //if (!string.IsNullOrWhiteSpace(IsUpgrade)) { url = $"{url}&IsUpgrade={IsUpgrade}"; }
+
+ //ErrLogInfo.WriteLog($"接口地址{url}");
+ //var returndata = "[{\"item_id\":\"22150\",\"modifiedTime\":\"2022/3/9 15:21:32\",\"folderNo\":\"22150-21000-WT2501-001\",\"isUpgrade\":\"D00\",\"fileType\":\"非设备蓝图\",\"senderName\":\"吴荟\",\"receiverAddress\":\"新疆哈密市伊吾县淖毛湖镇广汇生活区12号楼\",\"receiverName\":\"李娟\",\"receiverType\":\"业主\",\"receiverUnit\":\"哈密广汇环保科技有限公司\"},{\"item_id\":\"22150\",\"modifiedTime\":\"2022/3/9 15:21:33\",\"folderNo\":\"22150-21000-WT4401-001\",\"isUpgrade\":\"D00\",\"fileType\":\"非设备蓝图\",\"senderName\":\"吴荟\",\"receiverAddress\":\"新疆哈密市伊吾县淖毛湖镇广汇生活区12号楼\",\"receiverName\":\"李娟\",\"receiverType\":\"业主\",\"receiverUnit\":\"哈密广汇环保科技有限公司\"},{\"item_id\":\"22150\",\"modifiedTime\":\"2022/3/19 15:23:33\",\"folderNo\":\"22150-21000-WT4401-001\",\"isUpgrade\":\"D00\",\"fileType\":\"非设备蓝图\",\"senderName\":\"吴荟\",\"receiverAddress\":\"新疆哈密市伊吾县淖毛湖镇广汇生活区12号楼\",\"receiverName\":\"李娟\",\"receiverType\":\"业主\",\"receiverUnit\":\"哈密广汇环保科技有限公司\"}]";
+ var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, null, null);
+
+ //ErrLogInfo.WriteLog($"返回结果:{returndata}");
+ if (!string.IsNullOrEmpty(returndata))
+ {
+ int succ = 0;
+ int err = 0;
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ List responseData = BlueprintInfoItems.FromJson(returndata);
+ if (responseData.Any())
+ {
+ //ErrLogInfo.WriteLog($"序列化对象:ok");
+ responseData = responseData.OrderByDescending(x => x.modifiedTime).ToList();
+ responseData = responseData.GroupBy(p => new { p.item_id, p.folderNo, p.isUpgrade }).Select(g => g.First()).ToList();
+ foreach (var item in responseData)
+ {
+ IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.ProjectCode == item.item_id && x.FormatFileCode == item.folderNo && x.FileVersion == item.isUpgrade);
+ if (newItem == null)
+ {
+ err++;
+ continue;
+ }
+ newItem.Sendtime = item.modifiedTime;
+ db.SubmitChanges();
+ succ++;
+ }
+ }
+ }
+ message = $"成功。总数:{(succ + err)}条;成功更新{succ}条,失败{err}条。";
+ }
+ else
+ {
+ message = "无数据";
+ }
+ return message;
+ }
+ catch (WebException ex)
+ {
+ return ex.Message;
+ }
+ }
+
+
+ ///
+ /// 质量管理设计图纸——更新蓝图打印信息
+ ///
+ /// 项目Id
+ /// 开始时间
+ /// 结束时间
+ public static string GetDesignDrawingDataPrintInfo(string projectId = "", string startDate = "", string endDate = "")
+ {
+ try
+ {
+ string message = string.Empty;
+ //五环主数据项目Code
+ string projectCode = string.Empty;
+ if (!string.IsNullOrWhiteSpace(projectId))
+ {//根据施工平台项目Id获取主数据项目Code
+ var getPro = ProjectService.GetProjectByProjectId(projectId);
+ projectCode = getPro.ProjectCode;
+ }
+ if (string.IsNullOrWhiteSpace(startDate))
+ {
+ startDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+ }
+ if (string.IsNullOrWhiteSpace(endDate))
+ {
+ endDate = DateTime.Now.AddDays(+1).ToString("yyyy-MM-dd");
+ }
+
+ string url = $"{GetApiUrl}/GetPrintInfo?BeginTime={startDate}&EndTime={endDate}";
+ if (!string.IsNullOrWhiteSpace(projectCode)) { url = $"{url}&item_id={projectCode}"; }
+ ////folderNo:文件包号(示例:18063-40401-AR15)
+ //if (!string.IsNullOrWhiteSpace(folderNo)) { url = $"{url}&folderNo={folderNo}"; }
+ ////IsUpgrade:文件版次(示例:9)
+ //if (!string.IsNullOrWhiteSpace(IsUpgrade)) { url = $"{url}&IsUpgrade={IsUpgrade}"; }
+
+ //var returndata = "[{\"recorder\":\"姚曙光\",\"item_id\":\"22150\",\"item_name\":\"哈密广汇环保科技有限公司荒煤气综合利用年产40万吨乙二醇项目\",\"folderNo\":\"22150-21000-WT2501-001\",\"folder_name\":\"文件目录-202203091052472988\",\"isUpgrade\":\"D00\",\"createTime\":\"2022/3/10 10:52:47\",\"doc_printtime\":\"2022/3/10 15:30:46\",\"isPrint\":\"是\",\"project_id\":\"3288\"},{\"recorder\":\"姚曙光\",\"item_id\":\"22150\",\"item_name\":\"哈密广汇环保科技有限公司荒煤气综合利用年产40万吨乙二醇项目\",\"folderNo\":\"22150-21000-WT4401-001\",\"folder_name\":\"门窗表-202203091052527479\",\"isUpgrade\":\"D00\",\"createTime\":\"2022/3/12 10:52:53\",\"doc_printtime\":\"2022/3/12 15:30:46\",\"isPrint\":\"是\",\"project_id\":\"3288\"}]";
+ var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, null, null);
+ if (!string.IsNullOrEmpty(returndata))
+ {
+ int succ = 0;
+ int err = 0;
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ List responseData = PrintInfoItems.FromJson(returndata);
+ if (responseData.Any())
+ {
+ responseData = responseData.OrderByDescending(x => x.doc_printtime).ToList();
+ responseData = responseData.GroupBy(p => new { p.item_id, p.folderNo, p.isUpgrade }).Select(g => g.First()).ToList();
+ foreach (var item in responseData)
+ {
+ IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.ProjectCode == item.item_id && x.FormatFileCode == item.folderNo && x.FileVersion == item.isUpgrade);
+ if (newItem == null)
+ {
+ err++;
+ continue;
+ }
+ newItem.Printtime = item.doc_printtime;
+ db.SubmitChanges();
+ succ++;
+ }
+ }
+ }
+ message = $"成功。总数:{(succ + err)}条;成功更新{succ}条,失败{err}条。";
+ }
+ else
+ {
+ message = "无数据";
+ }
+ return message;
+ }
+ catch (WebException ex)
+ {
+ return ex.Message;
+ }
+ }
+
+
+
+ ///
+ /// 质量管理设计图纸——更新蓝图寄出信息【暂时不用,同步历史数据时,可调整方法】
+ ///
+ /// 项目Id
+ /// 开始时间
+ /// 结束时间
+ public static void GetDesignDrawingDataBlueprintInfo1(DateTime startDate, DateTime endDate)
+ {
+ try
+ {
+ string message = string.Empty;
+ string url = $"{GetApiUrl}/GetBlueprintInfo?BeginTime={startDate}&EndTime={endDate}";
+ //if (!string.IsNullOrWhiteSpace(projectCode)) { url = $"{url}&item_id={projectCode}"; }
+ ////folderNo:文件包号(示例:18063-40401-AR15)
+ //if (!string.IsNullOrWhiteSpace(folderNo)) { url = $"{url}&folderNo={folderNo}"; }
+ ////IsUpgrade:文件版次(示例:9)
+ //if (!string.IsNullOrWhiteSpace(IsUpgrade)) { url = $"{url}&IsUpgrade={IsUpgrade}"; }
+
+ //ErrLogInfo.WriteLog($"接口地址{url}");
+ //var returndata = "[{\"item_id\":\"22150\",\"modifiedTime\":\"2022/3/9 15:21:32\",\"folderNo\":\"22150-21000-WT2501-001\",\"isUpgrade\":\"D00\",\"fileType\":\"非设备蓝图\",\"senderName\":\"吴荟\",\"receiverAddress\":\"新疆哈密市伊吾县淖毛湖镇广汇生活区12号楼\",\"receiverName\":\"李娟\",\"receiverType\":\"业主\",\"receiverUnit\":\"哈密广汇环保科技有限公司\"},{\"item_id\":\"22150\",\"modifiedTime\":\"2022/3/9 15:21:33\",\"folderNo\":\"22150-21000-WT4401-001\",\"isUpgrade\":\"D00\",\"fileType\":\"非设备蓝图\",\"senderName\":\"吴荟\",\"receiverAddress\":\"新疆哈密市伊吾县淖毛湖镇广汇生活区12号楼\",\"receiverName\":\"李娟\",\"receiverType\":\"业主\",\"receiverUnit\":\"哈密广汇环保科技有限公司\"},{\"item_id\":\"22150\",\"modifiedTime\":\"2022/3/19 15:23:33\",\"folderNo\":\"22150-21000-WT4401-001\",\"isUpgrade\":\"D00\",\"fileType\":\"非设备蓝图\",\"senderName\":\"吴荟\",\"receiverAddress\":\"新疆哈密市伊吾县淖毛湖镇广汇生活区12号楼\",\"receiverName\":\"李娟\",\"receiverType\":\"业主\",\"receiverUnit\":\"哈密广汇环保科技有限公司\"}]";
+ var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, null, null);
+
+ //ErrLogInfo.WriteLog($"返回结果:{returndata}");
+ if (!string.IsNullOrEmpty(returndata))
+ {
+ int succ = 0;
+ int err = 0;
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ List responseData = BlueprintInfoItems.FromJson(returndata);
+ if (responseData.Any())
+ {
+ //ErrLogInfo.WriteLog($"序列化对象:ok");
+ responseData = responseData.OrderByDescending(x => x.modifiedTime).ToList();
+ responseData = responseData.GroupBy(p => new { p.item_id, p.folderNo, p.isUpgrade }).Select(g => g.First()).ToList();
+ foreach (var item in responseData)
+ {
+ IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.ProjectCode == item.item_id && x.FormatFileCode == item.folderNo && x.FileVersion == item.isUpgrade);
+ if (newItem == null)
+ {
+ err++;
+ continue;
+ }
+ newItem.Sendtime = item.modifiedTime;
+ db.SubmitChanges();
+ succ++;
+ }
+ }
+ }
+ message = $"成功。总数:{(succ + err)}条;成功更新{succ}条,失败{err}条。";
+ }
+ else
+ {
+ message = "无数据";
+ }
+
+ if (startDate > DateTime.Now)
+ {
+ //return message;
+ }
+ else
+ {
+ GetDesignDrawingDataBlueprintInfo1(startDate.AddDays(1), startDate.AddDays(2));
+ }
+
+ }
+ catch (WebException ex)
+ {
+ //return ex.Message;
+ }
+ }
+
+
+ ///
+ /// 质量管理设计图纸——更新蓝图打印信息【暂时不用,同步历史数据时,可调整方法】
+ ///
+ /// 项目Id
+ /// 开始时间
+ /// 结束时间
+ public static string GetDesignDrawingDataPrintInfo1(string projectId = "", string startDate = "", string endDate = "")
+ {
+ try
+ {
+ string message = string.Empty;
+ //五环主数据项目Code
+ string projectCode = string.Empty;
+ if (!string.IsNullOrWhiteSpace(projectId))
+ {//根据施工平台项目Id获取主数据项目Code
+ var getPro = ProjectService.GetProjectByProjectId(projectId);
+ projectCode = getPro.ProjectCode;
+ }
+ if (string.IsNullOrWhiteSpace(startDate))
+ {
+ startDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+ }
+ else
+ if (string.IsNullOrWhiteSpace(endDate))
+ {
+ endDate = DateTime.Now.AddDays(+1).ToString("yyyy-MM-dd");
+ }
+
+ string url = $"{GetApiUrl}/GetPrintInfo?BeginTime={startDate}&EndTime={endDate}";
+ if (!string.IsNullOrWhiteSpace(projectCode)) { url = $"{url}&item_id={projectCode}"; }
+ ////folderNo:文件包号(示例:18063-40401-AR15)
+ //if (!string.IsNullOrWhiteSpace(folderNo)) { url = $"{url}&folderNo={folderNo}"; }
+ ////IsUpgrade:文件版次(示例:9)
+ //if (!string.IsNullOrWhiteSpace(IsUpgrade)) { url = $"{url}&IsUpgrade={IsUpgrade}"; }
+
+ //var returndata = "[{\"recorder\":\"姚曙光\",\"item_id\":\"22150\",\"item_name\":\"哈密广汇环保科技有限公司荒煤气综合利用年产40万吨乙二醇项目\",\"folderNo\":\"22150-21000-WT2501-001\",\"folder_name\":\"文件目录-202203091052472988\",\"isUpgrade\":\"D00\",\"createTime\":\"2022/3/10 10:52:47\",\"doc_printtime\":\"2022/3/10 15:30:46\",\"isPrint\":\"是\",\"project_id\":\"3288\"},{\"recorder\":\"姚曙光\",\"item_id\":\"22150\",\"item_name\":\"哈密广汇环保科技有限公司荒煤气综合利用年产40万吨乙二醇项目\",\"folderNo\":\"22150-21000-WT4401-001\",\"folder_name\":\"门窗表-202203091052527479\",\"isUpgrade\":\"D00\",\"createTime\":\"2022/3/12 10:52:53\",\"doc_printtime\":\"2022/3/12 15:30:46\",\"isPrint\":\"是\",\"project_id\":\"3288\"}]";
+ var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, null, null);
+ if (!string.IsNullOrEmpty(returndata))
+ {
+ int succ = 0;
+ int err = 0;
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ List responseData = PrintInfoItems.FromJson(returndata);
+ if (responseData.Any())
+ {
+ responseData = responseData.OrderByDescending(x => x.doc_printtime).ToList();
+ responseData = responseData.GroupBy(p => new { p.item_id, p.folderNo, p.isUpgrade }).Select(g => g.First()).ToList();
+ foreach (var item in responseData)
+ {
+ IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.ProjectCode == item.item_id && x.FormatFileCode == item.folderNo && x.FileVersion == item.isUpgrade);
+ if (newItem == null)
+ {
+ err++;
+ continue;
+ }
+ newItem.Printtime = item.doc_printtime;
+ db.SubmitChanges();
+ succ++;
+ }
+ }
+ }
+ message = $"成功。总数:{(succ + err)}条;成功更新{succ}条,失败{err}条。";
+ }
+ else
+ {
+ message = "无数据";
+ }
+ return message;
+ }
+ catch (WebException ex)
+ {
+ return ex.Message;
+ }
+ }
+
#endregion
diff --git a/SGGL/Model/IDP/OADesignDrawingData.cs b/SGGL/Model/IDP/OADesignDrawingData.cs
index 4b0a8183..996ea6a2 100644
--- a/SGGL/Model/IDP/OADesignDrawingData.cs
+++ b/SGGL/Model/IDP/OADesignDrawingData.cs
@@ -13,23 +13,150 @@ namespace Model
using System.Collections.Generic;
using Newtonsoft.Json;
+
///
- /// OA设计图纸接收参数
+ /// 蓝图寄出数据结果对象
///
- public partial class OADesignDrawingData
+ public partial class BlueprintInfoItem
{
///
- /// OA设计图纸数据项集合
+ /// 主数据项目编号
///
- public List DataItems
+ [JsonProperty("item_id")]
+ public string item_id { get; set; }
+ ///
+ /// 蓝图寄出时间
+ ///
+ [JsonProperty("modifiedTime")]
+ public DateTime? modifiedTime { get; set; }
+ ///
+ /// 文件编号
+ ///
+ [JsonProperty("folderNo")]
+ public string folderNo { get; set; }
+ ///
+ /// 文件版次
+ ///
+ [JsonProperty("isUpgrade")]
+ public string isUpgrade { get; set; }
+
+ /***
+
+ ///
+ /// 文件类型
+ ///
+ [JsonProperty("fileType")]
+ public string fileType { get; set; }
+ ///
+ ///寄出人
+ ///
+ [JsonProperty("senderName")]
+ public string senderName { get; set; }
+ ///
+ ///接收地址
+ ///
+ [JsonProperty("receiverAddress")]
+ public string receiverAddress { get; set; }
+ ///
+ ///接收人
+ ///
+ [JsonProperty("receiverName")]
+ public string receiverName { get; set; }
+ ///
+ ///接收类型
+ ///
+ [JsonProperty("receiverType")]
+ public string receiverType { get; set; }
+ ///
+ ///接收单位
+ ///
+ [JsonProperty("receiverUnit")]
+ public string receiverUnit { get; set; }
+
+ ***/
+ }
+
+ public partial class BlueprintInfoItems
+ {
+ public static List FromJson(string json)
{
- get;
- set;
+ return JsonConvert.DeserializeObject>(json, Model.Converter.Settings);
}
}
+
///
- /// 数据结果对象
+ /// 蓝图寄出数据结果对象
+ ///
+ public partial class PrintInfoItem
+ {
+ ///
+ /// 主数据项目编号
+ ///
+ [JsonProperty("item_id")]
+ public string item_id { get; set; }
+ ///
+ /// 蓝图寄出时间
+ ///
+ [JsonProperty("doc_printtime")]
+ public DateTime? doc_printtime { get; set; }
+ ///
+ /// 文件编号
+ ///
+ [JsonProperty("folderNo")]
+ public string folderNo { get; set; }
+ ///
+ /// 文件版次
+ ///
+ [JsonProperty("isUpgrade")]
+ public string isUpgrade { get; set; }
+
+ /***
+
+ ///
+ /// recorder
+ ///
+ [JsonProperty("recorder")]
+ public string recorder { get; set; }
+ ///
+ ///item_name
+ ///
+ [JsonProperty("item_name")]
+ public string item_name { get; set; }
+ ///
+ ///folder_name
+ ///
+ [JsonProperty("folder_name")]
+ public string folder_name { get; set; }
+ ///
+ ///createTime
+ ///
+ [JsonProperty("createTime")]
+ public DateTime? createTime { get; set; }
+ ///
+ ///isPrint
+ ///
+ [JsonProperty("isPrint")]
+ public string isPrint { get; set; }
+ ///
+ ///project_id
+ ///
+ [JsonProperty("project_id")]
+ public string project_id { get; set; }
+
+ ***/
+ }
+ public partial class PrintInfoItems
+ {
+ public static List FromJson(string json)
+ {
+ return JsonConvert.DeserializeObject>(json, Model.Converter.Settings);
+ }
+ }
+
+
+ ///
+ /// 数据对象
///
public partial class OADesignDrawingDataItem
{
diff --git a/SGGL/WebAPI/Controllers/IDP/IDPController.cs b/SGGL/WebAPI/Controllers/IDP/IDPController.cs
index c0d672d0..5558baf5 100644
--- a/SGGL/WebAPI/Controllers/IDP/IDPController.cs
+++ b/SGGL/WebAPI/Controllers/IDP/IDPController.cs
@@ -64,6 +64,47 @@ namespace WebAPI.Controllers
return responeData;
}
+
+ ///
+ /// 每天夜间同步获取OA系统项目设计图纸数据蓝图寄出信息
+ ///
+ ///
+ [HttpPost]
+ public Model.ResponeData SynOADesignDrawingDataBlueprintInfo()
+ {
+ var responeData = new Model.ResponeData();
+ try
+ {
+ responeData.message = IDPDataService.GetDesignDrawingDataBlueprintInfo();
+ }
+ catch (Exception ex)
+ {
+ responeData.code = 0;
+ responeData.message = ex.ToString();
+ }
+ return responeData;
+ }
+
+ ///
+ /// 每天夜间同步获取OA系统项目设计图纸数据蓝图打印信息
+ ///
+ ///
+ [HttpPost]
+ public Model.ResponeData SynOADesignDrawingDataPrintInfo()
+ {
+ var responeData = new Model.ResponeData();
+ try
+ {
+ responeData.message = IDPDataService.GetDesignDrawingDataPrintInfo();
+ }
+ catch (Exception ex)
+ {
+ responeData.code = 0;
+ responeData.message = ex.ToString();
+ }
+ return responeData;
+ }
+
#endregion
#region IDP系统项目开车数据
diff --git a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
index 67608bfe..17c66638 100644
--- a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
+++ b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
@@ -91,6 +91,8 @@ namespace WebAPI.Filter
"PMP*SynPMPProjectData",
"IDP*SynIDPDesignDrawingData",
"IDP*SynIDPPreRunData",
+ "IDP*SynOADesignDrawingDataBlueprintInfo",
+ "IDP*SynOADesignDrawingDataPrintInfo",
"JGZL*getUserList",
"JGZL*getProjedtList",
"JGZL*getUnitWorkListByProjectId",
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 0b2fea70..41e155dd 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -6,7 +6,7 @@
<_PublishTargetUrl>G:\发布\五环WebApi
- True|2025-07-18T09:55:59.4892329Z||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;
+ True|2025-07-21T09:46:45.4620710Z||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;
@@ -86,22 +86,22 @@
10/28/2024 14:02:50
- 07/18/2025 17:55:56
+ 07/21/2025 17:46:44
- 07/18/2025 17:55:56
+ 07/21/2025 17:46:44
12/06/2024 20:13:58
- 07/18/2025 17:55:29
+ 07/21/2025 17:46:34
12/26/2024 09:46:52
- 07/18/2025 17:55:29
+ 07/21/2025 17:46:34
12/18/2020 05:32:28
@@ -128,10 +128,10 @@
07/25/2012 19:48:56
- 07/18/2025 17:55:22
+ 07/21/2025 17:04:55
- 07/18/2025 17:55:22
+ 07/21/2025 17:04:55
07/04/2024 14:13:01
@@ -389,13 +389,13 @@
02/09/2013 00:42:28
- 07/18/2025 17:55:33
+ 07/21/2025 17:46:36
- 07/18/2025 17:55:33
+ 07/21/2025 17:46:36
- 07/18/2025 17:55:33
+ 07/21/2025 17:46:35
01/23/2014 21:57:34
@@ -479,7 +479,7 @@
10/28/2024 14:02:50
- 07/18/2025 17:55:35
+ 07/21/2025 17:46:36
10/28/2024 14:02:50
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 1a1a9a6c..17978b44 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
true