From 595df5dac0a782bfdadab766b4dd62d326b0a383 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期二, 21 十月 2025 14:53:04 +0800
Subject: [PATCH] 增加川印设备维修回写
---
cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs
index 39e60fe..33c4b21 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;
@@ -25,8 +27,29 @@
_OAServices = oaservices;
_SugarClient = sugarClient.AsTenant().GetConnection("ECTESTOADB");
}
+ /// <summary>
+ /// 鏌ヨ
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task<List<OaWorkPlan>> gettest()
+ {
+ var datal = await _SugarClient.Queryable<OaWorkPlan>().Where(x=>x.PlanType==3&&x.PlanDataType==17)
+ .Select(x => new OaWorkPlan
+ {
+ OaWorkPlanShenpi = SqlFunc.Subqueryable<OaWorkPlanShenpi>().Where(y => y.OA_WorkPlanId == x.Keyid).First()
+ }, true).MergeTable()
+ .OrderBy(z => z.OaWorkPlanShenpi.ApprovalTime).ToListAsync();
+ return datal;
+ var data2 = await _SugarClient.Queryable<OaWorkPlan>()
+ .Select(x => new OaWorkPlan
+ {
+ SentStaff = SqlFunc.Subqueryable<OaStaff>().Where(y => y.MemberId == x.SentStaffId).First()
+ }, true).MergeTable()
+ .OrderBy(y => y.SentStaff.MemberId).ToListAsync();
-
+ }
/// <summary>
/// 鏌ヨ
/// </summary>
@@ -91,7 +114,7 @@
RefAsync<int> totle = 0;
//寮哄埗澧炲姞鍛樺伐杩囨护
-
+
var data = await _SugarClient.Queryable<OaWorkPlan>().Includes(x=>x.Depart)
.Includes(x=>x.OaWorkPlanShenpis.Where(y=>y.ApprovalStaffId==Permissions.MemberId&&y.Buzhou==1).ToList())
.Where(SearchList).OrderByDescending(x => x.PlanStartTime).Mapper(
@@ -202,6 +225,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