提交

username@email.com

2024-10-14 571ccea5b3dc11ca107aac9ce88e46e2b2b809c2

提交

 cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs

@@ -625,6 +625,11 @@
        public string IsShenPiName { get; set; }

        /// <summary>
        /// 审批时间
        /// </summary>
        public DateTime? ShenPitime { get; set; }

        /// <summary>
        /// 打卡明细
        /// </summary>
        public string DakaMingxi { get; set; }
@@ -698,6 +703,11 @@
        /// </summary>
        public int? IsShenPi { get; set; }

        /// <summary>
        /// 审批时间
        /// </summary>
        public DateTime? ShenPitime { get; set; }


        /// <summary>
        /// 审批状态名称

 cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs

@@ -565,6 +565,7 @@
                          WorkPrice = a.WorkPrice,
                          TodaySalary = c.TodaySalary,
                          IsShenPi = c.IsShenPi,
                          ShenPitime = c.ShenPitime,
                          WorkCount = c.WorkCount,
                          WorkerUserId = b.WorkerUserId,
                          WorkerUserName = d.name,

 cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs

@@ -812,6 +812,7 @@
            orderDakaMingxiDto.WorkPrice = order.WorkPrice;
            orderDakaMingxiDto.TodaySalary = orderBiddingDetail.TodaySalary;
            orderDakaMingxiDto.IsShenPi = orderBiddingDetail.IsShenPi;
            orderDakaMingxiDto.ShenPitime = orderBiddingDetail.ShenPitime;
            orderDakaMingxiDto.WorkCount = orderBiddingDetail.WorkCount;
            orderDakaMingxiDto.WorkerUserId = orderBidding.WorkerUserId;
            var user = await userRes.GetByIdAsync(orderDakaMingxiDto.WorkerUserId);