20240205 解决冲突

.gitignore

@@ -1,36 +0,0 @@
-################################################################################
-# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
-################################################################################
-
-/SGGLPackFile/PackFile/bin
-/SGGLPackFile
-/SGGL/FineUIPro.Web/File/Excel/Temp
-/SGGL/FineUIPro.Web/FileUpload/QRCodeFile
-/SGGL/FineUIPro.Web/FileUpload/DataBase/ConstructionStandardProject/2023-05
-/SGGL/FineUIPro.Web/FileUpload/CQMS/InspectionEquipment/2023-05
-/SGGL/FineUIPro.Web/FileUpload/CQMS
-/SGGL/FineUIPro.Web/FileUpload/LargerHazard/2023-06
-/SGGLPackFile.rar
-/SGGL/FineUIPro.Web/FileUpload/Solution/2023-08
-/SGGL/FineUIPro.Web/FileUpload/ProjectAttachUrl/2023-09
-/CreateModel_lpf.bat
-/ReleasePackerALL2017 - 副本 (2).bat
-/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverPrepare/DriverData/2024-01
-/SGGL/.vs/SGGL/v15
-/SGGL/.vs/SGGL/v16
-/SGGL/.vs
-/SGGL/BLL/bin
-/SGGL/FineUIPro.Web/bin
-/SGGL/MigrationBackup/696c986d/BLL
-/SGGL/Model/bin
-/SGGL/packages
-/SGGL/SgManager.AI/bin
-/SGGL/SgManager.AI/obj
-/SGGL/WebAPI/bin
-/SGGL/WebAPI/obj
-/SGGL/BLL/obj
-/SGGL/FineUIPro.Web/obj
-/SGGL/Model/obj
-/SGGL/FineUIPro.Web/web.config
-/SGGL/FineUIPro.Web/ErrLog.txt
-/SGGL/FineUIPro.Web/FileUpload/Transfer/PunchlistFrom/2024-02

.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\SGGL.sln",
+  "PreviewInSolutionExplorer": false
+}

DataBase/版本日志/SGGLDB_WH_V2024-01-02(安全风险等级修正脚本).sql

@@ -0,0 +1,12 @@
+update Hazard_HazardSelectedItem set HazardLevel=(select top 1  RiskLevelId from Base_RiskLevel where RiskLevel=1 )
+where HazardLevel is null or HazardLevel='1'
+go
+update Hazard_HazardSelectedItem set HazardLevel=(select top 1  RiskLevelId from Base_RiskLevel where RiskLevel=2 )
+where HazardLevel='2'
+go
+update Hazard_HazardSelectedItem set HazardLevel=(select top 1  RiskLevelId from Base_RiskLevel where RiskLevel=3 )
+where HazardLevel='3'
+go
+update Hazard_HazardSelectedItem set HazardLevel=(select top 1  RiskLevelId from Base_RiskLevel where RiskLevel=4)
+where HazardLevel='4'
+go

SGGL/.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

SGGL/.gitignore

@@ -0,0 +1,262 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+*.config
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+#*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc

SGGL/FineUIPro.Web/FileUpload/DocManage/2023-05/638203739946845291_GPEC智慧施工平台开发尾项截止4月23.docx

@@ -0,0 +1,38 @@
+                      GPEC智慧施工平台开发情况
+ 现有的隐患整改单定稿改造成流程  4月18日晚上 和尹经理沟通后需求 包括移动端要对应调整加流程 未完成
+流程：总包PC发起（上传各种格式附件如pdf...、推送责任单位责任人手机端待办，手机端整改（主要是图片及文字），复查验收，闭环
+
+
+ 组织机构加单位树  施工单位背靠背展示 总包看所有，各个单位自己维护自己的三级人员信息 4月17日 诺必达自己 李鹏飞调一下清空列表
+
+ 工程联诺单总包审核待办推送 诺必达自己 未完成
+
+
+ 4月17牛经理要求加个施工文件  自定义文件目录   未完成
+
+
+ 签证三个PC操作流程要待办关联 诺必达自己 未完成（注意流程微调）
+
+ 安全生产费改造成在线审批  4月16 培训后 ， 4月18日晚上 和尹经理详细沟通需求  未完成
+
+步骤:申请、审批、 台账 证明文件
+
+
+
+
+
+
+ 会议调整  叶总需求  未完成    
+
+仅限总包内部会议  需要后端配合接口
+ 加一个文件夹名称："施工技术文件" 批量上传  （任红需求）  字段：名称 、日期、附件   未完成
+
+ 所有小程序菜单检查一遍、接口配合    诺必达 责任人：杨家亮  李鹏飞
+
+
+ 首页通知文件参数设置  4月20日新加功能  诺必达公司  未完成
+
+
+
+
+

SGGL/FineUIPro.Web/FileUpload/DocManage/2023-08/638272642451976796_相关接口.docx

@@ -0,0 +1,903 @@
+中国化学集团
+
+中国化学集团
+v1.0.0
+Base URLs:
+ 七化建: https://aq.cnce7.com:8078/SUBQHSEAPI
+ 固定token C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0
+子公司/BaseInfo
+
+GET 获取项目列表
+GET /api/BaseInfo/getProjectList
+请求参数
+名称
+位置
+类型
+必选
+说明
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+  "code": 0,
+  "message": "string",
+  "data": [
+        {
+            "BaseInfoId": "2115f28d-d9e2-463d-b27d-217abe900e37",
+            "BaseInfoCode": "000",
+            "BaseInfoName": "培训演示",
+            "ImageUrl": null,
+            "Remark": null,
+            "RemarkOther": null
+        },
+        {
+            "BaseInfoId": "70b75cad-df25-4c14-9864-30566c7d9ad7",
+            "BaseInfoCode": "CC-7--FGS--003",
+            "BaseInfoName": "重机公司",
+            "ImageUrl": null,
+            "Remark": null,
+            "RemarkOther": null
+        }
+
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+BaseInfoId  项目主键
+BaseInfoCode  项目编号
+BaseInfoName  项目名称
+GET 根据项目号获取项目信息
+GET /api/BaseInfo/getProjectByCode
+请求参数
+名称
+位置
+类型
+必选
+说明
+projectCode
+query
+string
+是
+none
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+  "code": 0,
+  "message": "string",
+  "data": {}
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+
+GET 获取岗位类型
+GET /api/BaseInfo/getPostType
+请求参数
+名称
+位置
+类型
+必选
+说明
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+  "code": 0,
+  "message": "string",
+  "data": {}
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+子公司/Person
+
+GET 根据personid获取人员信息
+GET /api/Person/getPersonByPersonId
+请求参数
+名称
+位置
+类型
+必选
+说明
+personId
+query
+string
+是
+none
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+  "code": 0,
+  "message": "string",
+  "data": {}
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+
+GET 根据identityCard获取人员信息
+GET /api/Person/getPersonByIdentityCard
+请求参数
+名称
+位置
+类型
+必选
+说明
+identityCard
+query
+string
+是
+none
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+  "code": 0,
+  "message": "string",
+  "data": {}
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+
+GET 根据projectId、identityCard获取人员信息
+GET /api/Person/getPersonByProjectIdIdentityCard
+请求参数
+名称
+位置
+类型
+必选
+说明
+projectId
+query
+string
+是
+none
+identityCard
+query
+string
+是
+none
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+  "code": 0,
+  "message": "string",
+  "data": {}
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+
+GET 根据projectId、unitid获取人员信息
+GET /api/Person/getPersonByProjectIdUnitId
+请求参数
+名称
+位置
+类型
+必选
+说明
+projectId
+query
+string
+是
+none
+unitId
+query
+string
+是
+none
+pageIndex
+query
+integer
+是
+none
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+    "code": 1,
+    "message": null,
+    "data": {
+        "pageCount": 1,
+        "getDataList": [
+            {
+                "PersonId": "26240c11-6934-45da-b12e-2f58e3180a40",
+                "CardNo": null,
+                "PersonName": "王洁",
+                "SexName": "",
+                "Sex": null,
+                "IdentityCard": "622823199601100223",
+                "Address": null,
+                "ProjectId": "2115f28d-d9e2-463d-b27d-217abe900e37",
+                "ProjectCode": "000",
+                "ProjectName": "培训演示",
+                "UnitId": "80e8f02c-6b52-4705-bffc-af3a192d5a12",
+                "UnitCode": "CNCEC7",
+                "UnitName": "中国化学工程第七建设有限公司",
+                "CollCropCode": null,
+                "TeamGroupId": null,
+                "TeamGroupName": null,
+                "WorkPostId": null,
+                "WorkPostName": null,
+                "InTime": "2023-04-28",
+                "OutTime": "",
+                "OutResult": null,
+                "Telephone": null,
+                "PhotoUrl": null,
+                "DepartName": null,
+                "IsUsed": false,
+                "IsUsedName": null,
+                "WorkAreaId": null,
+                "WorkAreaName": null,
+                "AuditorId": null,
+                "AuditorName": null,
+                "AuditorDate": null,
+                "headImage": null,
+                "AttachUrl1": null,
+                "Birthday": null,
+                "AttachUrl2": null,
+                "AttachUrl3": null,
+                "AttachUrl4": null,
+                "AttachUrl5": null,
+                "PostType": null,
+                "PostTypeName": null,
+                "IsForeign": false,
+                "IsOutside": false,
+                "EduLevel": null,
+                "EduLevelName": null,
+                "MaritalStatus": null,
+                "MaritalStatusName": null,
+                "IdcardType": null,
+                "IdcardTypeName": null,
+                "IdcardStartDate": null,
+                "IdcardEndDate": null,
+                "IdcardForever": null,
+                "IdcardForeverStr": null,
+                "PoliticsStatus": null,
+                "PoliticsStatusName": null,
+                "IdcardAddress": null,
+                "Nation": null,
+                "NationName": null,
+                "CountryCode": null,
+                "CountryName": null,
+                "ProvinceCode": null,
+                "ProvinceName": null,
+                "MainCNProfessionalId": null,
+                "MainCNProfessionalName": null,
+                "ViceCNProfessionalId": null,
+                "ViceCNProfessionalName": null
+            }
+        ]
+    }
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+
+返回模型信息
+{
+    "type": "object",
+    "properties": {
+        "PersonId": {
+            "type": "string",
+            "format": "string",
+            "title": "人员主键ID"
+        },
+        "CardNo": {
+            "type": "string",
+            "format": "string",
+            "title": "卡号"
+        },
+        "PersonName": {
+            "type": "string",
+            "format": "string",
+            "title": "姓名"
+        },
+        "SexName": {
+            "type": "string",
+            "format": "string",
+            "title": "性别"
+        },
+        "Sex": {
+            "type": "string",
+            "format": "string",
+            "title": "性别"
+        },
+        "IdentityCard": {
+            "type": "string",
+            "format": "string",
+            "title": "身份证号码"
+        },
+        "Address": {
+            "type": "string",
+            "format": "string",
+            "title": "地址"
+        },
+        "ProjectId": {
+            "type": "string",
+            "format": "string",
+            "title": "项目id"
+        },
+        "ProjectCode": {
+            "type": "string",
+            "format": "string",
+            "title": "项目号"
+        },
+        "ProjectName": {
+            "type": "string",
+            "format": "string",
+            "title": "项目名称"
+        },
+        "UnitId": {
+            "type": "string",
+            "format": "string",
+            "title": "单位ID"
+        },
+        "UnitCode": {
+            "type": "string",
+            "format": "string",
+            "title": "单位代号"
+        },
+        "UnitName": {
+            "type": "string",
+            "format": "string",
+            "title": "单位名称"
+        },
+        "CollCropCode": {
+            "type": "string",
+            "format": "string",
+            "title": "统一社会信用代码"
+        },
+        "TeamGroupId": {
+            "type": "string",
+            "format": "string",
+            "title": "班组ID"
+        },
+        "TeamGroupName": {
+            "type": "string",
+            "format": "string",
+            "title": "班组名称"
+        },
+        "WorkPostId": {
+            "type": "string",
+            "format": "string",
+            "title": "岗位ID"
+        },
+        "WorkPostName": {
+            "type": "string",
+            "format": "string",
+            "title": "岗位名称"
+        },
+        "InTime": {
+            "type": "string",
+            "format": "string",
+            "title": "入场时间"
+        },
+        "OutTime": {
+            "type": "string",
+            "format": "string",
+            "title": "出场时间"
+        },
+        "OutResult": {
+            "type": "string",
+            "format": "string",
+            "title": "出场原因"
+        },
+        "Telephone": {
+            "type": "string",
+            "format": "string",
+            "title": "电话"
+        },
+        "PhotoUrl": {
+            "type": "string",
+            "format": "string",
+            "title": "照片路径"
+        },
+        "DepartName": {
+            "type": "string",
+            "format": "string",
+            "title": "部门名称"
+        },
+        "IsUsed": {
+            "type": "boolean",
+            "format": "boolean",
+            "title": "是否启用"
+        },
+        "IsUsedName": {
+            "type": "string",
+            "format": "string",
+            "title": "是否启用"
+        },
+        "WorkAreaId": {
+            "type": "string",
+            "format": "string",
+            "title": "作业区域ID"
+        },
+        "WorkAreaName": {
+            "type": "string",
+            "format": "string",
+            "title": "作业区域名称"
+        },
+        "AuditorId": {
+            "type": "string",
+            "format": "string",
+            "title": "审核人ID"
+        },
+        "AuditorName": {
+            "type": "string",
+            "format": "string",
+            "title": "审核人姓名"
+        },
+        "AuditorDate": {
+            "type": "string",
+            "format": "string",
+            "title": "审核时间"
+        },
+        "headImage": {
+            "type": "string",
+            "format": "string",
+            "title": "照片二进制"
+        },
+        "AttachUrl1": {
+            "type": "string",
+            "format": "string",
+            "title": " 身份证 附件"
+        },
+        "Birthday": {
+            "format": "date-time",
+            "type": "string",
+            "title": "生日"
+        },
+        "AttachUrl2": {
+            "type": "string",
+            "format": "string",
+            "title": "保险附件"
+        },
+        "AttachUrl3": {
+            "type": "string",
+            "format": "string",
+            "title": "体检证明"
+        },
+        "AttachUrl4": {
+            "type": "string",
+            "format": "string",
+            "title": "安全生产考核合格证书/特种作业操作证"
+        },
+        "AttachUrl5": {
+            "type": "string",
+            "format": "string",
+            "title": "身份证背面照"
+        },
+        "PostType": {
+            "type": "string",
+            "format": "string",
+            "title": "岗位类型"
+        },
+        "PostTypeName": {
+            "type": "string",
+            "format": "string",
+            "title": "岗位类型名称"
+        },
+        "IsForeign": {
+            "type": "boolean",
+            "format": "boolean",
+            "title": "是否外籍人员"
+        },
+        "IsOutside": {
+            "type": "boolean",
+            "format": "boolean",
+            "title": "是否外聘人员"
+        },
+        "EduLevel": {
+            "type": "string",
+            "format": "string",
+            "title": "文化程度"
+        },
+        "EduLevelName": {
+            "type": "string",
+            "format": "string",
+            "title": "文化程度"
+        },
+        "MaritalStatus": {
+            "type": "string",
+            "format": "string",
+            "title": "婚姻状况"
+        },
+        "MaritalStatusName": {
+            "type": "string",
+            "format": "string",
+            "title": "婚姻状况"
+        },
+        "IdcardType": {
+            "type": "string",
+            "format": "string",
+            "title": "证件类型"
+        },
+        "IdcardTypeName": {
+            "type": "string",
+            "format": "string",
+            "title": "证件类型"
+        },
+        "IdcardStartDate": {
+            "type": "string",
+            "format": "string",
+            "title": "证件开始时间"
+        },
+        "IdcardEndDate": {
+            "type": "string",
+            "format": "string",
+            "title": "证件结束时间"
+        },
+        "IdcardForever": {
+            "type": "string",
+            "format": "string",
+            "title": "证件是否永久有效"
+        },
+        "IdcardForeverStr": {
+            "type": "string",
+            "format": "string",
+            "title": "证件是否永久有效"
+        },
+        "PoliticsStatus": {
+            "type": "string",
+            "format": "string",
+            "title": "政治面貌"
+        },
+        "PoliticsStatusName": {
+            "type": "string",
+            "format": "string",
+            "title": "政治面貌"
+        },
+        "IdcardAddress": {
+            "type": "string",
+            "format": "string",
+            "title": "发证机关"
+        },
+        "Nation": {
+            "type": "string",
+            "format": "string",
+            "title": "民族"
+        },
+        "NationName": {
+            "type": "string",
+            "format": "string",
+            "title": "民族"
+        },
+        "CountryCode": {
+            "type": "string",
+            "format": "string",
+            "title": "国家"
+        },
+        "CountryName": {
+            "type": "string",
+            "format": "string",
+            "title": "国家"
+        },
+        "ProvinceCode": {
+            "type": "string",
+            "format": "string",
+            "title": "省份"
+        },
+        "ProvinceName": {
+            "type": "string",
+            "format": "string",
+            "title": "省份"
+        },
+        "MainCNProfessionalId": {
+            "type": "string",
+            "format": "string",
+            "title": "主专业"
+        },
+        "MainCNProfessionalName": {
+            "type": "string",
+            "format": "string",
+            "title": "主专业"
+        },
+        "ViceCNProfessionalId": {
+            "type": "string",
+            "format": "string",
+            "title": "副专业"
+        },
+        "ViceCNProfessionalName": {
+            "type": "string",
+            "format": "string",
+            "title": "副专业"
+        }
+    },
+    "x-apifox-orders": [
+        "PersonId",
+        "CardNo",
+        "PersonName",
+        "SexName",
+        "Sex",
+        "IdentityCard",
+        "Address",
+        "ProjectId",
+        "ProjectCode",
+        "ProjectName",
+        "UnitId",
+        "UnitCode",
+        "UnitName",
+        "CollCropCode",
+        "TeamGroupId",
+        "TeamGroupName",
+        "WorkPostId",
+        "WorkPostName",
+        "InTime",
+        "OutTime",
+        "OutResult",
+        "Telephone",
+        "PhotoUrl",
+        "DepartName",
+        "IsUsed",
+        "IsUsedName",
+        "WorkAreaId",
+        "WorkAreaName",
+        "AuditorId",
+        "AuditorName",
+        "AuditorDate",
+        "headImage",
+        "AttachUrl1",
+        "Birthday",
+        "AttachUrl2",
+        "AttachUrl3",
+        "AttachUrl4",
+        "AttachUrl5",
+        "PostType",
+        "PostTypeName",
+        "IsForeign",
+        "IsOutside",
+        "EduLevel",
+        "EduLevelName",
+        "MaritalStatus",
+        "MaritalStatusName",
+        "IdcardType",
+        "IdcardTypeName",
+        "IdcardStartDate",
+        "IdcardEndDate",
+        "IdcardForever",
+        "IdcardForeverStr",
+        "PoliticsStatus",
+        "PoliticsStatusName",
+        "IdcardAddress",
+        "Nation",
+        "NationName",
+        "CountryCode",
+        "CountryName",
+        "ProvinceCode",
+        "ProvinceName",
+        "MainCNProfessionalId",
+        "MainCNProfessionalName",
+        "ViceCNProfessionalId",
+        "ViceCNProfessionalName"
+    ]
+}
+
+
+
+
+子公司/Unit
+
+GET 根据UnitId获取单位信息
+GET /api/Unit/getUnitByUnitId
+请求参数
+名称
+位置
+类型
+必选
+说明
+unitId
+query
+string
+是
+none
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+  "code": 0,
+  "message": "string",
+  "data": {}
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+
+GET 根据projectId、unitType获取单位信息（总包1;施工分包2;监理3;业主4;其他5）
+GET /api/Unit/getUnitByProjectIdUnitType
+请求参数
+名称
+位置
+类型
+必选
+说明
+projectId
+query
+string
+是
+项目ID
+unitType
+query
+string
+是
+类型（null 所有单位）
+pageIndex
+query
+integer
+否
+分页
+unitId
+query
+string
+否
+单位id（填写则为公司级）
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+  "code": 0,
+  "message": "string",
+  "data": {}
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+请求示例
+
+GET 获取所有单位
+GET /api/Unit/getUnitLists
+请求参数
+名称
+位置
+类型
+必选
+说明
+token
+header
+string
+否
+none
+返回示例
+200 Response
+{
+  "code": 0,
+  "message": "string",
+  "data": {}
+}
+返回结果
+状态码
+状态码含义
+说明
+数据模型
+200
+OK [HYPERLINK: https://tools.ietf.org/html/rfc7231]
+OK
+ResponeData
+数据模型
+ResponeData
+   
+{
+  "code": 0,
+  "message": "string",
+  "data": {}
+}
+属性
+名称
+类型
+必选
+约束
+中文名
+说明
+code
+integer(int32)
+false
+none
+
+none
+message
+string
+false
+none
+
+none
+data
+object
+false
+none
+
+none
+

SGGL/FineUIPro.Web/FileUpload/TestRun/PersonTrain/TrainContract/2024-01/638417217621619302_WBS复制粘贴说明.docx

@@ -0,0 +1,3 @@
+1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
+2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
+

SGGL/MigrationBackup/696c986d/BLL/NuGetUpgradeLog.html

@@ -0,0 +1,179 @@
+<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+
+    <html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="NuGetUpgradeReportTitle">
+          NuGetMigrationLog
+        </title><style>
+            
+                    /* Body style, for the entire document */
+                    body
+                    {
+                        background: #F3F3F4;
+                        color: #1E1E1F;
+                        font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+                        font-size: 12pt;
+                        padding: 0;
+                        margin: 0;
+                    }
+
+                    /* Header1 style, used for the main title */
+                    h1
+                    {
+                        padding: 10px 0px 10px 10px;
+                        font-size: 21pt;
+                        background-color: #E2E2E2;
+                        border-bottom: 1px #C1C1C2 solid; 
+                        color: #201F20;
+                        margin: 0;
+                        font-weight: normal;
+                    }
+
+                    /* Header2 style, used for "Overview" and other sections */
+                    h2
+                    {
+                        font-size: 18pt;
+                        font-weight: normal;
+                        padding: 15px 0 5px 0;
+                        margin: 0;
+                    }
+
+                    /* Header3 style, used for sub-sections, such as project name */
+                    h3
+                    {
+                        font-weight: normal;
+                        font-size: 15pt;
+                        margin: 0;
+                        padding: 15px 0 5px 0;
+                        background-color: transparent;
+                    }
+
+                    .info-text
+                    {
+                        margin: 0px 0 0.75em 0;
+                    }
+
+                    /* Color all hyperlinks one color */
+                    a
+                    {
+                        color: #1382CE;
+                    }
+
+                    /* Table styles */ 
+                    table
+                    {
+                        border-spacing: 0 0;
+                        border-collapse: collapse;
+                        font-size: 11pt;
+                    }
+
+                    table th
+                    {
+                        background: #E7E7E8;
+                        text-align: left;
+                        text-decoration: none;
+                        font-weight: normal;
+                        padding: 3px 6px 3px 6px;
+                    }
+
+                    table td
+                    {
+                        vertical-align: top;
+                        padding: 3px 6px 5px 5px;
+                        margin: 0px;
+                        border: 1px solid #E7E7E8;
+                        background: #F7F7F8;
+                    }
+
+                    /* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
+                    .localLink
+                    {
+                        color: #1E1E1F;
+                        background: #EEEEED;
+                        text-decoration: none;
+                    }
+
+                    .localLink:hover
+                    {
+                        color: #1382CE;
+                        background: #FFFF99;
+                        text-decoration: none;
+                    }
+
+                    .issueCell
+                    {
+                        width: 100%;
+                    }
+
+                    .packageIssue
+                    {
+                        margin-left: 25px;
+                    }
+
+                    /* Padding around the content after the h1 */ 
+                    #content 
+                    {
+	                    padding: 0px 20px 20px 20px; 
+                    }
+
+                    .issues table
+                    {
+                        width: 97%;
+                    }
+
+                    /* All Icons */
+                    .IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
+                    {
+                        min-width:18px;
+                        min-height:18px; 
+                        background-repeat:no-repeat;
+                        background-position:center;
+                    }
+
+                    .IconSuccessEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
+                    }
+
+                    .IconInfoEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
+                    }
+
+                    .IconWarningEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
+                    }
+
+                    .IconErrorEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
+                    }
+                
+          </style></head><body><h1>
+          NuGet Migration Report - BLL</h1><div id="content"><h2 _locID="OverviewTitle">Overview</h2><div class="info-text">Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.</div><div class="info-text">
+            If you run into any problems, have feedback, questions, or concerns, please
+            <a href="https://github.com/NuGet/Home/issues/">file an issue on the NuGet GitHub repository.</a></div><div class="info-text">
+            Changed files and this report have been backed up here:
+            <a href="D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\MigrationBackup\696c986d\BLL">D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\MigrationBackup\696c986d\BLL</a></div><div class="info-text"><a href="https://aka.ms/nuget-pc2pr-migrator-rollback">Help me rollback to packages.config</a></div><h2 _locID="PackagesTitle">Packages processed</h2><h3 _locID="IncludePackagesTitle">Top-level dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell"><span>EmitMapper</span></td><td><span>
+                v1.0.0</span></td></tr><tr><td class="issueCell"><span>jQuery</span></td><td><span>
+                v3.5.1</span></td></tr><tr><td class="issueCell"><span>Microsoft.Extensions.Logging.Abstractions</span></td><td><span>
+                v2.1.1</span></td></tr><tr><td class="issueCell"><span>Newtonsoft.Json</span></td><td><span>
+                v12.0.3</span></td></tr><tr><td class="issueCell"><span>NPOI</span></td><td><span>
+                v2.5.5</span></td></tr><tr><td class="issueCell"><span>Portable.BouncyCastle</span></td><td><span>
+                v1.8.9</span></td></tr><tr><td class="issueCell"><span>Quartz</span></td><td><span>
+                v3.5.0</span></td></tr><tr><td class="issueCell"><span>RestSharp</span></td><td><span>
+                v106.15.0</span></td></tr><tr><td class="issueCell"><span>SharpZipLib</span></td><td><span>
+                v1.3.2</span></td></tr><tr><td class="issueCell"><span>System.Buffers</span></td><td><span>
+                v4.5.1</span></td></tr><tr><td class="issueCell"><span>System.Configuration.ConfigurationManager</span></td><td><span>
+                v4.7.0</span></td></tr><tr><td class="issueCell"><span>System.Diagnostics.DiagnosticSource</span></td><td><span>
+                v4.7.1</span></td></tr><tr><td class="issueCell"><span>System.Memory</span></td><td><span>
+                v4.5.4</span></td></tr><tr><td class="issueCell"><span>System.Numerics.Vectors</span></td><td><span>
+                v4.5.0</span></td></tr><tr><td class="issueCell"><span>System.Runtime.CompilerServices.Unsafe</span></td><td><span>
+                v4.5.3</span></td></tr><tr><td class="issueCell"><span>System.Security.AccessControl</span></td><td><span>
+                v4.7.0</span></td></tr><tr><td class="issueCell"><span>System.Security.Permissions</span></td><td><span>
+                v4.7.0</span></td></tr><tr><td class="issueCell"><span>System.Security.Principal.Windows</span></td><td><span>
+                v4.7.0</span></td></tr></table></div><p /><h3 _locID="IncludePackagesTitle">Transitive dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell">
+                No transitive dependencies found.
+              </td><td /></tr></table></div><h2 _locID="IssuesTitle">Package compatibility issues</h2><div class="issues"><table><tr><th /><th class="issueCell" _locID="DescriptionTableHeader">Description</th></tr><tr><td class="IconInfoEncoded" /><td class="issueCell">
+                No issues were found.
+              </td></tr></table></div></div></body></html>

读我.doc

@@ -0,0 +1,22 @@
+
+更新步骤说明：
+备份数据库。
+查看PackFile文件夹下Web.config页面 <add key="SystemVersion"
+value="SUBHSSEPackFile_Vxxxx-xx-xx-xxx"/>中版本号。
+[pic]
+将版本中版本号与最新包中版本日志比较，找出未执行的脚本按顺序在对于库执行。
+注：未执行的脚本包括升级脚本（如：SUBHSSEDB_V2017-05-23-001.sql）和
+单位客户化脚本（如：   SUBHSSEDB_V2017-05-23-
+001修正脚本（十三化建删除项目）.sql）
+[pic]
+将最新更新中PackFile文件夹覆盖原PackFile文件夹。
+修改PackFile文件夹下Web.config页面 <add key="SystemVersion"
+value="SUBHSSEPackFile_Vxxxx-xx-xx-xxx"/>中版本号为最新更新包版本号。
+【以下步骤菜单有变化时(增加、修改页面菜单)操作】
+在IE中打开网站，用系统管理员（sysgly）登陆，点击右上角头像，进入功能菜单。
+[pic]
+选择模式更新菜单。
+[pic]
+功能菜单页面第二个标签单位菜单选择，根据单位情况选择要使用的菜单后，点击保存
+。
+[pic]