From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index de3dbfc..2040acd 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1346,7 +1346,7 @@
return View();
}
[CheckLogin]
- public IActionResult chedantuihuan(string Chedanid, decimal Price=0)
+ public IActionResult chedantuihuan(string Chedanid, decimal Price=0,string Chedanyuany="")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -1413,12 +1413,13 @@
dto.ChedanStatus = "A";
dto.Chedan = Price;
dto.ShouliStatus = "0";
-
+ if (!string.IsNullOrWhiteSpace(Chedanyuany))
+ dto.Remark += " " + Chedanyuany;
resultEntity = _cooperOrderService.chedan(dto);
var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("璁㈠崟鏀舵"+dto.OrderNo, dto.OrderNo);
- if (fiAccountRecordDTOs!= null && fiAccountRecordDTOs.Count > 0)
+ if ( Price>0 && fiAccountRecordDTOs != null && fiAccountRecordDTOs.Count > 0)
{
var sysCodeDtls = _liaotianService.GetSYScode("CooperVisit", "jtype");
//foreach (var fiAccountRecordDTO in fiAccountRecordDTOs)
--
Gitblit v1.9.1