From 67f9b4a4be4187c018137b95b52377870b9bf1ae Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期四, 22 四月 2021 20:03:39 +0800
Subject: [PATCH] 关闭和反关闭以及审核和反审核条件限制修改
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index b881e7e..719e7aa 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -783,7 +783,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string UserName;
ListModels oListModels = new ListModels();
try
{
@@ -794,8 +794,8 @@
lsmain = oListModels.getObjectByJson_Reportlist(msg2);
foreach (Model.ClsSc_ProcessReportMain oItem in lsmain)
{
- //oItem.HMaker = "";
- //UserName = oItem.HMaker;
+ UserName = oItem.HMaker;
+ oItem.HMaker = UserName;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
@@ -1166,8 +1166,18 @@
public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName)
{
DataSet ds;
+ string ModRightNameCheck = "Sc_ProcessReport_check";
try
{
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (HInterID <= 0)
{
@@ -1187,9 +1197,19 @@
objJsonResult.data = null;
return objJsonResult; ;
}
+ var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();
+ var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString();
+
if (IsClose == 0)
{
-
+ if (HCloseMan.Trim() != "" || HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿叧闂紒锛侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='" + CurUserName + "' ,HCloseDate=GETDATE() where HInterID=" + HInterID);
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -1199,6 +1219,14 @@
}
else if(IsClose==1)
{
+ if (HCloseMan.Trim() == "" || HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佹湭鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁告挙閿�鍏抽棴锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='' ,HCloseDate=null where HInterID=" + HInterID);
objJsonResult.code = "0";
@@ -1240,8 +1268,19 @@
public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
{
DataSet ds;
+ string ModRightNameCheck = "Sc_ProcessReport_check";
+ var a = DBUtility.ClsPub.CurUserName;
try
{
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (HInterID <= 0)
{
@@ -1251,7 +1290,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -1259,27 +1297,46 @@
objJsonResult.count = 0;
objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞鏍革紒";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
+ var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//鍙栧鏍镐汉
+ var HMaker=ds.Tables[0].Rows[0]["HMaker"].ToString();//鍙栧埗鍗曚汉
+ var HCloseMan=ds.Tables[0].Rows[0]["HCloseMan"].ToString();//鍙栧叧闂汉
if (IsAudit == 0)
{
+ if (HChecker.Trim() != "" || HChecker.Trim() == HMaker || HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笉鍏佽瀹℃牳锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("update Sc_ProcessReportMain set HChecker='" + CurUserName + "' ,HCheckDate=GETDATE() where HInterID=" + HInterID);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "* 鍗曟嵁瀹℃牳鎴愬姛锛�";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
else if (IsAudit == 1)
{
+ if (HChecker.Trim() == "" || HChecker.Trim() == CurUserName || HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿弽瀹℃牳锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("update Sc_ProcessReportMain set HChecker='' ,HCheckDate=null where HInterID=" + HInterID);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "* 鍗曟嵁鍙嶅鏍告垚鍔燂紒";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
else
{
@@ -1287,7 +1344,7 @@
objJsonResult.count = 0;
objJsonResult.Message = "鍗曟嵁鏃犳硶瀹℃牳锛�";
objJsonResult.data = null;
- return objJsonResult; ;
+ return objJsonResult;
}
--
Gitblit v1.9.1