从“专版工单”发起生成的“纸张采购”中增加显示“印件名称”

username@email.com

2025-01-26 a0b3492010949e0d044892b9bb6456b51ae0d458

 CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs

@@ -61,7 +61,9 @@
                    new SqlParameter("@PlanType", trueModel.PlanType) ,            
                    new SqlParameter("@PlanDataType", trueModel.PlanDataType) ,            
                    new SqlParameter("@PlanTitle", trueModel.PlanTitle) ,            
                    new SqlParameter("@PlanContent", trueModel.PlanContent)  
                    new SqlParameter("@PlanContent", trueModel.PlanContent)  ,
                     new SqlParameter("@HoubufapiaoStatus", trueModel.HoubufapiaoStatus.HasValue?trueModel.HoubufapiaoStatus.Value:3) ,
                      new SqlParameter("@WufapiaoStatus", trueModel.WufapiaoStatus.HasValue?trueModel.WufapiaoStatus.Value:3) ,
            };
            try
            {
@@ -73,6 +75,71 @@
            }
            return true;
        }



        /// <summary>
        /// 新增
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public int InserModelAndGetId(OA_WorkPlan trueModel)
        {
           
            if (trueModel == null)
            {
                return 0;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                    new SqlParameter("@PlanRunTime", trueModel.PlanRunTime) ,
                    new SqlParameter("@PlanMoney", trueModel.PlanMoney) ,
                    new SqlParameter("@PlanRemark", trueModel.PlanRemark) ,
                    new SqlParameter("@PlanStartTime", trueModel.PlanStartTime) ,
                    new SqlParameter("@PlanPeople", trueModel.PlanPeople) ,
                    new SqlParameter("@PlanComplany", trueModel.PlanComplany) ,
                    new SqlParameter("@PlanStatus", trueModel.PlanStatus) ,
                    new SqlParameter("@ApprovalStaffId", trueModel.ApprovalStaffId) ,
                    new SqlParameter("@ApprovalStatus", trueModel.ApprovalStatus) ,
                    new SqlParameter("@ApprovalTime", trueModel.ApprovalTime) ,
                    new SqlParameter("@MemberId", trueModel.MemberId) ,
                    new SqlParameter("@ApprovalContent", trueModel.ApprovalContent) ,
                    new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
                    new SqlParameter("@Operator", trueModel.Operator) ,
                    new SqlParameter("@EvaluationStatus", trueModel.EvaluationStatus) ,
                    new SqlParameter("@EvaluationContent", trueModel.EvaluationContent) ,
                    new SqlParameter("@EvaluationStaffId", trueModel.EvaluationStaffId) ,
                    new SqlParameter("@EvaluationTime", trueModel.EvaluationTime) ,
                    new SqlParameter("@RewardType", trueModel.RewardType) ,
                    new SqlParameter("@RewardContent", trueModel.RewardContent) ,
                    new SqlParameter("@RewardResult", trueModel.RewardResult) ,
                    new SqlParameter("@SentStaffId", trueModel.SentStaffId) ,
                    new SqlParameter("@RewardMoney", trueModel.RewardMoney) ,
                    new SqlParameter("@DepartId", trueModel.DepartId) ,
                    new SqlParameter("@ReciveStaffId", trueModel.ReciveStaffId) ,
                    new SqlParameter("@PlanType", trueModel.PlanType) ,
                    new SqlParameter("@PlanDataType", trueModel.PlanDataType) ,
                    new SqlParameter("@PlanTitle", trueModel.PlanTitle) ,
                    new SqlParameter("@PlanContent", trueModel.PlanContent)  ,
                     new SqlParameter("@HoubufapiaoStatus", trueModel.HoubufapiaoStatus.HasValue?trueModel.HoubufapiaoStatus.Value:3) ,
                      new SqlParameter("@WufapiaoStatus", trueModel.WufapiaoStatus.HasValue?trueModel.WufapiaoStatus.Value:3) ,
            };
            string sql = "Insert Into OA_WorkPlan ([PlanRunTime],[PlanMoney],[PlanRemark],[PlanStartTime], [PlanPeople], [PlanComplany],[PlanStatus], [ApprovalStaffId],[ApprovalStatus], [ApprovalTime],[MemberId],[ApprovalContent],[LastUpdateTime],[Operator],EvaluationStatus,EvaluationContent,EvaluationStaffId,EvaluationTime,RewardType,RewardContent,RewardResult,SentStaffId,RewardMoney,DepartId,ReciveStaffId,PlanType,PlanDataType,PlanTitle,PlanContent,HoubufapiaoStatus,WufapiaoStatus)"
                                            + " Values ( @PlanRunTime,@PlanMoney,@PlanRemark, @PlanStartTime, @PlanPeople, @PlanComplany, @PlanStatus, @ApprovalStaffId, @ApprovalStatus, @ApprovalTime,@MemberId,@ApprovalContent,@LastUpdateTime,@Operator,@EvaluationStatus,@EvaluationContent,@EvaluationStaffId,@EvaluationTime,@RewardType,@RewardContent,@RewardResult,@SentStaffId,@RewardMoney,@DepartId,@ReciveStaffId,@PlanType,@PlanDataType,@PlanTitle,@PlanContent,@HoubufapiaoStatus,@WufapiaoStatus )";

            int id = 0;
            try
            {
                id = _dataBase.InsertDataAndGetId(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return id;
        }

        

        /// <summary>
        /// 修改
@@ -117,7 +184,9 @@
                    new SqlParameter("@PlanType", trueModel.PlanType) ,            
                    new SqlParameter("@PlanDataType", trueModel.PlanDataType) ,            
                    new SqlParameter("@PlanTitle", trueModel.PlanTitle) ,            
                    new SqlParameter("@PlanContent", trueModel.PlanContent)  
                    new SqlParameter("@PlanContent", trueModel.PlanContent)  ,
                      new SqlParameter("@HoubufapiaoStatus", trueModel.HoubufapiaoStatus.HasValue?trueModel.HoubufapiaoStatus.Value:3) ,
                      new SqlParameter("@WufapiaoStatus", trueModel.WufapiaoStatus.HasValue?trueModel.WufapiaoStatus.Value:3) ,
            };
            try
            {
@@ -225,7 +294,7 @@
        /// <param name="EvaluationStatus"></param>
        /// <param name="RewardType"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType)
        public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null, string BaocunStatus = null)
        {
            try
            {
@@ -248,7 +317,14 @@
                }

                if (PlanDataType > 0)
                {
                    condition += " and a.PlanDataType = '" + PlanDataType + "'";
                }
                else
                {
                    condition += " and a.PlanDataType != '17'  ";
                }
                   

                if (!string.IsNullOrEmpty(PlanTitle))
                    condition += " and a.PlanTitle like '%" + PlanTitle + "%'";
@@ -262,9 +338,13 @@
                if (ApprovalStatus >= 0)
                {
                    if (ApprovalStatus == 1)
                        condition += " and ( a.ApprovalStatus = '1' or a.ApprovalStatus = '3' )";
                        condition += " and (( a.PlanDataType = 17  and a.ApprovalStatus = '1'  )  or (  a.PlanDataType != 17 and (a.ApprovalStatus = '3' or  a.ApprovalStatus = '1')  ))";
                    else
                        condition += " and a.ApprovalStatus = '" + ApprovalStatus + "'";
                }
                if (!string.IsNullOrEmpty(BaocunStatus))
                {
                        condition += " and a.ApprovalStatus != '" + BaocunStatus + "'";
                }
                if (EvaluationStatus >= 0)
                {
@@ -273,6 +353,14 @@
                    else
                        condition += " and a.EvaluationStatus = '" + EvaluationStatus + "'";
                }
                if (!string.IsNullOrWhiteSpace(RewardContent))
                {
                    condition += " and a.RewardContent like '%" + RewardContent + "%'";
                }
                if (!string.IsNullOrWhiteSpace(PlanContent))
                {
                    condition += " and a.PlanContent like '%" + PlanContent + "%'";
                }

                if (RewardType > 0)
                    condition += " and a.RewardType = '" + RewardType + "'";