Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2023-06-29 efa57c53b1b4c94e188a52f5a35d0a4ca8a82cb5

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_WorkTimesBillController.cs

@@ -44,6 +44,7 @@
                    return objJsonResult;
                }
                ds = Sc_GetWorkTimesBill(sWhere);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -106,7 +107,8 @@
                    ",审核日期,修改人,修改日期,关闭人, å…³é—­æ—¥æœŸ,HEmpID" +
                    ",HEmpNumber,HEmpName,职员系数 HEmpRate,基本天数 HBaseDays,基本工时 HBaseTimes,加班工时 HOverTimes,请假工时 HLeaveTimes,加班天数 HOverDays,请假天数 HLeaveDays,迟到次数 HLateQty" +
                    ",公出 HOutForComQty,私出 HOutForEmpQty,公出时间 HOutForComTimes,私出时间 HOutForEmpTimes,迟到时间 HLateTimes,早退次数 HEarlyQty,早退时间 HEarlyTimes" +
                    ",旷工天数 HAbsentDays,上午 HAMTimes,下午 HPMTimes, è¡¨ä½“备注 HRemark,HRestFlag,HSchClassID FROM h_v_Pay_WorkTimesBillList where 1 = 1 ";
                    ",旷工天数 HAbsentDays,上午 HAMTimes,下午 HPMTimes,HCTPrjID,HCTPrjNumber,HCTPrjName,HWorkTypeID,HWorkTypeNumber,HWorkTypeName,HPayMoney,HMoney" +
                    ",表体备注 HRemark,HRestFlag,HSchClassID FROM h_v_Pay_WorkTimesBillList where 1 = 1 ";
                string sql = sql1 + sqlWhere;
                ds = oCN.RunProcReturn(sql, "h_v_Pay_WorkTimesBillList");
                objJsonResult.code = "0";
@@ -124,6 +126,7 @@
            return objJsonResult;
        }
        #endregion

        /// <summary>
        /// æ–°å¢žå•æ®-保存按钮
        ///参数：string sql。
@@ -325,6 +328,73 @@
                return objJsonResult;
            }
        }
        //
        /// <summary>
        /// é€šè¿‡ç­ç»„查询职员信息
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Pay_WorkTimesBill/GetEmployeeByHGroup")]
        [HttpGet]
        public object GetEmployeeByHGroup(int HGroupID)
        {
            if (HGroupID <= 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "班组未选择";
                objJsonResult.data = null;
                return objJsonResult;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                List<object> list = new List<object>();
                DataSet ds1;
                string sql1 = string.Format(@"select a.HItemID HEmpID,a.HNumber HEmpNumber,a.HName HEmpName,a.HEmpRate HEmpRate,a.HCTPrjID,b.HName HCTPrjName from Gy_Employee a
                                            left join Gy_ClassTimePrjGroup b on a.HCTPrjID=b.HItemID
                                            where a.HGroupID=" + HGroupID);
                ds1 = oCN.RunProcReturn(sql1, "Gy_Employee");
                list.Add(ds1.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        
        [Route("Pay_WorkTimesBill/calcAvgMoney")]
        [HttpPost]
        public object GetEmployeeByHGroup([FromBody] JObject msg) {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                List<object> list = new List<object>();
                DataSet ds;
                string sql = string.Format($"exec h_p_CalcAvgMoney '{msg["msg"]}'");
                ds = oCN.RunProcReturn(sql, "h_p_CalcAvgMoney");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
    }
}