From 7eca0ab1b6d5142d623efd471985b2a20b559616 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期一, 01 十二月 2025 10:55:02 +0800
Subject: [PATCH] 修正审批备注长度
---
cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs
index 5ccdc56..103387b 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs
@@ -2,6 +2,7 @@
using cylsg.Model.utilityViewModel;
using ECTESTOA;
using Furion.LinqBuilder;
+using Models;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -15,6 +16,7 @@
/// 鎶ラ攢涓荤鐩稿叧鎺у埗鍣�
/// </summary>
[Authorize]
+ [ApiDescriptionSettings("CYOA")]
public class CyOSBaoXiaoZHuGuanController: IDynamicApiController
{
private readonly IOAServices _OAServices;
@@ -66,8 +68,9 @@
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.ApprovalStatus == PlanStatusType.unApproval);
- //SearchList = SearchList.And(x => x.OaWorkPlanShenpis.Where(y => y.Buzhou == 1 && y.ApprovalStaffId == Permissions.MemberId).Count()<=0);
+ SearchList = SearchList.And(x => x.OaWorkPlanShenpis.Count(y => y.Buzhou == 1&& y.ApprovalStaffId != Permissions.MemberId) < 2);//鍙渶瑕佷袱涓汉瀹℃壒 鍙﹀涓や釜浜哄鎵逛簡锛屼笉鍦ㄦ樉绀�
+ //SearchList = SearchList.And(x => x.ApprovalStatus == PlanStatusType.unApproval);
+ //SearchList = SearchList.And(x => x.OaWorkPlanShenpis.Where(y => y.Buzhou == 1 && y.ApprovalStaffId == Permissions.MemberId).Count() <= 0);
//SearchList = SearchList.And(x => x.DepartId == Permissions.DepartId); 閮ㄩ棬绛涢��
if (!string.IsNullOrEmpty(param.StaffName))
{
@@ -114,7 +117,7 @@
//寮哄埗澧炲姞鍛樺伐杩囨护
var data = await _SugarClient.Queryable<OaWorkPlan>().Includes(x=>x.Depart)
- .Includes(x=>x.OaWorkPlanShenpis.Where(y=>y.ApprovalStaffId==Permissions.MemberId&&y.Buzhou==1).ToList())
+ .Includes(x=>x.OaWorkPlanShenpis.Where(y=>y.Buzhou==1).ToList())
.Where(SearchList).OrderByDescending(x => x.PlanStartTime).Mapper(
x =>
{
@@ -194,6 +197,13 @@
{
throw Oops.Oh("鎶ラ攢鍗曟湭鎻愪氦涓嶅彲瀹℃壒");
}
+ int shenpiCount = data.OaWorkPlanShenpis.Where(x => x.ApprovalStaffId != Permissions.MemberId && x.Buzhou == 1).Count();
+ if(shenpiCount >= 2)
+ {
+ //涓や釜浜哄鎵瑰悗銆備笉鍙啀瀹℃壒
+ throw Oops.Oh("宸茬粡宸茬粡缁撴潫");
+
+ }
OaWorkPlanShenpi shenpi = data.OaWorkPlanShenpis.Where(x => x.ApprovalStaffId == Permissions.MemberId&&x.Buzhou==1).FirstOrDefault();
if (shenpi!=null)
{
@@ -223,6 +233,15 @@
data.Operator = Permissions.Name;
await _SugarClient.Updateable(data).ExecuteCommandAsync();
+ //璁剧疆璁惧weixiu鐘舵�佷负鎷掔粷
+ var shenpis = await _SugarClient.Queryable<OA_ShebeiWeixiu>().Where(x => x.FukuanShebeiId == data.Keyid).FirstAsync();
+ if (shenpis != null)
+ {
+ shenpis.ApprovalStatus = (int )PlanStatusType.No;
+
+ await _SugarClient.Updateable(shenpis).ExecuteCommandAsync();
+ }
+
}
shenpi = new OaWorkPlanShenpi()
--
Gitblit v1.9.1