From 479b6cfc60113f692f6f9146bcd7b9231a32b0e8 Mon Sep 17 00:00:00 2001 From: 移动系统liao <liaoxujun@qq.com> Date: 星期六, 08 二月 2025 09:07:57 +0800 Subject: [PATCH] Merge branch 'cyronghe' --- cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 231 insertions(+), 0 deletions(-) diff --git a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs new file mode 100644 index 0000000..a8e452b --- /dev/null +++ b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs @@ -0,0 +1,231 @@ +锘縰sing cylsg.Model.ECTEModel; +using cylsg.Model.utilityViewModel; +using cylsg.utility.Extend; +using ECTESTOA; +using Furion.LinqBuilder; +using Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace cylsg.Application.CyOS +{ + /// <summary> + /// 宸濆嵃鎶ラ攢缁忕悊API + /// </summary> + [Authorize] + public class CyOSBaoXiaoJingLiController: IDynamicApiController + { + private readonly IOAServices _OAServices; + private readonly ISqlSugarClient _SugarClient; + private ECTESTOAPermissions Permissions; + public CyOSBaoXiaoJingLiController(IOAServices oaservices, ISqlSugarClient sugarClient) + { + _OAServices = oaservices; + _SugarClient = sugarClient.AsTenant().GetConnection("ECTESTOADB"); + } + + + /// <summary> + /// 鏌ヨ + /// </summary> + [HttpPost] + public async Task<WorekPlandto> getplanelist(SearchOaWorekPlan param) + { + if (!await CheckRols()) + { + throw Oops.Oh("娌℃湁鏉冮檺"); + } + + Expression<Func<OaWorkPlan, bool>> SearchList = (x) => true; + + //宸濆嵃宸ヤ綔鍗� + SearchList = SearchList.And(x => x.ApprovalStatus != PlanStatusType.Uncommitted); + SearchList = SearchList.And(x => x.MemberId == _OAServices.firmId); + SearchList = SearchList.And(x => x.PlanType == 3); + SearchList = SearchList.And(x => x.PlanDataType == 17); + //蹇呴』鏈変袱涓汉瀹℃壒杩囦簡 + SearchList = SearchList.And(x => x.OaWorkPlanShenpis.Count(y=>y.Buzhou==1)>1||(x.ApprovalStatus!= PlanStatusType.unApproval)); + if (!string.IsNullOrEmpty(param.StaffName)) + { + SearchList = SearchList.And(x => x.SentStaff.Name.Contains(param.StaffName)); + } + if (param.StaffMemberIdId != null) + { + SearchList = SearchList.And(x => x.MemberId == param.StaffMemberIdId); + } + if (param.PlanDataType > 0) + { + SearchList = SearchList.And(x => x.PlanDataType == param.PlanDataType); + } + if (param.PlanStartTimeStart != null) + { + SearchList = SearchList.And(x => x.PlanStartTime >param.PlanStartTimeStart); + } + if (param.PlanStartTimeEnd != null) + { + SearchList = SearchList.And(x => x.PlanStartTime <= param.PlanStartTimeEnd.Value.AddDays(1)); + } + //瀹℃壒鐘舵�� + if (param.ApprovalStatus != null) + { + + SearchList = SearchList.And(x => x.ApprovalStatus == param.ApprovalStatus); + + + } + + //鎶ラ攢鐘舵�� + if (param.EvaluationStatus != null) + { + SearchList = SearchList.And(x => x.EvaluationStatus == param.EvaluationStatus); + } + //寮哄埗澧炲姞鍛樺伐杩囨护 + RefAsync<int> totle = 0; + var data = await _SugarClient.Queryable<OaWorkPlan>().Includes(x => x.OaWorkPlanShenpis.Where(y=>y.Buzhou==1).ToList()).Includes(x => x.Depart) + .Where(SearchList).OrderByDescending(x => x.PlanStartTime).ToPageListAsync(param.page.PageIndex, param.page.PageSize, totle); + + + var sum = await _SugarClient.Queryable<OaWorkPlan>() + .Where(SearchList).SumAsync(x=>x.PlanMoney); + param.page.TotalCount = totle; + return new WorekPlandto + + { + list = data, + page = param.page, + TotalMoney = sum ?? 0 + }; + + + } + + /// <summary> + /// 鑾峰彇鎶ラ攢鍗曡鎯� + /// </summary> + /// <param name="id"></param> + /// <returns></returns> + [HttpGet] + public async Task<OaWorkPlan> GetPlanInfo(int id) + { + if (!await CheckRols()) + { + throw Oops.Oh("娌℃湁鏉冮檺"); + } + return await _SugarClient.Queryable<OaWorkPlan>().Includes(x=>x.OaWorkPlanShenpis,y=>y.ApprovalStaff).Includes(x=>x.SentStaff).Includes(x=>x.Depart).Includes(x=>x.WorkPlanAttachments).Where(x => x.Keyid == id).FirstAsync(); + } + + /// <summary> + /// 瀹℃壒鏉冮檺 + /// </summary> + /// <returns></returns> + [HttpPost] + public async Task<bool> BaoxiaoPlan(OaWorkPlanShenpi param) + { + if (param.ApprovalStatus == PlanStatusType.unApproval) + throw Oops.Oh("涓嶅彲璁剧疆涓烘湭瀹℃壒鐘舵��"); + + if (!await CheckRols()) + { + throw Oops.Oh("娌℃湁鏉冮檺"); + } + var data = await _SugarClient.Queryable<OaWorkPlan>().Includes(x => x.OaWorkPlanShenpis).Where(x => x.Keyid == param.OA_WorkPlanId).FirstAsync(); + if (data == null) + throw Oops.Oh("娌℃湁鎵惧埌鎶ラ攢鍗�"); + if ( data.ApprovalStatus != PlanStatusType.unApproval) + throw Oops.Oh("鎶ラ攢鍗曞凡缁忔壒澶嶅畬姣�"); + if (data.ApprovalStatus == PlanStatusType.Uncommitted) + { + throw Oops.Oh("鎶ラ攢鍗曟湭鎻愪氦涓嶅彲瀹℃壒"); + } + OaWorkPlanShenpi shenpi = data.OaWorkPlanShenpis.Where(x => x.ApprovalStaffId == Permissions.MemberId&&x.Buzhou==2).FirstOrDefault(); + await _SugarClient.AsTenant().BeginTranAsync(); + try + { + if (shenpi != null) + { + //宸茬粡鎵瑰 + throw Oops.Oh("鎶ラ攢鍗曞凡缁忔壒澶嶅畬姣� 涓嶅彲鏇存敼"); + //shenpi.ApprovalStatus = param.ApprovalStatus; + //shenpi.Buzhou = 2; + //shenpi.ApprovalTime = DateTime.Now; + //shenpi.ApprovalContent = param.ApprovalContent; + + //await _SugarClient.Updateable(shenpi).ExecuteCommandAsync(); + + } + else + { + shenpi = new OaWorkPlanShenpi() + { + ApprovalStaffId = Permissions.MemberId, + ApprovalContent = param.ApprovalContent, + ApprovalStatus = param.ApprovalStatus, + ApprovalTime = DateTime.Now, + ///鎬荤粡鐞嗗鎵逛负2 + Buzhou = 2, + CreateTime = DateTime.Now, + Operator = Permissions.Name, + OA_WorkPlanId = param.OA_WorkPlanId, + + }; + await _SugarClient.Insertable(shenpi).ExecuteCommandAsync(); + } + if(!(param.RewardResult?.isPureNum()==true)) + { + throw Oops.Oh("绉戠洰閫夋嫨閿欒"); + } + //瀹℃壒鏃跺彲淇敼鍐呭 + data.RewardResult = param.RewardResult; + data.PlanContent = param.PlanContent; + if(param.PlanMoney>0&¶m.PlanMoney<=data.PlanMoney) + data.PlanMoney = param.PlanMoney; + + + + data.ApprovalTime = DateTime.Now; + data.ApprovalStatus = param.ApprovalStatus; + data.ApprovalContent = param.ApprovalContent; + data.LastUpdateTime = DateTime.Now; + + + + + await _SugarClient.Updateable(data).ExecuteCommandAsync(); + await _SugarClient.AsTenant().CommitTranAsync(); + return true; + } + catch (Exception e) + { + + await _SugarClient.AsTenant().RollbackTranAsync(); + throw; + } + + } + + /// <summary> + /// 鍒ゆ柇鏄惁鍏锋湁鏉冮檺 + /// </summary> + /// <returns></returns> + private async Task<bool> CheckRols() + { + var pr = await _OAServices.GetOAPermissions(); + Permissions = pr; + if (pr != null && pr.MemberId != null) + { + + if (pr.BF_Isbaoxiaojingli) + return true; + else return false; + + } + else + return false; + } + } +} + -- Gitblit v1.9.1