Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

2023-04-28 14:39:47 +08:00
parent 493fa28b46 749c71ada6
commit 6fa6392ca9
25 changed files with 3280 additions and 26 deletions
@@ -596,6 +596,8 @@
    <Compile Include="OpenService\MonitorService.cs" />
    <Compile Include="DynamicTHeaderHepler.cs" />
    <Compile Include="OpenService\GetDataService.cs" />
+    <Compile Include="Opinion\OpinionCollectionApproveService.cs" />
+    <Compile Include="Opinion\OpinionCollectionService.cs" />
    <Compile Include="Party\BasicInformationDetailService.cs" />
    <Compile Include="Party\BasicInformationService.cs" />
    <Compile Include="Party\CommentPartyerService.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;
                    }
@@ -735,6 +735,10 @@ namespace BLL
        /// 现场考勤
        /// </summary>
        public const string Menu_PDigData = "Menu_PDigData";
+        /// <summary>
+        /// 意见收集
+        /// </summary>
+        public const string Menu_Opinion = "Menu_Opinion";
        #endregion
        #endregion

@@ -2838,6 +2842,11 @@ namespace BLL
        /// 关键事项
        /// </summary>
        public const string GJSXMenuId = "0BEA2126-7A48-40EB-8E21-99148E91A22B";
+
+        /// <summary>
+        /// 意见收集
+        /// </summary>
+        public const string OpinionCollectionMenuId = "D801290C-1FD9-4467-AFF9-7D788C6344B1";
        #endregion


@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 意见收集流程表
+    /// </summary>
+    public static class OpinionCollectionApproveService
+    {
+
+        /// <summary>
+        /// 根据意见收集Id获取相关流程
+        /// </summary>
+        /// <param name="opinionCollectionId"></param>
+        /// <returns></returns>
+        public static List<Model.Opinion_OpinionCollectionApprove> GetApproveListByOpinionCollectionId(string opinionCollectionId)
+        {
+            return (from x in Funs.DB.Opinion_OpinionCollectionApprove where x.OpinionCollectionId == opinionCollectionId select x).ToList();
+        }
+
+        /// <summary>
+        /// 根据意见收集Id获取相关流程试图列表
+        /// </summary>
+        /// <param name="opinionCollectionId"></param>
+        /// <returns></returns>
+        public static List<Model.View_Opinion_OpinionCollectionApprove> getViewApproveLists(string opinionCollectionId)
+        {
+            return (from x in Funs.DB.View_Opinion_OpinionCollectionApprove where x.OpinionCollectionId == opinionCollectionId orderby x.ApproveDate descending select x).ToList();
+        }
+
+        /// <summary>
+        /// 添加审批流程
+        /// </summary>
+        /// <param name="approve"></param>
+        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();
+        }
+
+        /// <summary>
+        /// 根据主键修改流程
+        /// </summary>
+        /// <param name="approve"></param>
+        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();
+            }
+        }
+
+        /// <summary>
+        /// 根据意见收集Id删除相关流程
+        /// </summary>
+        /// <param name="opinionCollectionId"></param>
+        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();
+            }
+        }
+    }
+}
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 意见收集
+    /// </summary>
+    public static class OpinionCollectionService
+    {
+        /// <summary>
+        /// 根据主键获取意见收集
+        /// </summary>
+        /// <param name="opinionCollectionId"></param>
+        /// <returns></returns>
+        public static Model.Opinion_OpinionCollection GetOpinionCollectionById(string opinionCollectionId)
+        {
+            return Funs.DB.Opinion_OpinionCollection.FirstOrDefault(e => e.OpinionCollectionId == opinionCollectionId);
+        }
+
+        /// <summary>
+        /// 添加意见收集
+        /// </summary>
+        /// <param name="opinionCollection"></param>
+        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();
+        }
+
+        /// <summary>
+        /// 修改意见收集
+        /// </summary>
+        /// <param name="opinionCollection"></param>
+        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();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除意见收集
+        /// </summary>
+        /// <param name="opinionCollectionId"></param>
+        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();
+            }
+        }
+    }
+}
@@ -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();
        }
+
+        /// <summary>
+        /// 根据项目Id获取角色列表
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.View_ProjectUserRole> getRoleIdList(string projectId)
+        {
+            return (from x in Funs.DB.View_ProjectUserRole where x.ProjectId == projectId && x.RoleName != null select x).ToList();
+        }
+
+        /// <summary>
+        /// 获取项目用户角色下拉
+        /// </summary>
+        /// <param name="dropName"></param>
+        /// <param name="projectId"></param>
+        /// <param name="isShowPlease"></param>
+        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);
+            }
+        }
    }
 }
@@ -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);
+            }
+        }
+
+        /// <summary>
+        /// 根据项目号和角色Id获取用户下拉选项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Sys_User> GetUserListByRoleId(string projectId, string roleId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                List<Model.Sys_User> list = new List<Model.Sys_User>();
+                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;
+            }
+        }
    }
 }