From f4a0b32daa9e021227707bcfb70b67738bd1b000 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期五, 24 一月 2025 17:28:13 +0800
Subject: [PATCH] 修改报销部分逻辑
---
cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs
index c4aa2a1..a8e452b 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs
@@ -1,5 +1,6 @@
锘縰sing cylsg.Model.ECTEModel;
using cylsg.Model.utilityViewModel;
+using cylsg.utility.Extend;
using ECTESTOA;
using Furion.LinqBuilder;
using Models;
@@ -42,6 +43,7 @@
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);
@@ -135,6 +137,10 @@
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
@@ -168,6 +174,17 @@
};
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;
--
Gitblit v1.9.1