没有批准的就不显示在列表中

username@email.com

2025-10-16 40eacc41d6f70f64ffd8f1fd18a8e12bce3fd86d

没有批准的就不显示在列表中

列表显示责任人

       ALTER TABLE [dbo].[OA_ShebeiWeixiu]  ADD      ApprovalStatus [int] NULL DEFAULT (0) ;

GO

update  [dbo].[OA_ShebeiWeixiu] set ApprovalStatus=(select [ApprovalStatus] from [dbo].[OA_WorkPlan] a where a.Keyid = [OA_ShebeiWeixiu].WeixiuShebeiId  )

 CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs

@@ -24,6 +24,7 @@
        public decimal? WeixiuPrice { get; set; }
        public int? Zerenren { get; set; }
        public string ZerenrenName { get; set; }
        public string ShebeiZerenrenName { get; set; }
        public decimal? DanzePrice { get; set; }

        public int? WeixiuShebeiId { get; set; }
@@ -34,6 +35,10 @@

        //是否付费  1是2否
        public int? Shifoufufei { get; set; }


        //维修审批是否通过  1批准2不批准
        public int? ApprovalStatus { get; set; }
        

        public DateTime? CreateTime { get; set; }
@@ -287,7 +292,16 @@
                this.CateName = isChange ? MyConvert.ConvertToString(value) : CateName;
                theValue = this.CateName;
            }

            else if ("ShebeiZerenrenName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
            {
                this.ShebeiZerenrenName = isChange ? MyConvert.ConvertToString(value) : ShebeiZerenrenName;
                theValue = this.ShebeiZerenrenName;
            }
            else if ("ApprovalStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
            {
                this.ApprovalStatus = isChange ? MyConvert.ConvertToInt32(value) : ApprovalStatus;
                theValue = this.ApprovalStatus;
            }
            

            return theValue;

 CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs

@@ -69,10 +69,11 @@
                            new SqlParameter("@Creator", trueModel.Creator) ,
                            new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
                            new SqlParameter("@Operator", trueModel.Operator) ,            
                            new SqlParameter("@ApprovalStatus", trueModel.ApprovalStatus.HasValue?trueModel.ApprovalStatus.Value:0) ,
                                    
                     };
            string sql = "Insert Into OA_ShebeiWeixiu ([MemberId],[ShebeiId],[WeixiuTime],[CateId],[Name],[Anzhuangdidian],[Remark],[WeixiuPrice],[Zerenren],[ZerenrenName],[DanzePrice],[WeixiuShebeiId],[FukuanShebeiId],[FukuanshenqingId],[Shifoufufei],[CreateTime],[Creator],[LastUpdateTime],[Operator])"
                                            + " Values (@MemberId,@ShebeiId,@WeixiuTime,@CateId,@Name,@Anzhuangdidian,@Remark ,@WeixiuPrice,@Zerenren,@ZerenrenName,@DanzePrice,@WeixiuShebeiId,@FukuanShebeiId,@FukuanshenqingId,@Shifoufufei,@CreateTime,@Creator,@LastUpdateTime,@Operator)";
            string sql = "Insert Into OA_ShebeiWeixiu ([MemberId],[ShebeiId],[WeixiuTime],[CateId],[Name],[Anzhuangdidian],[Remark],[WeixiuPrice],[Zerenren],[ZerenrenName],[DanzePrice],[WeixiuShebeiId],[FukuanShebeiId],[FukuanshenqingId],[Shifoufufei],[CreateTime],[Creator],[LastUpdateTime],[Operator],[ApprovalStatus])"
                                            + " Values (@MemberId,@ShebeiId,@WeixiuTime,@CateId,@Name,@Anzhuangdidian,@Remark ,@WeixiuPrice,@Zerenren,@ZerenrenName,@DanzePrice,@WeixiuShebeiId,@FukuanShebeiId,@FukuanshenqingId,@Shifoufufei,@CreateTime,@Creator,@LastUpdateTime,@Operator,@ApprovalStatus)";

            try
            {
@@ -129,8 +130,9 @@

                            new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
                            new SqlParameter("@Operator", trueModel.Operator) ,
                             new SqlParameter("@ApprovalStatus", trueModel.ApprovalStatus.HasValue?trueModel.ApprovalStatus.Value:0) ,
                     };
            string sql = "Update OA_ShebeiWeixiu Set [MemberId]=@MemberId,[ShebeiId]=@ShebeiId,[WeixiuTime]=@WeixiuTime,[CateId]=@CateId,[Name]=@Name,[Anzhuangdidian]=@Anzhuangdidian,[Remark]=@Remark,[WeixiuPrice]=@WeixiuPrice,[Zerenren]=@Zerenren,[ZerenrenName]=@ZerenrenName,[DanzePrice]=@DanzePrice, [WeixiuShebeiId]=@WeixiuShebeiId,[FukuanShebeiId]=@FukuanShebeiId,[FukuanshenqingId]=@FukuanshenqingId,[Shifoufufei]=@Shifoufufei,[LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator  where [Keyid] =@Keyid ";
            string sql = "Update OA_ShebeiWeixiu Set [MemberId]=@MemberId,[ShebeiId]=@ShebeiId,[WeixiuTime]=@WeixiuTime,[CateId]=@CateId,[Name]=@Name,[Anzhuangdidian]=@Anzhuangdidian,[Remark]=@Remark,[WeixiuPrice]=@WeixiuPrice,[Zerenren]=@Zerenren,[ZerenrenName]=@ZerenrenName,[DanzePrice]=@DanzePrice, [WeixiuShebeiId]=@WeixiuShebeiId,[FukuanShebeiId]=@FukuanShebeiId,[FukuanshenqingId]=@FukuanshenqingId,[Shifoufufei]=@Shifoufufei,[LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator,ApprovalStatus=@ApprovalStatus  where [Keyid] =@Keyid ";

            try
            {
@@ -291,7 +293,7 @@
        {
            try
            {
                string condition = " 1=1 ";
                string condition = " ApprovalStatus=1 ";

                if (_MemberId != Guid.Empty)
                    condition += " and a.MemberId = '" + _MemberId + "'";
@@ -344,7 +346,7 @@



                return _dataBase.SelectModelPage<Model.OA_ShebeiWeixiu>(pagination, " a.*,b.Name as CateName ", " OA_ShebeiWeixiu as a left join OA_ShebeiCate as b on a.CateId = b.Keyid   left join OA_ShebeiManage as c on a.ShebeiId = c.Keyid ", " a.WeixiuTime DESC", " Keyid desc ", condition);
                return _dataBase.SelectModelPage<Model.OA_ShebeiWeixiu>(pagination, " a.*,b.Name as CateName, c.ZerenrenName as ShebeiZerenrenName ", " OA_ShebeiWeixiu as a left join OA_ShebeiCate as b on a.CateId = b.Keyid   left join OA_ShebeiManage as c on a.ShebeiId = c.Keyid ", " a.WeixiuTime DESC", " Keyid desc ", condition);
            }
            catch (Exception ex)
            {

 CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs

@@ -186,11 +186,13 @@
                    oA_ShebeiWeixiu.ShebeiId = this.selShebei.Value.ToInt32();
                    oA_ShebeiWeixiu.WeixiuTime = this.txtWeixiuTime.Value.ToDateTime2();
                    var shebeiManage = oA_ShebeiManageBLL.GetModelByKeyid(oA_ShebeiWeixiu.ShebeiId);
                    var ShebeiZerenrenName = "";
                    if (shebeiManage != null)
                    {
                        oA_ShebeiWeixiu.CateId = shebeiManage.CateId;
                        oA_ShebeiWeixiu.Anzhuangdidian = shebeiManage.Anzhuangdidian;
                        oA_ShebeiWeixiu.Name = shebeiManage.Name;
                        ShebeiZerenrenName = shebeiManage.ZerenrenName;
                    }
                    oA_ShebeiWeixiu.Remark = this.txtPlanRemark.Value;
                    oA_ShebeiWeixiu.WeixiuPrice = this.txtWeixiuPrice.Value.ToDecimal2();
@@ -246,7 +248,7 @@
                        //    _SupplierName = oA_Suppliers.Name;
                        //}

                        var _SupplierName = oA_ShebeiWeixiu.Name + "维修";
                        var _SupplierName = oA_ShebeiWeixiu.Name + "(" + ShebeiZerenrenName + ")" + "维修";
                        oA_Fukuanshenqing.SupplierName = _SupplierName;
                        var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);

@@ -291,13 +293,13 @@

                    m_OA_WorkPlan.Operator = CurrentUser.ShortName;
                   
                    m_OA_WorkPlan.PlanContent = oA_ShebeiWeixiu.Name+"维修申请";
                    m_OA_WorkPlan.PlanTitle = oA_ShebeiWeixiu.Name + "(" + ShebeiZerenrenName + ")" + "维修申请";
                    m_OA_WorkPlan.PlanDataType = 18;
                    m_OA_WorkPlan.PlanMoney = this.txtWeixiuPrice.Value.ToDecimal2();
                    m_OA_WorkPlan.RewardMoney = 0;
                    m_OA_WorkPlan.PlanRemark = "";
                    m_OA_WorkPlan.PlanRunTime = DateTime.Now;
                    m_OA_WorkPlan.PlanTitle =  this.txtPlanRemark.Value+ ".维修日期:"+ this.txtWeixiuTime.Value;
                    m_OA_WorkPlan.PlanContent =  this.txtPlanRemark.Value+ ".维修日期:"+ this.txtWeixiuTime.Value;
                    m_OA_WorkPlan.PlanType = 3;
                    m_OA_WorkPlan.LastUpdateTime = nowTime;
                    var workid = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);

 CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs

@@ -144,6 +144,12 @@
                JavaScript.MessageBox("已经申请付款！", this);
                return;
            }
            var shebeiManage = oA_ShebeiManageBLL.GetModelByKeyid(oA_ShebeiWeixiu.ShebeiId);
            var ShebeiZerenrenName = "";
            if (shebeiManage != null)
            {
                ShebeiZerenrenName = shebeiManage.ZerenrenName;
            }


            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
@@ -211,7 +217,7 @@
                    //    _SupplierName = oA_Suppliers.Name;
                    //}

                    var _SupplierName = oA_ShebeiWeixiu.Name + "维修";
                    var _SupplierName = oA_ShebeiWeixiu.Name + "(" + ShebeiZerenrenName + ")" + "维修";
                    oA_Fukuanshenqing.SupplierName = _SupplierName;
                    var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);

@@ -252,13 +258,13 @@

                    m_OA_WorkPlan.Operator = CurrentUser.ShortName;
                   
                    m_OA_WorkPlan.PlanContent = oA_ShebeiWeixiu.Name+ "维修付款申请";
                    m_OA_WorkPlan.PlanTitle = oA_ShebeiWeixiu.Name + "(" + ShebeiZerenrenName + ")" + "维修付款申请";
                    m_OA_WorkPlan.PlanDataType = 19;
                    m_OA_WorkPlan.PlanMoney = this.txtWeixiuPrice.Value.ToDecimal2();
                    m_OA_WorkPlan.RewardMoney = 0;
                    m_OA_WorkPlan.PlanRemark = "";
                    m_OA_WorkPlan.PlanRunTime = DateTime.Now;
                    m_OA_WorkPlan.PlanTitle =  this.txtPlanRemark.Value+ ".维修日期:"+ this.txtWeixiuTime.Value;
                    m_OA_WorkPlan.PlanContent =  this.txtPlanRemark.Value+ ".维修日期:"+ this.txtWeixiuTime.Value;
                    m_OA_WorkPlan.PlanType = 3;
                    m_OA_WorkPlan.LastUpdateTime = nowTime;
                    var workid = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);

 CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx

@@ -183,6 +183,9 @@
                                安装地点
                            </th>
                            <th style="text-align: center">
                                设备责任人
                            </th>
                            <th style="text-align: center">
                                维护费用
                            </th>
                         
@@ -219,6 +222,9 @@
                            <%#Eval("Anzhuangdidian")%>
                        </td>
                        <td style="text-align: center"> 
                            <%#Eval("ShebeiZerenrenName")%>
                        </td>
                        <td style="text-align: center"> 
                            <%#Eval("WeixiuPrice","{0:F2}")%>
                        </td>
                       
@@ -237,7 +243,7 @@
                </ItemTemplate>
                <FooterTemplate>
                        <tr class="StatisticsMoney">
                    <td colspan="6" class="ali03">
                    <td colspan="7" class="ali03">
                        当前页统计：
                    </td>
                    <td   class="ali01">
@@ -254,7 +260,7 @@
                    </td>
                </tr>
                <tr class="StatisticsMoney">
                    <td colspan="6" class="ali03">
                    <td colspan="7" class="ali03">
                        查询项统计：
                    </td>
                    <td   class="ali01">

 CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs

@@ -196,7 +196,7 @@
                        if (oA_ShebeiWeixiu != null)
                        {
                            oA_ShebeiWeixiu.Zerenren = this.selZerenren.Value.ToInt32();
                          
                            oA_ShebeiWeixiu.ApprovalStatus = 1;
                            oA_ShebeiWeixiu.DanzePrice = this.txtDanzePrice.Value.ToDecimal2();
                            oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
                        }
@@ -210,6 +210,7 @@

                    
                }

                if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 20)
                {
                    var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);