From 175660e4c85c871a5dcc3f5e272352058135a0b6 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 31 Mar 2025 18:43:58 +0800 Subject: [PATCH] =?UTF-8?q?PMP=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=EF=BC=9B=E9=82=AE=E7=AE=B1=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...GLDB_WH_V2025-03-31（项目主数据对接）-xiaj.sql | 39 ++ SGGL/BLL/PMP/PMPDataService.cs | 35 +- SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs | 3 +- SGGL/BLL/ProjectData/ProjectService.cs | 12 + .../ProjectData/ProjectSetSave.aspx | 489 ++++++++++-------- .../ProjectData/ProjectSetSave.aspx.cs | 51 +- .../ProjectSetSave.aspx.designer.cs | 468 ++++++++++------- SGGL/Model/Model.cs | 288 +++++++++++ SGGL/Model/PMP/PMPOBS.cs | 15 + SGGL/Model/PMP/PMPProject.cs | 126 +++-- SGGL/WebAPI/Controllers/PMP/PMPController.cs | 33 ++ SGGL/WebAPI/Filter/TestPermissionAttribute.cs | 2 +- SGGL/WebAPI/WebAPI.csproj | 1 + 13 files changed, 1090 insertions(+), 472 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_V2025-03-31（项目主数据对接）-xiaj.sql create mode 100644 SGGL/WebAPI/Controllers/PMP/PMPController.cs diff --git a/DataBase/版本日志/SGGLDB_WH_V2025-03-31（项目主数据对接）-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_V2025-03-31（项目主数据对接）-xiaj.sql new file mode 100644 index 00000000..0d543391 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2025-03-31（项目主数据对接）-xiaj.sql @@ -0,0 +1,39 @@ + + +--ĿPMPϵͳĿϢ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Base_Project' AND COLUMN_NAME = 'PlanStartDate') +BEGIN + ALTER TABLE Base_Project ADD ProjectNameEn nvarchar(500); + ALTER TABLE Base_Project ADD StClientName nvarchar(200); + ALTER TABLE Base_Project ADD ClientContactor nvarchar(200); + ALTER TABLE Base_Project ADD MobileTel nvarchar(200); + ALTER TABLE Base_Project ADD PlanStartDate datetime; + ALTER TABLE Base_Project ADD PlanEndDate datetime; + + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'StClientName' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵϵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'ClientContactor' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵϵ˵绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'MobileTel' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀƻʼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'PlanStartDate' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'PlanEndDate' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿӢ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'ProjectNameEn' +END +GO + + +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'PMP_Project' AND COLUMN_NAME = 'stClientName') +BEGIN + ALTER TABLE PMP_Project ADD stClientName nvarchar(200); + ALTER TABLE PMP_Project ADD clientContactor nvarchar(200); + ALTER TABLE PMP_Project ADD mobileTel nvarchar(200); + ALTER TABLE PMP_Project ADD planStartDate datetime; + ALTER TABLE PMP_Project ADD planEndDate datetime; + ALTER TABLE PMP_Project ADD stLocationName nvarchar(20); + + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stClientName' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵϵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'clientContactor' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵϵ˵绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'mobileTel' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀƻʼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'planStartDate' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'planEndDate' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'صƣڡ⣩' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stLocationName' +END +GO diff --git a/SGGL/BLL/PMP/PMPDataService.cs b/SGGL/BLL/PMP/PMPDataService.cs index 8e435d17..c092d745 100644 --- a/SGGL/BLL/PMP/PMPDataService.cs +++ b/SGGL/BLL/PMP/PMPDataService.cs @@ -128,8 +128,11 @@ namespace BLL newItem.Code = item.code; newItem.StNum = item.stNum; newItem.Name = item.name; + newItem.ProjectNameEn = item.projectNameEn; newItem.RealStartDate = item.realStartDate; newItem.RealEndDate = item.realEndDate; + newItem.PlanStartDate = item.planStartDate; + newItem.PlanEndDate = item.planEndDate; newItem.DisType = item.disType; newItem.ProjShortName = item.projShortName; newItem.ProjStepZxnoCode = item.projStepZxnoCode; @@ -141,6 +144,7 @@ namespace BLL newItem.RemarkA = item.remarkA; newItem.RemarkB = item.remarkB; newItem.RemarkC = item.remarkC; + newItem.StLocationName = item.stLocationName; newItem.Address = item.address; newItem.CityCode = item.cityCode; newItem.CityName = item.cityName; @@ -148,9 +152,11 @@ namespace BLL newItem.CountryName = item.countryName; newItem.CountyCode = item.countyCode; newItem.CountyName = item.countyName; - newItem.ProjectNameEn = item.projectNameEn; newItem.ProvinceCode = item.provinceCode; newItem.ProvinceName = item.provinceName; + newItem.StClientName = item.stClientName; + newItem.ClientContactor = item.clientContactor; + newItem.MobileTel = item.mobileTel; newItem.CreateTime = DateTime.Now; list.Add(newItem); } @@ -183,7 +189,7 @@ namespace BLL /// 项目OBS查询接口 /// /// 项目Id - public static List GetPMPProjectOBSMasterData(string proId) + public static List GetPMPProjectOBSMasterData(string proId) { string url = $"{PmpApiUrl}/api/standard/dis/query_all"; var token = GetToken(); @@ -196,11 +202,12 @@ namespace BLL string data = string.Empty; string rows = string.Empty; + List outlist = new List(); List list = new List(); int pageSize = 1000;//一次性最多返回1000条数据 List searchCond = new List(); - searchCond.Add(new PMPSearchCondData { name = "id", value = proId, fieldType = "SelectList" }); + searchCond.Add(new PMPSearchCondData { name = "projectId", value = proId, fieldType = "SelectList" }); for (int pageNum = 1; pageNum < 10; pageNum++) { var tempData = new @@ -219,7 +226,7 @@ namespace BLL string pushContent = JsonConvert.SerializeObject(tempData); //var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, newToken, pushContent); - var returndata = "{\"msg\":\"操作成功\",\"total\":63,\"code\":1,\"data\":{\"userColumnPermissions\":\"\"},\"rows\":[{\"disType\":\"\",\"obsId\":\"1874004938250653696\",\"code\":\"1874004938250653696\",\"staffCode\":\"\",\"proCode\":\"CP\",\"level\":2,\"staffName\":\"\",\"name\":\"化工工艺专业负责人\",\"id\":944618,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"},{\"disType\":\"\",\"obsId\":\"1874004948325371904\",\"code\":\"1874004948325371904\",\"staffCode\":\"\",\"proCode\":\"\",\"level\":2,\"staffName\":\"\",\"name\":\"项目技术主管\",\"id\":944616,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004944894431232\"},{\"disType\":\"\",\"obsId\":\"1874004946647650304\",\"code\":\"1874004946647650304\",\"staffCode\":\"890\",\"proCode\":\"\",\"level\":3,\"staffName\":\"金吉\",\"name\":\"1717470730419048448\",\"id\":944614,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004946622484480\"},{\"disType\":\"\",\"obsId\":\"1874004935037816832\",\"code\":\"1874004935037816832\",\"staffCode\":\"\",\"proCode\":\"IN\",\"level\":2,\"staffName\":\"\",\"name\":\"仪表专业负责人\",\"id\":944612,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"},{\"disType\":\"\",\"obsId\":\"1874004944919597056\",\"code\":\"1874004944919597056\",\"staffCode\":\"\",\"proCode\":\"\",\"level\":2,\"staffName\":\"\",\"name\":\"项目主管\",\"id\":944610,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004944894431232\"},{\"disType\":\"\",\"obsId\":\"1726143893013139456\",\"code\":\"1726143893013139456\",\"staffCode\":\"\",\"proCode\":\"\",\"level\":2,\"staffName\":\"\",\"name\":\"项目经理\",\"id\":924461,\"projectId\":\"1725799419921571842\",\"obsPid\":\"1726139280880963584\"},{\"disType\":\"\",\"obsId\":\"1790293713575088128\",\"code\":\"1790293713575088128\",\"staffCode\":\"\",\"proCode\":\"CP\",\"level\":2,\"staffName\":\"\",\"name\":\"化工工艺专业负责人\",\"id\":914461,\"projectId\":\"1764929892790579202\",\"obsPid\":\"1790293698567868416\"},{\"disType\":\"\",\"obsId\":\"1726152536429301760\",\"code\":\"1726152536429301760\",\"staffCode\":\"786\",\"proCode\":\"HV\",\"level\":3,\"staffName\":\"罗晓波\",\"name\":\"1717470703806189568\",\"id\":904461,\"projectId\":\"1725804867986931714\",\"obsPid\":\"1726152536387358720\"},{\"disType\":\"\",\"obsId\":\"1726158429212512256\",\"code\":\"1726158429212512256\",\"staffCode\":\"\",\"proCode\":\"\",\"level\":2,\"staffName\":\"\",\"name\":\"项目技术主管\",\"id\":894461,\"projectId\":\"1725799683017678849\",\"obsPid\":\"1726154187265413120\"},{\"disType\":\"\",\"obsId\":\"1726145953582419968\",\"code\":\"1726145953582419968\",\"staffCode\":\"\",\"proCode\":\"TC\",\"level\":2,\"staffName\":\"\",\"name\":\"电信专业负责人\",\"id\":884461,\"projectId\":\"1725799443120267266\",\"obsPid\":\"1726142507911352320\"},{\"disType\":\"\",\"obsId\":\"1807817821707702272\",\"code\":\"1807817821707702272\",\"staffCode\":\"1548\",\"proCode\":\"PP\",\"level\":3,\"staffName\":\"罗骏\",\"name\":\"1717470895821426688\",\"id\":874461,\"projectId\":\"1764864241774374914\",\"obsPid\":\"1807817374255157248\"},{\"disType\":\"\",\"obsId\":\"1726132867945336832\",\"code\":\"1726132867945336832\",\"staffCode\":\"175\",\"proCode\":\"PP\",\"level\":3,\"staffName\":\"章安杰\",\"name\":\"1717470554467995648\",\"id\":864461,\"projectId\":\"1725799080250056706\",\"obsPid\":\"1726132867723038720\"},{\"disType\":\"\",\"obsId\":\"1726128845142233088\",\"code\":\"1726128845142233088\",\"staffCode\":\"\",\"proCode\":\"CP\",\"level\":1,\"staffName\":\"\",\"name\":\"设计岗位\",\"id\":854461,\"projectId\":\"1725799069407780865\",\"obsPid\":\"0\"},{\"disType\":\"\",\"obsId\":\"1809004454788337664\",\"code\":\"1809004454788337664\",\"staffCode\":\"2126\",\"proCode\":\"EQ\",\"level\":3,\"staffName\":\"向派\",\"name\":\"1717471125925138432\",\"id\":844619,\"projectId\":\"1764929736976379906\",\"obsPid\":\"1809004377281794048\"},{\"disType\":\"\",\"obsId\":\"1808814135417376768\",\"code\":\"1808814135417376768\",\"staffCode\":\"2126\",\"proCode\":\"MA\",\"level\":3,\"staffName\":\"向派\",\"name\":\"1717471125925138432\",\"id\":844618,\"projectId\":\"1725799377735262209\",\"obsPid\":\"1808814135350267904\"},{\"disType\":\"\",\"obsId\":\"1810889570779271168\",\"code\":\"1810889570779271168\",\"staffCode\":\"2126\",\"proCode\":\"EQ\",\"level\":3,\"staffName\":\"向派\",\"name\":\"1717471125925138432\",\"id\":844617,\"projectId\":\"1767762648939679746\",\"obsPid\":\"1810889570716356608\"},{\"disType\":\"\",\"obsId\":\"1726146119777521664\",\"code\":\"1726146119777521664\",\"staffCode\":\"2126\",\"proCode\":\"EQ\",\"level\":3,\"staffName\":\"向派\",\"name\":\"1717471125925138432\",\"id\":844616,\"projectId\":\"1725799414410256386\",\"obsPid\":\"1726146115658715136\"},{\"disType\":\"\",\"obsId\":\"1726145572903194624\",\"code\":\"1726145572903194624\",\"staffCode\":\"2126\",\"proCode\":\"MA\",\"level\":3,\"staffName\":\"向派\",\"name\":\"1717471125925138432\",\"id\":844615,\"projectId\":\"1725804757517352961\",\"obsPid\":\"1726145572857057280\"},{\"disType\":\"\",\"obsId\":\"1726144782193004544\",\"code\":\"1726144782193004544\",\"staffCode\":\"2126\",\"proCode\":\"EQ\",\"level\":3,\"staffName\":\"向派\",\"name\":\"1717471125925138432\",\"id\":844614,\"projectId\":\"1725799392608264194\",\"obsPid\":\"1726144782134284288\"},{\"disType\":\"\",\"obsId\":\"1726152137353859072\",\"code\":\"1726152137353859072\",\"staffCode\":\"2126\",\"proCode\":\"MA\",\"level\":3,\"staffName\":\"向派\",\"name\":\"1717471125925138432\",\"id\":844612,\"projectId\":\"1725799615191588866\",\"obsPid\":\"1726152137269972992\"},{\"disType\":\"\",\"obsId\":\"1726153045173211136\",\"code\":\"1726153045173211136\",\"staffCode\":\"30129\",\"proCode\":\"CP\",\"level\":3,\"staffName\":\"廖超奇\",\"name\":\"1717471125082083328\",\"id\":844611,\"projectId\":\"1725799665967833090\",\"obsPid\":\"1726153044460179456\"},{\"disType\":\"\",\"obsId\":\"1726151906969128960\",\"code\":\"1726151906969128960\",\"staffCode\":\"30129\",\"proCode\":\"CP\",\"level\":3,\"staffName\":\"廖超奇\",\"name\":\"1717471125082083328\",\"id\":844610,\"projectId\":\"1725799637161353218\",\"obsPid\":\"1726151906071547904\"},{\"disType\":\"\",\"obsId\":\"1726150009159815168\",\"code\":\"1726150009159815168\",\"staffCode\":\"2103\",\"proCode\":\"ES\",\"level\":3,\"staffName\":\"韦科旭\",\"name\":\"1717471113103151104\",\"id\":844461,\"projectId\":\"1725799582257913858\",\"obsPid\":\"1726150007641477120\"},{\"disType\":\"\",\"obsId\":\"1726151001037213696\",\"code\":\"1726151001037213696\",\"staffCode\":\"415\",\"proCode\":\"IN\",\"level\":3,\"staffName\":\"罗晓珂\",\"name\":\"1717470620075298816\",\"id\":834461,\"projectId\":\"1725799603615309825\",\"obsPid\":\"1726150999971860480\"},{\"disType\":\"\",\"obsId\":\"1804003904929796096\",\"code\":\"1804003904929796096\",\"staffCode\":\"\",\"proCode\":\"WS\",\"level\":2,\"staffName\":\"\",\"name\":\"给排水专业负责人\",\"id\":824461,\"projectId\":\"1802552209230016513\",\"obsPid\":\"1804003851456614400\"},{\"disType\":\"\",\"obsId\":\"1808274512249229312\",\"code\":\"1808274512249229312\",\"staffCode\":\"\",\"proCode\":\"PL\",\"level\":2,\"staffName\":\"\",\"name\":\"总图运输专业负责人\",\"id\":814461,\"projectId\":\"1764864026589802497\",\"obsPid\":\"1808274237060943872\"},{\"disType\":\"\",\"obsId\":\"1726132878502400000\",\"code\":\"1726132878502400000\",\"staffCode\":\"1046\",\"proCode\":\"IN\",\"level\":3,\"staffName\":\"黄志清\",\"name\":\"1717470745505959936\",\"id\":804461,\"projectId\":\"1725799072750641154\",\"obsPid\":\"1726132878452068352\"},{\"disType\":\"\",\"obsId\":\"1726137657777590272\",\"code\":\"1726137657777590272\",\"staffCode\":\"1267\",\"proCode\":\"\",\"level\":3,\"staffName\":\"杨小菁\",\"name\":\"1717470533823631360\",\"id\":794461,\"projectId\":\"1725799239822352385\",\"obsPid\":\"1726137657714675712\"},{\"disType\":\"\",\"obsId\":\"1726157288894500864\",\"code\":\"1726157288894500864\",\"staffCode\":\"\",\"proCode\":\"OP\",\"level\":2,\"staffName\":\"\",\"name\":\"界外管道设计人员\",\"id\":784461,\"projectId\":\"1725799240183062530\",\"obsPid\":\"1726133411036401664\"},{\"disType\":\"\",\"obsId\":\"1726132507709149184\",\"code\":\"1726132507709149184\",\"staffCode\":\"\",\"proCode\":\"MM\",\"level\":2,\"staffName\":\"\",\"name\":\"机泵机修专业负责人\",\"id\":774461,\"projectId\":\"1725799071211331585\",\"obsPid\":\"1726129428284706816\"},{\"disType\":\"\",\"obsId\":\"1811164041230553088\",\"code\":\"1811164041230553088\",\"staffCode\":\"\",\"proCode\":\"CA\",\"level\":2,\"staffName\":\"\",\"name\":\"分析化验专业负责人\",\"id\":764461,\"projectId\":\"1764864367871930369\",\"obsPid\":\"1807815887470858240\"},{\"disType\":\"\",\"obsId\":\"1726155600942993408\",\"code\":\"1726155600942993408\",\"staffCode\":\"389\",\"proCode\":\"EL\",\"level\":3,\"staffName\":\"晏国强\",\"name\":\"1717471101140996096\",\"id\":754461,\"projectId\":\"1725803434193469441\",\"obsPid\":\"1726155600481619968\"},{\"disType\":\"\",\"obsId\":\"1726135145758593024\",\"code\":\"1726135145758593024\",\"staffCode\":\"1772\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744619,\"projectId\":\"1725799271686479873\",\"obsPid\":\"1726135145712455680\"},{\"disType\":\"\",\"obsId\":\"1726133483706912768\",\"code\":\"1726133483706912768\",\"staffCode\":\"1772\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744618,\"projectId\":\"1725799173220999170\",\"obsPid\":\"1726133483383951360\"},{\"disType\":\"\",\"obsId\":\"1726133130533933056\",\"code\":\"1726133130533933056\",\"staffCode\":\"1772\",\"proCode\":\"PP\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744617,\"projectId\":\"1725799077746057217\",\"obsPid\":\"1726132883451678720\"},{\"disType\":\"\",\"obsId\":\"1726145857809682432\",\"code\":\"1726145857809682432\",\"staffCode\":\"1772\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744616,\"projectId\":\"1725799409708441602\",\"obsPid\":\"1726145857763545088\"},{\"disType\":\"\",\"obsId\":\"1726148955298992128\",\"code\":\"1726148955298992128\",\"staffCode\":\"1772\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744615,\"projectId\":\"1725799425017651202\",\"obsPid\":\"1726148951897411584\"},{\"disType\":\"\",\"obsId\":\"1726157384600129536\",\"code\":\"1726157384600129536\",\"staffCode\":\"1772\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744614,\"projectId\":\"1725799281572454402\",\"obsPid\":\"1726157384549797888\"},{\"disType\":\"\",\"obsId\":\"1726135852599480320\",\"code\":\"1726135852599480320\",\"staffCode\":\"1772\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744613,\"projectId\":\"1725799263302066177\",\"obsPid\":\"1726135851144056832\"},{\"disType\":\"\",\"obsId\":\"1726138089275002880\",\"code\":\"1726138089275002880\",\"staffCode\":\"1772\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744612,\"projectId\":\"1725799250043871233\",\"obsPid\":\"1726138086376738816\"},{\"disType\":\"\",\"obsId\":\"1726138683238780928\",\"code\":\"1726138683238780928\",\"staffCode\":\"1772\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744611,\"projectId\":\"1725799311301681153\",\"obsPid\":\"1726138683184254976\"},{\"disType\":\"\",\"obsId\":\"1726141568810881024\",\"code\":\"1726141568810881024\",\"staffCode\":\"1772\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"余亮平\",\"name\":\"1717470963383275520\",\"id\":744610,\"projectId\":\"1725799395095486466\",\"obsPid\":\"1726141566743089152\"},{\"disType\":\"\",\"obsId\":\"1726149044658638848\",\"code\":\"1726149044658638848\",\"staffCode\":\"1728\",\"proCode\":\"\",\"level\":3,\"staffName\":\"罗运涛\",\"name\":\"1717470960854110208\",\"id\":744461,\"projectId\":\"1725804693705211905\",\"obsPid\":\"1726149044616695808\"},{\"disType\":\"\",\"obsId\":\"1726153527283290112\",\"code\":\"1726153527283290112\",\"staffCode\":\"1056\",\"proCode\":\"WT\",\"level\":3,\"staffName\":\"王健\",\"name\":\"1717470770139107328\",\"id\":734461,\"projectId\":\"1725799663623217154\",\"obsPid\":\"1726153527241347072\"},{\"disType\":\"\",\"obsId\":\"1726157217700384768\",\"code\":\"1726157217700384768\",\"staffCode\":\"769\",\"proCode\":\"\",\"level\":3,\"staffName\":\"黄斌\",\"name\":\"1717470700014538752\",\"id\":724461,\"projectId\":\"1725799204829274113\",\"obsPid\":\"1726157217662636032\"},{\"disType\":\"\",\"obsId\":\"1764904789835124736\",\"code\":\"1764904789835124736\",\"staffCode\":\"420\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"高伟\",\"name\":\"1717470621077737472\",\"id\":714461,\"projectId\":\"1764863509365010433\",\"obsPid\":\"1764904789776404480\"},{\"disType\":\"\",\"obsId\":\"1726145000506527744\",\"code\":\"1726145000506527744\",\"staffCode\":\"278\",\"proCode\":\"PP\",\"level\":3,\"staffName\":\"向国军\",\"name\":\"1717470582938931200\",\"id\":704461,\"projectId\":\"1725799494219472898\",\"obsPid\":\"1726145000447807488\"},{\"disType\":\"\",\"obsId\":\"1808376237744328704\",\"code\":\"1808376237744328704\",\"staffCode\":\"132\",\"proCode\":\"WT\",\"level\":3,\"staffName\":\"向陆伟\",\"name\":\"1717470544162590720\",\"id\":694461,\"projectId\":\"1764863896155336706\",\"obsPid\":\"1808376237660442624\"},{\"disType\":\"\",\"obsId\":\"1726156889512873984\",\"code\":\"1726156889512873984\",\"staffCode\":\"130\",\"proCode\":\"CP\",\"level\":3,\"staffName\":\"赵军\",\"name\":\"1717470543642497024\",\"id\":684461,\"projectId\":\"1725799047966498818\",\"obsPid\":\"1726156889470930944\"},{\"disType\":\"\",\"obsId\":\"1726127989193838592\",\"code\":\"1726127989193838592\",\"staffCode\":\"1632\",\"proCode\":\"\",\"level\":3,\"staffName\":\"徐岩\",\"name\":\"1717470918953013248\",\"id\":674461,\"projectId\":\"1725799019185184770\",\"obsPid\":\"1726127832435920896\"},{\"disType\":\"\",\"obsId\":\"1726126696895221760\",\"code\":\"1726126696895221760\",\"staffCode\":\"\",\"proCode\":\"EQ\",\"level\":2,\"staffName\":\"\",\"name\":\"设备设计人员\",\"id\":664461,\"projectId\":\"1725798995277651969\",\"obsPid\":\"1726125667168423936\"},{\"disType\":\"\",\"obsId\":\"1726124657519759360\",\"code\":\"1726124657519759360\",\"staffCode\":\"1545\",\"proCode\":\"PP\",\"level\":3,\"staffName\":\"张帆顺\",\"name\":\"1717470895326498816\",\"id\":654461,\"projectId\":\"1725798972104122370\",\"obsPid\":\"1726124653040242688\"},{\"disType\":\"\",\"obsId\":\"1726124330045280256\",\"code\":\"1726124330045280256\",\"staffCode\":\"\",\"proCode\":\"PL\",\"level\":2,\"staffName\":\"\",\"name\":\"总图运输专业负责人\",\"id\":644619,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726123136757403648\"},{\"disType\":\"\",\"obsId\":\"1726125111280537600\",\"code\":\"1726125111280537600\",\"staffCode\":\"\",\"proCode\":\"HV\",\"level\":2,\"staffName\":\"\",\"name\":\"暖通空调专业负责人\",\"id\":644618,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726123136757403648\"},{\"disType\":\"\",\"obsId\":\"1726123136807735296\",\"code\":\"1726123136807735296\",\"staffCode\":\"\",\"proCode\":\"CP\",\"level\":2,\"staffName\":\"\",\"name\":\"化工工艺专业负责人\",\"id\":644617,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726123136757403648\"},{\"disType\":\"\",\"obsId\":\"1726123685099737088\",\"code\":\"1726123685099737088\",\"staffCode\":\"\",\"proCode\":\"CP\",\"level\":2,\"staffName\":\"\",\"name\":\"化工工艺设计人员\",\"id\":644616,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726123136757403648\"},{\"disType\":\"\",\"obsId\":\"1726123869846245376\",\"code\":\"1726123869846245376\",\"staffCode\":\"\",\"proCode\":\"HA\",\"level\":2,\"staffName\":\"\",\"name\":\"换热器分析专业负责人\",\"id\":644615,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726123136757403648\"},{\"disType\":\"\",\"obsId\":\"1726124929658785792\",\"code\":\"1726124929658785792\",\"staffCode\":\"\",\"proCode\":\"AR\",\"level\":2,\"staffName\":\"\",\"name\":\"建筑专业负责人\",\"id\":644614,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726123136757403648\"},{\"disType\":\"\",\"obsId\":\"1726124285094924288\",\"code\":\"1726124285094924288\",\"staffCode\":\"\",\"proCode\":\"PL\",\"level\":2,\"staffName\":\"\",\"name\":\"总图运输设计人员\",\"id\":644613,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726123136757403648\"},{\"disType\":\"\",\"obsId\":\"1726123870135652352\",\"code\":\"1726123870135652352\",\"staffCode\":\"369\",\"proCode\":\"IN\",\"level\":3,\"staffName\":\"张皓\",\"name\":\"1717470608947810304\",\"id\":644612,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726123870089515008\"},{\"disType\":\"\",\"obsId\":\"1726125411286519808\",\"code\":\"1726125411286519808\",\"staffCode\":\"290\",\"proCode\":\"MH\",\"level\":3,\"staffName\":\"杨建国\",\"name\":\"1717470585799446528\",\"id\":644611,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726125411106164736\"},{\"disType\":\"\",\"obsId\":\"1726156522741960704\",\"code\":\"1726156522741960704\",\"staffCode\":\"325\",\"proCode\":\"MH\",\"level\":3,\"staffName\":\"袁铁群\",\"name\":\"1717470597417668608\",\"id\":644610,\"projectId\":\"1725798951640113153\",\"obsPid\":\"1726156522700017664\"},{\"disType\":\"\",\"obsId\":\"1726123531131031552\",\"code\":\"1726123531131031552\",\"staffCode\":\"278\",\"proCode\":\"PP\",\"level\":3,\"staffName\":\"向国军\",\"name\":\"1717470582938931200\",\"id\":644461,\"projectId\":\"1725798951220682754\",\"obsPid\":\"1726123531097477120\"}]}"; + var returndata = "{\"msg\":\"操作成功\",\"total\":25,\"code\":1,\"data\":{\"userColumnPermissions\":\"\"},\"rows\":[{\"disType\":\"\",\"obsId\":\"1874790096868347904\",\"code\":\"1874790096868347904\",\"staffCode\":\"\",\"proCode\":\"CP\",\"level\":2,\"staffName\":\"\",\"name\":\"化工工艺设计人员\",\"id\":944768,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"},{\"disType\":\"\",\"obsId\":\"1874790096893513728\",\"code\":\"1874790096893513728\",\"staffCode\":\"722\",\"proCode\":\"CP\",\"level\":3,\"staffName\":\"赵保林\",\"name\":\"1717470687628759040\",\"id\":944766,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874790096868347904\"},{\"disType\":\"\",\"obsId\":\"1874790098684481536\",\"code\":\"1874790098684481536\",\"staffCode\":\"30453\",\"proCode\":\"CP\",\"level\":3,\"staffName\":\"李平\",\"name\":\"1717471296016748544\",\"id\":944764,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874790096868347904\"},{\"disType\":\"\",\"obsId\":\"1874004933423009792\",\"code\":\"1874004933423009792\",\"staffCode\":\"\",\"proCode\":\"MC\",\"level\":1,\"staffName\":\"\",\"name\":\"设计岗位\",\"id\":944642,\"projectId\":\"1857091204378914817\",\"obsPid\":\"0\"},{\"disType\":\"\",\"obsId\":\"1874004946622484480\",\"code\":\"1874004946622484480\",\"staffCode\":\"\",\"proCode\":\"\",\"level\":2,\"staffName\":\"\",\"name\":\"项目经理\",\"id\":944640,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004944894431232\"},{\"disType\":\"\",\"obsId\":\"1874004933448175616\",\"code\":\"1874004933448175616\",\"staffCode\":\"\",\"proCode\":\"PL\",\"level\":2,\"staffName\":\"\",\"name\":\"总图运输专业负责人\",\"id\":944638,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"},{\"disType\":\"\",\"obsId\":\"1874004936635846656\",\"code\":\"1874004936635846656\",\"staffCode\":\"\",\"proCode\":\"ST\",\"level\":2,\"staffName\":\"\",\"name\":\"结构专业负责人\",\"id\":944636,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"},{\"disType\":\"\",\"obsId\":\"1874004941513822208\",\"code\":\"1874004941513822208\",\"staffCode\":\"\",\"proCode\":\"EL\",\"level\":2,\"staffName\":\"\",\"name\":\"电气专业负责人\",\"id\":944634,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"},{\"disType\":\"\",\"obsId\":\"1874004933469147136\",\"code\":\"1874004933469147136\",\"staffCode\":\"2239\",\"proCode\":\"PL\",\"level\":3,\"staffName\":\"夏玉霞\",\"name\":\"1717471200965431296\",\"id\":944632,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933448175616\"},{\"disType\":\"\",\"obsId\":\"1874004935062982656\",\"code\":\"1874004935062982656\",\"staffCode\":\"1610\",\"proCode\":\"IN\",\"level\":3,\"staffName\":\"李伟家\",\"name\":\"1717470915924725760\",\"id\":944630,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004935037816832\"},{\"disType\":\"\",\"obsId\":\"1874004944894431232\",\"code\":\"1874004944894431232\",\"staffCode\":\"\",\"proCode\":\"\",\"level\":1,\"staffName\":\"\",\"name\":\"管理岗位\",\"id\":944628,\"projectId\":\"1857091204378914817\",\"obsPid\":\"0\"},{\"disType\":\"\",\"obsId\":\"1874004948350537728\",\"code\":\"1874004948350537728\",\"staffCode\":\"591\",\"proCode\":\"\",\"level\":3,\"staffName\":\"刘翔\",\"name\":\"1717470662420992000\",\"id\":944626,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004948325371904\"},{\"disType\":\"\",\"obsId\":\"1874004941538988032\",\"code\":\"1874004941538988032\",\"staffCode\":\"387\",\"proCode\":\"EL\",\"level\":3,\"staffName\":\"李婉\",\"name\":\"1717470613658013696\",\"id\":944624,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004941513822208\"},{\"disType\":\"\",\"obsId\":\"1874004943308984320\",\"code\":\"1874004943308984320\",\"staffCode\":\"235\",\"proCode\":\"MC\",\"level\":3,\"staffName\":\"吴菁\",\"name\":\"1717470571836608512\",\"id\":944622,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004943288012800\"},{\"disType\":\"\",\"obsId\":\"1874004944940568576\",\"code\":\"1874004944940568576\",\"staffCode\":\"4\",\"proCode\":\"\",\"level\":3,\"staffName\":\"张锦跃\",\"name\":\"1717470496427216896\",\"id\":944620,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004944919597056\"},{\"disType\":\"\",\"obsId\":\"1874004938250653696\",\"code\":\"1874004938250653696\",\"staffCode\":\"\",\"proCode\":\"CP\",\"level\":2,\"staffName\":\"\",\"name\":\"化工工艺专业负责人\",\"id\":944618,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"},{\"disType\":\"\",\"obsId\":\"1874004948325371904\",\"code\":\"1874004948325371904\",\"staffCode\":\"\",\"proCode\":\"\",\"level\":2,\"staffName\":\"\",\"name\":\"项目技术主管\",\"id\":944616,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004944894431232\"},{\"disType\":\"\",\"obsId\":\"1874004946647650304\",\"code\":\"1874004946647650304\",\"staffCode\":\"890\",\"proCode\":\"\",\"level\":3,\"staffName\":\"金吉\",\"name\":\"1717470730419048448\",\"id\":944614,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004946622484480\"},{\"disType\":\"\",\"obsId\":\"1874004935037816832\",\"code\":\"1874004935037816832\",\"staffCode\":\"\",\"proCode\":\"IN\",\"level\":2,\"staffName\":\"\",\"name\":\"仪表专业负责人\",\"id\":944612,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"},{\"disType\":\"\",\"obsId\":\"1874004944919597056\",\"code\":\"1874004944919597056\",\"staffCode\":\"\",\"proCode\":\"\",\"level\":2,\"staffName\":\"\",\"name\":\"项目主管\",\"id\":944610,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004944894431232\"},{\"disType\":\"\",\"obsId\":\"1874004939882237952\",\"code\":\"1874004939882237952\",\"staffCode\":\"957\",\"proCode\":\"PP\",\"level\":3,\"staffName\":\"黄晓娟\",\"name\":\"1717470773876232192\",\"id\":944608,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004939861266432\"},{\"disType\":\"\",\"obsId\":\"1874004943288012800\",\"code\":\"1874004943288012800\",\"staffCode\":\"\",\"proCode\":\"MC\",\"level\":2,\"staffName\":\"\",\"name\":\"材控应力专业负责人\",\"id\":944606,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"},{\"disType\":\"\",\"obsId\":\"1874004938271625216\",\"code\":\"1874004938271625216\",\"staffCode\":\"1008\",\"proCode\":\"CP\",\"level\":3,\"staffName\":\"王海\",\"name\":\"1717470759519129600\",\"id\":944604,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004938250653696\"},{\"disType\":\"\",\"obsId\":\"1874004936669401088\",\"code\":\"1874004936669401088\",\"staffCode\":\"468\",\"proCode\":\"ST\",\"level\":3,\"staffName\":\"陈宇\",\"name\":\"1717470632112951296\",\"id\":944602,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004936635846656\"},{\"disType\":\"\",\"obsId\":\"1874004939861266432\",\"code\":\"1874004939861266432\",\"staffCode\":\"\",\"proCode\":\"PP\",\"level\":2,\"staffName\":\"\",\"name\":\"管道布置专业负责人\",\"id\":944600,\"projectId\":\"1857091204378914817\",\"obsPid\":\"1874004933423009792\"}]}"; if (!string.IsNullOrEmpty(returndata)) { //JObject obj = JObject.Parse(returndata); @@ -234,9 +241,6 @@ namespace BLL { list.AddRange(pmpOBSResponseData.rows); - //获取岗位专业人员 - var sss = list.Where(x => x.level == 3 && !string.IsNullOrWhiteSpace(x.staffName)); - if (pmpOBSResponseData.rows.Count < 1000) {//当本次请求数据小于1000时，说明后续已经没有数据了，不用再请求接口；跳出循环 break; @@ -252,7 +256,22 @@ namespace BLL break; } } - return list; + + if (list.Any()) + { + //获取岗位专业人员 + var userlist = list.Where(x => x.level == 3 && !string.IsNullOrWhiteSpace(x.staffName)); + foreach (var user in userlist) + { + //根据obsPid获取对应任职岗位 + var work = list.Where(x => x.obsId == user.obsPid).FirstOrDefault(); + if (work != null) + { + outlist.Add(new PMPOBSOutInput { workName = work.name, userName = user.staffName }); + } + } + } + return outlist; } diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs index 7722f561..ef72a421 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs @@ -102,7 +102,8 @@ namespace BLL MailMessage mail = new MailMessage(); //邮件主题 mail.Subject = $"关键事项超期预警提醒——{projectName}"; - mail.To.Add(user.Email); + //mail.To.Add(user.Email); + mail.To.Add("1784803958@qq.com"); mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析 StringBuilder tbodyStr = new StringBuilder(); diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index a44ad576..b6114021 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -111,8 +111,11 @@ ProjectCode = project.ProjectCode, JTProjectCode = project.JTProjectCode, ProjectName = project.ProjectName, + ProjectNameEn = project.ProjectNameEn, StartDate = project.StartDate, EndDate = project.EndDate, + PlanStartDate = project.PlanStartDate, + PlanEndDate = project.PlanEndDate, ProjectAddress = project.ProjectAddress, ContractNo = project.ContractNo, WorkRange = project.WorkRange, @@ -133,6 +136,9 @@ ProjectMoney = project.ProjectMoney, ConstructionMoney = project.ConstructionMoney, Telephone = project.Telephone, + StClientName = project.StClientName, + ClientContactor = project.ClientContactor, + MobileTel = project.MobileTel, Country = project.Country, Province = project.Province, City = project.City, @@ -162,8 +168,11 @@ newProject.ProjectCode = project.ProjectCode; newProject.JTProjectCode = project.JTProjectCode; newProject.ProjectName = project.ProjectName; + newProject.ProjectNameEn = project.ProjectNameEn; newProject.StartDate = project.StartDate; newProject.EndDate = project.EndDate; + newProject.PlanStartDate = project.PlanStartDate; + newProject.PlanEndDate = project.PlanEndDate; newProject.ProjectAddress = project.ProjectAddress; newProject.ShortName = project.ShortName; newProject.ContractNo = project.ContractNo; @@ -184,6 +193,9 @@ newProject.ProjectMoney = project.ProjectMoney; newProject.ConstructionMoney = project.ConstructionMoney; newProject.Telephone = project.Telephone; + newProject.StClientName = project.StClientName; + newProject.ClientContactor = project.ClientContactor; + newProject.MobileTel = project.MobileTel; newProject.Country = project.Country; newProject.Province = project.Province; newProject.City = project.City; diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx index 472c2736..0ddcac3d 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx @@ -14,237 +14,272 @@ - <%-- --%> - <%-- - --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 拾取坐标 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 拾取坐标 + + + + + + + + + + + + + + + + + + - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs index d4c0d537..e1b00b8b 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs @@ -76,6 +76,7 @@ namespace FineUIPro.Web.ProjectData this.drpProjectBox.Value = project.ProjectName; } //this.txtProjectName.Text = project.ProjectName; + this.txtProjectNameEn.Text = project.ProjectNameEn; this.txtProjectCode.Text = project.ProjectCode; this.txtJTProjectCode.Text = project.JTProjectCode; this.txtProjectAddress.Text = project.ProjectAddress; @@ -94,6 +95,14 @@ namespace FineUIPro.Web.ProjectData { this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", project.EndDate); } + if (project.PlanStartDate.HasValue) + { + this.txtPlanStartDate.Text = string.Format("{0:yyyy-MM-dd}", project.PlanStartDate); + } + if (project.PlanEndDate.HasValue) + { + this.txtPlanEndDate.Text = string.Format("{0:yyyy-MM-dd}", project.PlanEndDate); + } this.txtShortName.Text = project.ShortName; if (!string.IsNullOrEmpty(project.ProjectType)) @@ -166,6 +175,9 @@ namespace FineUIPro.Web.ProjectData this.txtProjectMoney.Text = project.ProjectMoney.ToString(); this.txtConstructionMoney.Text = project.ConstructionMoney.ToString(); this.txtTelephone.Text = project.Telephone; + this.txtStClientName.Text = project.StClientName; + this.txtClientContactor.Text = project.ClientContactor; + this.txtMobileTel.Text = project.MobileTel; if (!string.IsNullOrEmpty(project.Country)) { this.drpCountry.SelectedValue = project.Country; @@ -208,6 +220,7 @@ namespace FineUIPro.Web.ProjectData { ProjectCode = this.txtProjectCode.Text.Trim(), JTProjectCode = this.txtJTProjectCode.Text.Trim(), + ProjectNameEn = this.txtProjectNameEn.Text.Trim(), //ProjectName = Regex.Replace(this.txtProjectName.Text, @"\s", ""), ProjectAddress = this.txtProjectAddress.Text.Trim(), WorkRange = this.txtWorkRange.Text.Trim(), @@ -219,6 +232,9 @@ namespace FineUIPro.Web.ProjectData ConstructionMoney = Funs.GetNewDecimal(this.txtConstructionMoney.Text), Remark = this.txtRemark.Text.Trim(), Telephone = this.txtTelephone.Text.Trim(), + StClientName = this.txtStClientName.Text.Trim(), + ClientContactor = this.txtClientContactor.Text.Trim(), + MobileTel = this.txtMobileTel.Text.Trim(), HJProjectCode = this.txtHJProjectCode.Text.Trim(), KZProjectCode = this.txtKZProjectCode.Text.Trim(), City = this.txtCity.Text.Trim(), @@ -262,6 +278,16 @@ namespace FineUIPro.Web.ProjectData project.EndDate = Funs.GetNewDateTime(this.txtEndDate.Text.Trim()); } + if (!string.IsNullOrEmpty(txtPlanStartDate.Text.Trim())) + { + project.PlanStartDate = Funs.GetNewDateTime(this.txtPlanStartDate.Text.Trim()); + } + + if (!string.IsNullOrEmpty(txtPlanEndDate.Text.Trim())) + { + project.PlanEndDate = Funs.GetNewDateTime(this.txtPlanEndDate.Text.Trim()); + } + project.ShortName = this.txtShortName.Text.Trim(); if (this.drpProjectType.SelectedValue != BLL.Const._Null) { @@ -429,9 +455,18 @@ namespace FineUIPro.Web.ProjectData this.txtShortName.Text = pmpProject.ProjShortName; this.txtProjectAddress.Text = pmpProject.Address; this.txtCity.Text = pmpProject.CityName; - this.txtStartDate.Text = pmpProject.RealStartDate != null ? ((DateTime)pmpProject.RealStartDate).ToString("yyyy-MM-dd") : ""; - this.txtEndDate.Text = pmpProject.RealEndDate != null ? ((DateTime)pmpProject.RealEndDate).ToString("yyyy-MM-dd") : ""; - //this.txtEnglishRemark.Text = pmpProject.ProjectNameEn; + this.txtStartDate.Text = pmpProject.RealStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pmpProject.RealStartDate) : ""; + this.txtEndDate.Text = pmpProject.RealEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pmpProject.RealEndDate) : ""; + this.txtPlanStartDate.Text = pmpProject.PlanStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pmpProject.PlanStartDate) : ""; + this.txtPlanEndDate.Text = pmpProject.PlanEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pmpProject.PlanEndDate) : ""; + this.txtProjectNameEn.Text = pmpProject.ProjectNameEn; + this.txtStClientName.Text = pmpProject.StClientName; + this.txtClientContactor.Text = pmpProject.ClientContactor; + this.txtMobileTel.Text = pmpProject.MobileTel; + if (pmpProject.StLocationName == "境外") + { + this.ckbIsForeign.Checked = true; + } } @@ -1780,11 +1815,11 @@ namespace FineUIPro.Web.ProjectData private void BindGrid2() { - var lastPmpProject = (from x in Funs.DB.PMP_Project orderby x.CreateTime descending select x).FirstOrDefault(); - if (lastPmpProject == null || DateTime.Now > lastPmpProject.CreateTime.AddHours(30)) - { - PMPDataService.GetPMPProjectMasterData(); - } + //var lastPmpProject = (from x in Funs.DB.PMP_Project orderby x.CreateTime descending select x).FirstOrDefault(); + //if (lastPmpProject == null || DateTime.Now > lastPmpProject.CreateTime.AddHours(30)) + //{ + // PMPDataService.GetPMPProjectMasterData(); + //} //var pmptoken = PMPDataService.GetToken(); var list = (from x in Funs.DB.PMP_Project orderby x.StNum descending select x).ToList(); string codeName = ttbPmpProCodeSearch.Text.Trim(); diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs index f2c1df6d..d05a7512 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs @@ -41,6 +41,24 @@ namespace FineUIPro.Web.ProjectData /// protected global::FineUIPro.Form SimpleForm1; + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form_edit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form_edit; + /// /// drpProjectBox 控件。 /// @@ -104,15 +122,6 @@ namespace FineUIPro.Web.ProjectData /// protected global::FineUIPro.TextBox txtProjectCode; - /// - /// txtShortName 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtShortName; - /// /// drpMasterBox1 控件。 /// @@ -167,6 +176,42 @@ namespace FineUIPro.Web.ProjectData /// protected global::FineUIPro.Grid Grid1; + /// + /// txtJTProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtJTProjectCode; + + /// + /// txtShortName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtShortName; + + /// + /// txtProjectNameEn 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectNameEn; + + /// + /// txtEnglishRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEnglishRemark; + /// /// drpProjectType 控件。 /// @@ -203,6 +248,15 @@ namespace FineUIPro.Web.ProjectData /// protected global::FineUIPro.DatePicker txtStartDate; + /// + /// txtPlanStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtPlanStartDate; + /// /// txtEndDate 控件。 /// @@ -212,6 +266,15 @@ namespace FineUIPro.Web.ProjectData /// protected global::FineUIPro.DatePicker txtEndDate; + /// + /// txtPlanEndDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtPlanEndDate; + /// /// txtContractNo 控件。 /// @@ -230,6 +293,213 @@ namespace FineUIPro.Web.ProjectData /// protected global::FineUIPro.NumberBox txtDuration; + /// + /// txtStClientName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtStClientName; + + /// + /// txtClientContactor 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtClientContactor; + + /// + /// txtTelephone 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTelephone; + + /// + /// txtMobileTel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMobileTel; + + /// + /// txtWorkRange 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtWorkRange; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// txtProjectMoney 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtProjectMoney; + + /// + /// txtConstructionMoney 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtConstructionMoney; + + /// + /// txtProjectAddress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectAddress; + + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + + /// + /// drpCountry 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCountry; + + /// + /// ckbIsForeign 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckbIsForeign; + + /// + /// drpProvince 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProvince; + + /// + /// txtCity 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCity; + + /// + /// txtMapCoordinates 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMapCoordinates; + + /// + /// bottomPanel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel bottomPanel; + + /// + /// txtProgress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtProgress; + + /// + /// txtHJProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHJProjectCode; + + /// + /// txtKZProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtKZProjectCode; + + /// + /// txtProjType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjType; + + /// + /// txtProjPhase 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjPhase; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form3; + /// /// drpProjectManager 控件。 /// @@ -275,186 +545,6 @@ namespace FineUIPro.Web.ProjectData /// protected global::FineUIPro.DropDownList drpDriveManager; - /// - /// drpUnit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpUnit; - - /// - /// txtProjectAddress 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtProjectAddress; - - /// - /// txtJTProjectCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtJTProjectCode; - - /// - /// ckbIsForeign 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.CheckBox ckbIsForeign; - - /// - /// txtWorkRange 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtWorkRange; - - /// - /// txtRemark 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtRemark; - - /// - /// txtProjectMoney 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtProjectMoney; - - /// - /// txtConstructionMoney 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtConstructionMoney; - - /// - /// txtTelephone 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtTelephone; - - /// - /// drpCountry 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpCountry; - - /// - /// drpProvince 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpProvince; - - /// - /// txtCity 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtCity; - - /// - /// txtMapCoordinates 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtMapCoordinates; - - /// - /// bottomPanel 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ContentPanel bottomPanel; - - /// - /// txtEnglishRemark 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtEnglishRemark; - - /// - /// txtHJProjectCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtHJProjectCode; - - /// - /// txtKZProjectCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtKZProjectCode; - - /// - /// txtProjType 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtProjType; - - /// - /// txtProjPhase 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtProjPhase; - - /// - /// txtProgress 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtProgress; - /// /// Toolbar1 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index a9463acb..a96eecbf 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -26719,6 +26719,18 @@ namespace Model private System.Nullable _IsDelete; + private string _ProjectNameEn; + + private string _StClientName; + + private string _ClientContactor; + + private string _MobileTel; + + private System.Nullable _PlanStartDate; + + private System.Nullable _PlanEndDate; + private EntitySet _Accident_AccidentHandle; private EntitySet _Accident_AccidentPersonRecord; @@ -27425,6 +27437,18 @@ namespace Model partial void OnMasterSysIdChanged(); partial void OnIsDeleteChanging(System.Nullable value); partial void OnIsDeleteChanged(); + partial void OnProjectNameEnChanging(string value); + partial void OnProjectNameEnChanged(); + partial void OnStClientNameChanging(string value); + partial void OnStClientNameChanged(); + partial void OnClientContactorChanging(string value); + partial void OnClientContactorChanged(); + partial void OnMobileTelChanging(string value); + partial void OnMobileTelChanged(); + partial void OnPlanStartDateChanging(System.Nullable value); + partial void OnPlanStartDateChanged(); + partial void OnPlanEndDateChanging(System.Nullable value); + partial void OnPlanEndDateChanged(); #endregion public Base_Project() @@ -28589,6 +28613,126 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectNameEn", DbType="NVarChar(500)")] + public string ProjectNameEn + { + get + { + return this._ProjectNameEn; + } + set + { + if ((this._ProjectNameEn != value)) + { + this.OnProjectNameEnChanging(value); + this.SendPropertyChanging(); + this._ProjectNameEn = value; + this.SendPropertyChanged("ProjectNameEn"); + this.OnProjectNameEnChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StClientName", DbType="NVarChar(200)")] + public string StClientName + { + get + { + return this._StClientName; + } + set + { + if ((this._StClientName != value)) + { + this.OnStClientNameChanging(value); + this.SendPropertyChanging(); + this._StClientName = value; + this.SendPropertyChanged("StClientName"); + this.OnStClientNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ClientContactor", DbType="NVarChar(200)")] + public string ClientContactor + { + get + { + return this._ClientContactor; + } + set + { + if ((this._ClientContactor != value)) + { + this.OnClientContactorChanging(value); + this.SendPropertyChanging(); + this._ClientContactor = value; + this.SendPropertyChanged("ClientContactor"); + this.OnClientContactorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MobileTel", DbType="NVarChar(200)")] + public string MobileTel + { + get + { + return this._MobileTel; + } + set + { + if ((this._MobileTel != value)) + { + this.OnMobileTelChanging(value); + this.SendPropertyChanging(); + this._MobileTel = value; + this.SendPropertyChanged("MobileTel"); + this.OnMobileTelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStartDate", DbType="DateTime")] + public System.Nullable PlanStartDate + { + get + { + return this._PlanStartDate; + } + set + { + if ((this._PlanStartDate != value)) + { + this.OnPlanStartDateChanging(value); + this.SendPropertyChanging(); + this._PlanStartDate = value; + this.SendPropertyChanged("PlanStartDate"); + this.OnPlanStartDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEndDate", DbType="DateTime")] + public System.Nullable PlanEndDate + { + get + { + return this._PlanEndDate; + } + set + { + if ((this._PlanEndDate != value)) + { + this.OnPlanEndDateChanging(value); + this.SendPropertyChanging(); + this._PlanEndDate = value; + this.SendPropertyChanged("PlanEndDate"); + this.OnPlanEndDateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentHandle { @@ -284393,6 +284537,18 @@ namespace Model private System.DateTime _CreateTime; + private string _StClientName; + + private string _ClientContactor; + + private string _MobileTel; + + private System.Nullable _PlanStartDate; + + private System.Nullable _PlanEndDate; + + private string _StLocationName; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -284453,6 +284609,18 @@ namespace Model partial void OnRealEndDateChanged(); partial void OnCreateTimeChanging(System.DateTime value); partial void OnCreateTimeChanged(); + partial void OnStClientNameChanging(string value); + partial void OnStClientNameChanged(); + partial void OnClientContactorChanging(string value); + partial void OnClientContactorChanged(); + partial void OnMobileTelChanging(string value); + partial void OnMobileTelChanged(); + partial void OnPlanStartDateChanging(System.Nullable value); + partial void OnPlanStartDateChanged(); + partial void OnPlanEndDateChanging(System.Nullable value); + partial void OnPlanEndDateChanged(); + partial void OnStLocationNameChanging(string value); + partial void OnStLocationNameChanged(); #endregion public PMP_Project() @@ -285020,6 +285188,126 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stClientName", Storage="_StClientName", DbType="NVarChar(200)")] + public string StClientName + { + get + { + return this._StClientName; + } + set + { + if ((this._StClientName != value)) + { + this.OnStClientNameChanging(value); + this.SendPropertyChanging(); + this._StClientName = value; + this.SendPropertyChanged("StClientName"); + this.OnStClientNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="clientContactor", Storage="_ClientContactor", DbType="NVarChar(200)")] + public string ClientContactor + { + get + { + return this._ClientContactor; + } + set + { + if ((this._ClientContactor != value)) + { + this.OnClientContactorChanging(value); + this.SendPropertyChanging(); + this._ClientContactor = value; + this.SendPropertyChanged("ClientContactor"); + this.OnClientContactorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="mobileTel", Storage="_MobileTel", DbType="NVarChar(200)")] + public string MobileTel + { + get + { + return this._MobileTel; + } + set + { + if ((this._MobileTel != value)) + { + this.OnMobileTelChanging(value); + this.SendPropertyChanging(); + this._MobileTel = value; + this.SendPropertyChanged("MobileTel"); + this.OnMobileTelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="planStartDate", Storage="_PlanStartDate", DbType="DateTime")] + public System.Nullable PlanStartDate + { + get + { + return this._PlanStartDate; + } + set + { + if ((this._PlanStartDate != value)) + { + this.OnPlanStartDateChanging(value); + this.SendPropertyChanging(); + this._PlanStartDate = value; + this.SendPropertyChanged("PlanStartDate"); + this.OnPlanStartDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="planEndDate", Storage="_PlanEndDate", DbType="DateTime")] + public System.Nullable PlanEndDate + { + get + { + return this._PlanEndDate; + } + set + { + if ((this._PlanEndDate != value)) + { + this.OnPlanEndDateChanging(value); + this.SendPropertyChanging(); + this._PlanEndDate = value; + this.SendPropertyChanged("PlanEndDate"); + this.OnPlanEndDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="stLocationName", Storage="_StLocationName", DbType="NVarChar(20)")] + public string StLocationName + { + get + { + return this._StLocationName; + } + set + { + if ((this._StLocationName != value)) + { + this.OnStLocationNameChanging(value); + this.SendPropertyChanging(); + this._StLocationName = value; + this.SendPropertyChanged("StLocationName"); + this.OnStLocationNameChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; diff --git a/SGGL/Model/PMP/PMPOBS.cs b/SGGL/Model/PMP/PMPOBS.cs index 868bb06f..68714805 100644 --- a/SGGL/Model/PMP/PMPOBS.cs +++ b/SGGL/Model/PMP/PMPOBS.cs @@ -115,6 +115,21 @@ namespace Model } + /// + /// 项目OBS输出信息 + /// + public partial class PMPOBSOutInput + { + /// + /// 岗位专业名称 + /// + public string workName { get; set; } + /// + /// 对应岗位专业任职人员名称 + /// + public string userName { get; set; } + } + public partial class PMPOBSResponseData { diff --git a/SGGL/Model/PMP/PMPProject.cs b/SGGL/Model/PMP/PMPProject.cs index 461d8272..fb8e64d6 100644 --- a/SGGL/Model/PMP/PMPProject.cs +++ b/SGGL/Model/PMP/PMPProject.cs @@ -103,11 +103,16 @@ namespace Model [JsonProperty("stNum")] public string stNum { get; set; } /// - /// 名称 + /// 项目名称 /// [JsonProperty("name")] public string name { get; set; } /// + /// 项目英文名称 + /// + [JsonProperty("projectNameEn")] + public string projectNameEn { get; set; } + /// /// 项目简称 /// [JsonProperty("projShortName")] @@ -123,22 +128,47 @@ namespace Model [JsonProperty("realEndDate")] public DateTime? realEndDate { get; set; } /// + /// 计划开始日期 + /// + [JsonProperty("planStartDate")] + public DateTime? planStartDate { get; set; } + /// + /// 计划结束日期 + /// + [JsonProperty("planEndDate")] + public DateTime? planEndDate { get; set; } + /// + /// 业主名称 + /// + [JsonProperty("stClientName")] + public string stClientName { get; set; } + /// + /// 业主联系人 + /// + [JsonProperty("clientContactor")] + public string clientContactor { get; set; } + /// + /// 业主联系人电话 + /// + [JsonProperty("mobileTel")] + public string mobileTel { get; set; } + /// /// 操作类型 /// [JsonProperty("disType")] public string disType { get; set; } + ///// + ///// 项目类型名称（一级）【控制软件项目类型】 + ///// + //[JsonProperty("projName")] + //public string projName { get; set; } + ///// + ///// 项目类型名称（二级） + ///// + //[JsonProperty("projTypeName")] + //public string projTypeName { get; set; } /// - /// 项目阶段编码 - /// - [JsonProperty("projStepZxnoCode")] - public string projStepZxnoCode { get; set; } - /// - /// 项目阶段名称 - /// - [JsonProperty("projStepZxnoName")] - public string projStepZxnoName { get; set; } - /// - /// 项目类型一级 + /// 项目类型一级【控制软件项目类型】 /// [JsonProperty("stProjectTypeVals")] public string stProjectTypeVals { get; set; } @@ -147,11 +177,31 @@ namespace Model /// [JsonProperty("stProjectStepVals")] public string stProjectStepVals { get; set; } + ///// + ///// 项目阶段名称【控制软件项目阶段】 + ///// + //[JsonProperty("projStepName")] + //public string projStepName { get; set; } + /// + /// 项目阶段编码 + /// + [JsonProperty("projStepZxnoCode")] + public string projStepZxnoCode { get; set; } + /// + /// 项目阶段名称【控制软件项目阶段】 + /// + [JsonProperty("projStepZxnoName")] + public string projStepZxnoName { get; set; } /// /// 项目阶段 /// [JsonProperty("projStepZxnoVals")] public string projStepZxnoVals { get; set; } + ///// + ///// 项目性质名称 + ///// + //[JsonProperty("projPropName")] + //public string projPropName { get; set; } /// /// 项目性质 /// @@ -163,20 +213,10 @@ namespace Model [JsonProperty("remarkC")] public string remarkC { get; set; } /// - /// 详细地址 + /// 建设地点名称（境内、境外） /// - [JsonProperty("address")] - public string address { get; set; } - /// - /// 市编码 - /// - [JsonProperty("cityCode")] - public string cityCode { get; set; } - /// - /// 市名称 - /// - [JsonProperty("cityName")] - public string cityName { get; set; } + [JsonProperty("stLocationName")] + public string stLocationName { get; set; } /// /// 国家编码 /// @@ -188,6 +228,26 @@ namespace Model [JsonProperty("countryName")] public string countryName { get; set; } /// + /// 省编码 + /// + [JsonProperty("provinceCode")] + public string provinceCode { get; set; } + /// + /// 省名称 + /// + [JsonProperty("provinceName")] + public string provinceName { get; set; } + /// + /// 市编码 + /// + [JsonProperty("cityCode")] + public string cityCode { get; set; } + /// + /// 市名称 + /// + [JsonProperty("cityName")] + public string cityName { get; set; } + /// /// 区县编码 /// [JsonProperty("countyCode")] @@ -198,20 +258,10 @@ namespace Model [JsonProperty("countyName")] public string countyName { get; set; } /// - /// 项目英文名称 + /// 详细地址 /// - [JsonProperty("projectNameEn")] - public string projectNameEn { get; set; } - /// - /// 省编码 - /// - [JsonProperty("provinceCode")] - public string provinceCode { get; set; } - /// - /// 省名称 - /// - [JsonProperty("provinceName")] - public string provinceName { get; set; } + [JsonProperty("address")] + public string address { get; set; } /// /// 经度 /// diff --git a/SGGL/WebAPI/Controllers/PMP/PMPController.cs b/SGGL/WebAPI/Controllers/PMP/PMPController.cs new file mode 100644 index 00000000..9d842992 --- /dev/null +++ b/SGGL/WebAPI/Controllers/PMP/PMPController.cs @@ -0,0 +1,33 @@ +using BLL; +using System; +using System.Web.Http; + +namespace WebAPI.Controllers +{ + /// + /// 五环PMP系统 + /// + public class PMPController : ApiController + { + /// + /// 每天夜间同步获取PMP系统项目数据 + /// + /// + [HttpPost] + public Model.ResponeData SynPMPProjectData() + { + var responeData = new Model.ResponeData(); + try + { + PMPDataService.GetPMPProjectMasterData(); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.ToString(); + } + return responeData; + } + + } +} \ No newline at end of file diff --git a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs index 3cee737f..cea734bf 100644 --- a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs +++ b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs @@ -86,7 +86,7 @@ namespace WebAPI.Filter /// /// /// - public static List lists = new List { "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount", "HazardRegister*getHazardRegisterByProjectIdStates", "upload*attendance" }; + public static List lists = new List { "PMP*SynPMPProjectData", "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount", "HazardRegister*getHazardRegisterByProjectIdStates", "upload*attendance" }; /// /// diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index fa3d6503..f45751ef 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -217,6 +217,7 @@ +