diff --git a/DataBase/版本日志/SGGLDB_WH_2023-04-28_001.sql b/DataBase/版本日志/SGGLDB_WH_2023-04-28_001.sql new file mode 100644 index 00000000..970f7a01 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-04-28_001.sql @@ -0,0 +1,222 @@ +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('D801290C-1FD9-4467-AFF9-7D788C6344B1','ռ','Opinion/OpinionCollection.aspx',10,'0','Menu_Opinion',0,1,1) +go + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('584BC63D-455E-476E-A7EA-D3C091AB13D5','D801290C-1FD9-4467-AFF9-7D788C6344B1','',1) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('C0D42EF1-88BE-4235-820E-02901FDD4477','D801290C-1FD9-4467-AFF9-7D788C6344B1','޸',2) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('3F5AFB78-043D-46C8-86EB-A980E2339FB5','D801290C-1FD9-4467-AFF9-7D788C6344B1','ɾ',3) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('D87739D3-363E-4FD8-B865-968CDB361A40','D801290C-1FD9-4467-AFF9-7D788C6344B1','',4) + insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + values('0C35983E-B585-4C11-B7E8-E7529CA10026','D801290C-1FD9-4467-AFF9-7D788C6344B1','ύ',5) + go + + CREATE TABLE [dbo].[Opinion_OpinionCollection]( + [OpinionCollectionId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [UnitId] [nvarchar](50) NULL, + [RoleId] [nvarchar](500) NULL, + [ProblemClass] [nvarchar](50) NULL, + [Opinion] [nvarchar](2000) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + [State] [nchar](10) NULL, + CONSTRAINT [PK_Opinion_OpinionCollection] PRIMARY KEY CLUSTERED +( + [OpinionCollectionId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollection] WITH CHECK ADD CONSTRAINT [FK_Opinion_OpinionCollection_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollection] CHECK CONSTRAINT [FK_Opinion_OpinionCollection_Base_Project] +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollection] WITH CHECK ADD CONSTRAINT [FK_Opinion_OpinionCollection_Base_Unit] FOREIGN KEY([UnitId]) +REFERENCES [dbo].[Base_Unit] ([UnitId]) +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollection] CHECK CONSTRAINT [FK_Opinion_OpinionCollection_Base_Unit] +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollection] WITH CHECK ADD CONSTRAINT [FK_Opinion_OpinionCollection_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollection] CHECK CONSTRAINT [FK_Opinion_OpinionCollection_Sys_User] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Opinion_OpinionCollection', @level2type=N'COLUMN',@level2name=N'OpinionCollectionId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Opinion_OpinionCollection', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Opinion_OpinionCollection', @level2type=N'COLUMN',@level2name=N'UnitId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ɫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Opinion_OpinionCollection', @level2type=N'COLUMN',@level2name=N'RoleId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Opinion_OpinionCollection', @level2type=N'COLUMN',@level2name=N'ProblemClass' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Opinion_OpinionCollection', @level2type=N'COLUMN',@level2name=N'Opinion' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Opinion_OpinionCollection', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Opinion_OpinionCollection', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Opinion_OpinionCollection', @level2type=N'COLUMN',@level2name=N'State' +GO + + + + +CREATE TABLE [dbo].[Opinion_OpinionCollectionApprove]( + [OpinionCollectionApproveId] [nvarchar](50) NOT NULL, + [OpinionCollectionId] [nvarchar](50) NULL, + [ApproveMan] [nvarchar](50) NULL, + [ApproveManRoleId] [nvarchar](50) NULL, + [ApproveDate] [datetime] NULL, + [IsAgree] [bit] NULL, + [ApproveIdea] [nvarchar](200) NULL, + CONSTRAINT [PK_Opinion_OpinionCollectionApprove] PRIMARY KEY CLUSTERED +( + [OpinionCollectionApproveId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollectionApprove] WITH CHECK ADD CONSTRAINT [FK_Opinion_OpinionCollectionApprove_Opinion_OpinionCollection] FOREIGN KEY([OpinionCollectionId]) +REFERENCES [dbo].[Opinion_OpinionCollection] ([OpinionCollectionId]) +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollectionApprove] CHECK CONSTRAINT [FK_Opinion_OpinionCollectionApprove_Opinion_OpinionCollection] +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollectionApprove] WITH CHECK ADD CONSTRAINT [FK_Opinion_OpinionCollectionApprove_Sys_User] FOREIGN KEY([ApproveMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[Opinion_OpinionCollectionApprove] CHECK CONSTRAINT [FK_Opinion_OpinionCollectionApprove_Sys_User] +GO + + + + +CREATE VIEW View_Opinion_OpinionCollection +AS +/*******ռ********/ +SELECT Opinion.OpinionCollectionId, +Opinion.ProjectId, +Opinion.UnitId, +Opinion.RoleId, +Opinion.ProblemClass, +Opinion.Opinion, +Opinion.CompileMan, +Opinion.CompileDate, +Opinion.State, +Project.ProjectName, +Unit.UnitName, +--Roles.RoleName, +U.UserName AS CompileManName +FROM Opinion_OpinionCollection AS Opinion +LEFT JOIN Base_Project AS Project ON Project.ProjectId = Opinion.ProjectId +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Opinion.UnitId +--LEFT JOIN Sys_Role AS Roles ON Roles.RoleId = Opinion.RoleId +LEFT JOIN Sys_User AS U ON U.UserId = Opinion.CompileMan +go + + +--INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) +--VALUES('D9A13B76-5A75-426B-A090-1B4CEA1F0E8B','','',1,'Opinion') +--INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) +--VALUES('15A30077-57EF-42F5-AEDD-8766762367F0','ȫ','ȫ',2,'Opinion') +--INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) +--VALUES('09768B35-CC52-4259-BAF3-42AB61D86033','ȹ','ȹ',3,'Opinion') +--INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) +--VALUES('80E7213A-265C-4ED6-A842-231FB7750230','ӹ','ӹ',4,'Opinion') +--INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) +--VALUES('D830937D-0A86-41C6-AB48-9E9620247C88','Ϲ','Ϲ',5,'Opinion') +--INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) +--VALUES('21CB1610-FB8F-4B43-82C1-581C4A41DEE7','Գ','Գ',6,'Opinion') +--INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) +--VALUES('38B301F9-6718-4012-A296-624B047929FF','ؼ','ؼ',7,'Opinion') +--INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) +--VALUES('142E7579-D554-40FF-980E-7B9D3F3118D9','Ƶ','Ƶ',8,'Opinion') +--INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) +--VALUES('E8F78346-9426-4710-A380-78BB72581025','ֳ','ֳ',9,'Opinion') +--go + +-- ֳַַɶ(@String:ַָ, @Delimiter:ָ) +-- demo: select top 10 * from dbo.split('Chennai,Bangalore,Mumbai',',') +-- : +-- items() +-- Chennai +-- Bangalore +-- Mumbai + +CREATE FUNCTION [dbo].[Split](@String varchar(8000), @Delimiter char(1)) +returns @temptable TABLE (items varchar(8000)) +as +begin + declare @idx int + declare @slice varchar(8000) + select @idx = 1 + if len(@String)<1 or @String is null return + while @idx!= 0 + begin + set @idx =charindex(@Delimiter,@String) + if @idx!=0 + set @slice =left(@String,@idx - 1) + else + set @slice = @String + if(len(@slice)>0) + insert into @temptable(items)values(@slice) + set @String =right(@String,len(@String)- @idx) + if len(@String)= 0 break + end +return +end + +go + +CREATE VIEW View_ProjectUserRole +AS +/****ѯĿûɫ*****/ +SELECT distinct +a.items, +r.RoleName, +ProjectId +FROM Project_ProjectUser b +CROSS APPLY dbo.Split(b.RoleId,',') AS a +left join Sys_Role r on r.RoleId = a.items +go + + +CREATE VIEW View_Opinion_OpinionCollectionApprove +AS +/**********ռ**********/ +SELECT OpinionCollectionApproveId, +OpinionCollectionId, +ApproveMan, +ApproveManRoleId, +ApproveDate, +(CASE IsAgree WHEN 1 then 'ͬ' when 0 then 'ͬ' else '' end)as IsAgree, +ApproveIdea, +u.UserName as ApproveManName, +r.RoleName +FROM Opinion_OpinionCollectionApprove AS approve +left join Sys_User as u on u.UserId = approve.ApproveMan +left join Sys_Role as r on r.RoleId=approve.ApproveManRoleId \ No newline at end of file diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index f3898136..1c821d37 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -596,6 +596,8 @@ + + diff --git a/SGGL/BLL/Common/AttachFileService.cs b/SGGL/BLL/Common/AttachFileService.cs index d40e30c0..0f63dabb 100644 --- a/SGGL/BLL/Common/AttachFileService.cs +++ b/SGGL/BLL/Common/AttachFileService.cs @@ -472,5 +472,33 @@ namespace BLL return list; } + + /// + /// 判断文件类型是否支持的预览 + /// + /// + /// + public static bool IsSupportFileType(string FiletExtension) + { + bool result = false; + List list = new List(); + list.Add(".doc"); + list.Add(".docx"); + list.Add(".pdf"); + list.Add(".txt"); + list.Add(".xlsx"); + list.Add(".xls"); + foreach (var item in list) + { + if (item == FiletExtension) + { + result = true; + break; + } + } + + return result; + + } } } diff --git a/SGGL/BLL/Common/CommonService.cs b/SGGL/BLL/Common/CommonService.cs index c413c6dc..b3b112fd 100644 --- a/SGGL/BLL/Common/CommonService.cs +++ b/SGGL/BLL/Common/CommonService.cs @@ -385,7 +385,7 @@ namespace BLL var getUser = db.Sys_User.FirstOrDefault(x => x.UserId == userId); if (getUser != null) { - if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId) + if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId||menuType==BLL.Const.Menu_Opinion) { isHave = true; } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 0bcfdab6..7b135dd2 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -735,6 +735,10 @@ namespace BLL /// 现场考勤 /// public const string Menu_PDigData = "Menu_PDigData"; + /// + /// 意见收集 + /// + public const string Menu_Opinion = "Menu_Opinion"; #endregion #endregion @@ -2838,6 +2842,11 @@ namespace BLL /// 关键事项 /// public const string GJSXMenuId = "0BEA2126-7A48-40EB-8E21-99148E91A22B"; + + /// + /// 意见收集 + /// + public const string OpinionCollectionMenuId = "D801290C-1FD9-4467-AFF9-7D788C6344B1"; #endregion diff --git a/SGGL/BLL/Opinion/OpinionCollectionApproveService.cs b/SGGL/BLL/Opinion/OpinionCollectionApproveService.cs new file mode 100644 index 00000000..0d39a164 --- /dev/null +++ b/SGGL/BLL/Opinion/OpinionCollectionApproveService.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 意见收集流程表 + /// + public static class OpinionCollectionApproveService + { + + /// + /// 根据意见收集Id获取相关流程 + /// + /// + /// + public static List GetApproveListByOpinionCollectionId(string opinionCollectionId) + { + return (from x in Funs.DB.Opinion_OpinionCollectionApprove where x.OpinionCollectionId == opinionCollectionId select x).ToList(); + } + + /// + /// 根据意见收集Id获取相关流程试图列表 + /// + /// + /// + public static List getViewApproveLists(string opinionCollectionId) + { + return (from x in Funs.DB.View_Opinion_OpinionCollectionApprove where x.OpinionCollectionId == opinionCollectionId orderby x.ApproveDate descending select x).ToList(); + } + + /// + /// 添加审批流程 + /// + /// + public static void AddOpinionCollectionApprove(Model.Opinion_OpinionCollectionApprove approve) + { + Model.Opinion_OpinionCollectionApprove newApprove = new Model.Opinion_OpinionCollectionApprove + { + OpinionCollectionApproveId = approve.OpinionCollectionApproveId, + OpinionCollectionId = approve.OpinionCollectionId, + ApproveMan = approve.ApproveMan, + ApproveDate = approve.ApproveDate, + IsAgree = approve.IsAgree, + ApproveIdea = approve.ApproveIdea, + ApproveManRoleId = approve.ApproveManRoleId, + }; + Funs.DB.Opinion_OpinionCollectionApprove.InsertOnSubmit(newApprove); + Funs.DB.SubmitChanges(); + } + + /// + /// 根据主键修改流程 + /// + /// + public static void UpdateOpinionCollectionApprove(Model.Opinion_OpinionCollectionApprove approve) + { + Model.Opinion_OpinionCollectionApprove newApprove = Funs.DB.Opinion_OpinionCollectionApprove.FirstOrDefault(e => e.OpinionCollectionApproveId == approve.OpinionCollectionApproveId); + if (newApprove != null) + { + newApprove.ApproveDate = approve.ApproveDate; + newApprove.IsAgree = approve.IsAgree; + newApprove.ApproveIdea = approve.ApproveIdea; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据意见收集Id删除相关流程 + /// + /// + public static void DeleteApproveByOpinionCollectionId(string opinionCollectionId) + { + var approve = (from x in Funs.DB.Opinion_OpinionCollectionApprove where x.OpinionCollectionId == opinionCollectionId select x).ToList(); + if (approve.Count > 0) + { + Funs.DB.Opinion_OpinionCollectionApprove.DeleteAllOnSubmit(approve); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/Opinion/OpinionCollectionService.cs b/SGGL/BLL/Opinion/OpinionCollectionService.cs new file mode 100644 index 00000000..b18dd223 --- /dev/null +++ b/SGGL/BLL/Opinion/OpinionCollectionService.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 意见收集 + /// + public static class OpinionCollectionService + { + /// + /// 根据主键获取意见收集 + /// + /// + /// + public static Model.Opinion_OpinionCollection GetOpinionCollectionById(string opinionCollectionId) + { + return Funs.DB.Opinion_OpinionCollection.FirstOrDefault(e => e.OpinionCollectionId == opinionCollectionId); + } + + /// + /// 添加意见收集 + /// + /// + public static void AddOpinionCollection(Model.Opinion_OpinionCollection opinionCollection) + { + Model.Opinion_OpinionCollection newOpinionCollection = new Model.Opinion_OpinionCollection + { + OpinionCollectionId = opinionCollection.OpinionCollectionId, + ProjectId = opinionCollection.ProjectId, + UnitId = opinionCollection.UnitId, + RoleId = opinionCollection.RoleId, + ProblemClass = opinionCollection.ProblemClass, + Opinion = opinionCollection.Opinion, + CompileMan = opinionCollection.CompileMan, + CompileDate = opinionCollection.CompileDate, + State = opinionCollection.State + }; + Funs.DB.Opinion_OpinionCollection.InsertOnSubmit(newOpinionCollection); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改意见收集 + /// + /// + public static void UpdateOpinionCollection(Model.Opinion_OpinionCollection opinionCollection) + { + Model.Opinion_OpinionCollection newOpinionCollection = Funs.DB.Opinion_OpinionCollection.FirstOrDefault(e => e.OpinionCollectionId == opinionCollection.OpinionCollectionId); + if (newOpinionCollection != null) + { + //newOpinionCollection.UnitId = opinionCollection.UnitId; + //newOpinionCollection.RoleId = opinionCollection.RoleId; + newOpinionCollection.ProblemClass = opinionCollection.ProblemClass; + newOpinionCollection.Opinion = opinionCollection.Opinion; + //newOpinionCollection.CompileMan = opinionCollection.CompileMan; + //newOpinionCollection.CompileDate = opinionCollection.CompileDate; + newOpinionCollection.State = opinionCollection.State; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据主键删除意见收集 + /// + /// + public static void DeleteOpinionCollectionById(string opinionCollectionId) + { + Model.Opinion_OpinionCollection opinionCollection = Funs.DB.Opinion_OpinionCollection.FirstOrDefault(e => e.OpinionCollectionId == opinionCollectionId); + if (opinionCollection != null) + { + Funs.DB.Opinion_OpinionCollection.DeleteOnSubmit(opinionCollection); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/ProjectData/ProjectUserService.cs b/SGGL/BLL/ProjectData/ProjectUserService.cs index b4ab9b04..b3c260f1 100644 --- a/SGGL/BLL/ProjectData/ProjectUserService.cs +++ b/SGGL/BLL/ProjectData/ProjectUserService.cs @@ -59,8 +59,8 @@ UnitId = projectUser.UnitId, RoleId = projectUser.RoleId, IsPost = projectUser.IsPost, - MainCNProfessionalId=projectUser.MainCNProfessionalId, - ViceCNProfessionalId=projectUser.ViceCNProfessionalId + MainCNProfessionalId = projectUser.MainCNProfessionalId, + ViceCNProfessionalId = projectUser.ViceCNProfessionalId }; //newProjectUser.RoleName = projectUser.RoleName; db.Project_ProjectUser.InsertOnSubmit(newProjectUser); @@ -149,5 +149,33 @@ where x.ProjectId == ProjectId && y.IdentityCard == IdentityCard select x).FirstOrDefault(); } + + /// + /// 根据项目Id获取角色列表 + /// + /// + /// + public static List getRoleIdList(string projectId) + { + return (from x in Funs.DB.View_ProjectUserRole where x.ProjectId == projectId && x.RoleName != null select x).ToList(); + } + + /// + /// 获取项目用户角色下拉 + /// + /// + /// + /// + public static void InitProjectUserRoleIdDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "Items"; + dropName.DataTextField = "RoleName"; + dropName.DataSource = getRoleIdList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } } } \ No newline at end of file diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index d9e8ea90..03721d6b 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -1511,5 +1511,38 @@ namespace BLL return lis; } } + + public static void InitUserByRoleIdDropDownList(FineUIPro.DropDownList dropName, string projectId, string roleId, bool isShowPlease) + { + dropName.DataValueField = "UserId"; + dropName.DataTextField = "UserName"; + dropName.DataSource = BLL.UserService.GetUserListByRoleId(projectId, roleId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// ĿźͽɫIdȡûѡ + /// + /// + public static List GetUserListByRoleId(string projectId, string roleId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + List list = new List(); + if (!string.IsNullOrEmpty(projectId)) + { + list = (from x in db.Sys_User + join y in db.Project_ProjectUser on x.UserId equals y.UserId + where y.ProjectId == projectId && y.RoleId.Contains(roleId) && y.IsPost == true + orderby x.UserName + select x).ToList(); + } + return list; + } + } } } diff --git a/SGGL/FineUIPro.Web/AttachFile/Look.aspx b/SGGL/FineUIPro.Web/AttachFile/Look.aspx new file mode 100644 index 00000000..523924a7 --- /dev/null +++ b/SGGL/FineUIPro.Web/AttachFile/Look.aspx @@ -0,0 +1,26 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Look.aspx.cs" Inherits="FineUIPro.Web.AttachFile.Look" %> + + + + + + + + + +
+ + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs new file mode 100644 index 00000000..8f69c8ea --- /dev/null +++ b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs @@ -0,0 +1,46 @@ +using BLL; +using System; +using System.IO; + +namespace FineUIPro.Web.AttachFile +{ + public partial class Look : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + + var url = Request.Params["fileUrl"]; + // var Baseurl = "https://view.officeapps.live.com/op/embed.aspx?src="; + var Baseurl = "https://view.xdocin.com/view?src="; + var Fileurl = Funs.SGGLUrl + url.Replace(Funs.RootPath, ""); + var newurl = ""; + var FiletExtension = Path.GetExtension(url); + if (FiletExtension == ".docx" || FiletExtension == ".doc"|| FiletExtension == ".xls" || FiletExtension == ".xlsx") + { + newurl = Baseurl + Fileurl; + } + else if (FiletExtension == ".txt"|| FiletExtension== "pdf") + { + newurl = Fileurl; + } + else + { + newurl = Fileurl; + } + + this.LookHtml.Src = newurl; + this.Tab1.IFrameUrl = newurl; + //StreamReader fread = new StreamReader(url, System.Text.Encoding.GetEncoding("gb2312")); + //string ss = fread.ReadToEnd(); + //Response.Write(ss); + //fread.Close(); + //fread.Dispose(); + + } + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.designer.cs b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.designer.cs new file mode 100644 index 00000000..021dd9b8 --- /dev/null +++ b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.AttachFile +{ + + + public partial class Look + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// TabStrip1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TabStrip TabStrip1; + + /// + /// Tab1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tab Tab1; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// LookHtml 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlIframe LookHtml; + } +} diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx index 5b1c7f60..10baea49 100644 --- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx +++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx @@ -1,5 +1,4 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="webuploader.aspx.cs" Inherits="FineUIPro.Web.AttachFile.webuploader" %> - @@ -29,16 +28,17 @@ @@ -48,7 +48,8 @@ ExpandUnusedSpace="True" CommandName="Attach" EnableAjax="false" /> - + +