username@email.com
2026-02-12 b5a024eee5ec82287097a2b310cacd8a357835ed
20260211 问题反馈里的追责金额,统计到人事管理的奖励惩罚里边
4个文件已修改
56 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
@@ -32,6 +32,15 @@
        /// </summary>    
        public int? Shifoushensu { get; set; }
        /// <summary>
        /// 来源类型   0 工作workplan  1  问题反馈
        /// </summary>
        public int? LaiyuanType { get; set; }
        public Guid? WentiId { get; set; }
        public string ShifoushensuName
        {
            get
@@ -382,6 +391,17 @@
                this.Shifoushensu = isChange ? MyConvert.ConvertToInt32(value) : Shifoushensu;
                theValue = this.Shifoushensu;
            }
            else if ("LaiyuanType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
            {
                this.LaiyuanType = isChange ? MyConvert.ConvertToInt32(value) : LaiyuanType;
                theValue = this.LaiyuanType;
            }
            else if ("WentiId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
            {
                this.WentiId = isChange ? MyConvert.ConvertToGuid(value) : WentiId;
                theValue = this.WentiId;
            }
            return theValue;
        }
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
@@ -47,7 +47,9 @@
                new SqlParameter("@RecMoney", trueModel.RecMoney) ,            
                new SqlParameter("@PlanId", trueModel.PlanId) ,            
                new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
                new SqlParameter("@Operator", trueModel.Operator)
                new SqlParameter("@Operator", trueModel.Operator),
                new SqlParameter("@LaiyuanType", trueModel.LaiyuanType.HasValue?trueModel.LaiyuanType.Value:0) ,
                new SqlParameter("@WentiId", trueModel.WentiId.HasValue?trueModel.WentiId.Value:Guid.Empty) ,
            };
            try
            {
@@ -84,7 +86,9 @@
                new SqlParameter("@RecMoney", trueModel.RecMoney) ,            
                new SqlParameter("@PlanId", trueModel.PlanId) ,            
                new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
                new SqlParameter("@Operator", trueModel.Operator)
                new SqlParameter("@Operator", trueModel.Operator),
               new SqlParameter("@LaiyuanType", trueModel.LaiyuanType.HasValue?trueModel.LaiyuanType.Value:0) ,
               new SqlParameter("@WentiId", trueModel.WentiId.HasValue?trueModel.WentiId.Value:Guid.Empty) ,
            };
            try
            {
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.cs
@@ -35,6 +35,7 @@
        OA_CarManageBll _OA_CarManageBll = null;
        OA_DeliverPlanPaicheBLL oA_DeliverPlanBLL = null;
        OA_StaffBLL _OA_StaffBLL = null;
        OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
        //初始化
        public DeliverPlanWentiEdit()
@@ -44,6 +45,7 @@
            _OA_CarManageBll = new OA_CarManageBll();
            oA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
            _OA_StaffBLL = new OA_StaffBLL();
            bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
        }
@@ -108,6 +110,30 @@
                oA_DeliverPlan.WanjieTime = DateTime.Now;
                if (oA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan))
                {
                    if (oA_DeliverPlan.Zerenren.HasValue && oA_DeliverPlan.Fakuan.HasValue && oA_DeliverPlan.Fakuan.Value > 0)
                    {
                        DateTime nowTime = DateTime.Now;
                        OA_WageAwardPunish m_OA_WageAwardPunish = new OA_WageAwardPunish();
                        m_OA_WageAwardPunish.FirmId = CurrentUser.MemberId;
                        m_OA_WageAwardPunish.RecTitle = "问题反馈追责";
                        m_OA_WageAwardPunish.RecTime = nowTime;
                        m_OA_WageAwardPunish.RecType = 2;
                        m_OA_WageAwardPunish.RecContent = oA_DeliverPlan.wentifankui;
                        m_OA_WageAwardPunish.RecMoney = oA_DeliverPlan.Fakuan;
                        m_OA_WageAwardPunish.PlanId = 0;
                        m_OA_WageAwardPunish.WentiId = oA_DeliverPlan.Keyid;
                        m_OA_WageAwardPunish.LastUpdateTime = nowTime;
                        m_OA_WageAwardPunish.Operator = CurrentUser.ShortName;
                        var oA_Staff = _OA_StaffBLL.GetModelByKeyid(oA_DeliverPlan.Zerenren);
                        if (oA_Staff != null)
                        {
                            m_OA_WageAwardPunish.MemberId = oA_Staff.MemberId;
                        }
                        var sss = bll_OA_WageAwardPunishBLL.InsertModel(m_OA_WageAwardPunish);
                    }
                    JavaScript.MessageBox("操作成功", this, true, true);
                    return;
                }
CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx
@@ -101,7 +101,7 @@
                            <%#Eval("RecMoney", "{0:F2}")%>
                        </td>
                        <td class="Operate " style="text-align: center">
                            <span class="<%#Eval("PlanId").ToString()=="0"?"NoPlan":""%>" menu_member_case_id="case_PlanView" menu_member_case_name="工作查看" onclick="onView('<%#Eval("PlanId")%>')">工作查看</span>
                            <span class="<%#Eval("PlanId").ToString()=="0"||Eval("LaiyuanType").ToString()!="0"?"NoPlan":""%>" menu_member_case_id="case_PlanView" menu_member_case_name="工作查看" onclick="onView('<%#Eval("PlanId")%>')">工作查看</span>
                            <span class="<%#Eval("Shifoushensu").ToString()!="0"?"":""%>" menu_member_case_id="case_shensu" menu_member_case_name="申诉" onclick="<%#Eval("Shifoushensu").ToString()=="0"?"shensu('"+Eval("Keyid")+"')":"#"%>"><%#Eval("ShifoushensuName")%></span>