From e80e6869c8d5adee8b57f9c27738e7e950c59e64 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 14 十一月 2025 14:55:00 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 155 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index 9653694..d422569 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -26,6 +26,7 @@
DataSet ds;
string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
+ #region 杩斿洖鑱屽憳鍒楄〃
/// <summary>
/// 杩斿洖鑱屽憳鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -83,6 +84,68 @@
return objJsonResult;
}
}
+
+ #endregion
+
+ #region 杩斿洖鑱屽憳鍒楄〃
+ /// <summary>
+ /// 杩斿洖鑱屽憳鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Employee/listPage")]
+ [HttpGet]
+ public object lislistPaget(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn($@"exec h_p_IF_EmployeeListPage {page}, {size}, ''", "h_p_IF_StockPlaceListPage");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn($@"exec h_p_IF_EmployeeListPage {page}, {size}, '{sWhere}'", "h_p_IF_StockPlaceListPage");
+ }
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region 鑱屽憳 鏍戝舰鍥�
public class TreeModel
@@ -375,6 +438,8 @@
string msg4 = sArray[2].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
+ LogService.Write(msg2);
+ LogService.Write(msg4);
oCN.BeginTran();
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee_Edit", 1, false, msg3))
@@ -698,15 +763,101 @@
",HAddress='" + HAddress.ToString() + "'" +
",HDeptID= '" + HDeptID + "' Where HItemID=" + HItemID);
+ LogService.Write("Update Gy_Employee set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HLevel=" + HLevel +
+ ",HEmpRate=" + HEmpRate +
+ ",HExamRate=" + HExamRate +
+ ",HBasePay=" + HBasePay +
+ ",HParentID=" + HParentID +
+ ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HNoBrushFlag=" + Convert.ToString(HNoBrushFlag ? 1 : 0) +
+ ",HOverType=" + Convert.ToString(HOverType ? 1 : 0) +
+ ",HShiftFlag=" + Convert.ToString(HShiftFlag ? 1 : 0) +
+ ",HStopwagesFlag=" + Convert.ToString(HStopwagesFlag ? 1 : 0) +
+ ",HRemark='" + HRemark.ToString() + "'" +
+ ",HEmpType='" + HEmpType.ToString() + "'" +
+ ",HPayType='" + HPayType.ToString() + "'" +
+ ",HHelpCode='" + HHelpCode.ToString() + "'" +
+ ",HAge=" + HAge.ToString() +
+ ",HSalaryLev='" + HSalaryLev.ToString() + "'" +
+ ",HContractYear=" + HContractYear.ToString() +
+ ",HInsuranceStatus=" + Convert.ToString(HInsuranceStatus ? 1 : 0) +
+ ",HBirthday='" + HBirthDay.ToString() + "'" +
+ ",HGradDate='" + HGradDate.ToString() + "'" +
+ ",HInsuranceDate='" + HInsuranceDate + "'" +
+ ",HContractBDate='" + HContractBDate + "'" +
+ ",HContractEDate='" + HContractEDate + "'" +
+ ",HJobCardEDate='" + HJobCardEDate + "'" +
+ ",HCheckCardEDate='" + HCheckCardEDate + "'" +
+ ",HStayCardEDate='" + HStayCardEDate + "'" +
+ ",HHealthCardEDate='" + HHealthCardEDate + "'" +
+ ",HSex='" + HSex + "'" +
+ ",HMarr='" + HMarr + "'" +
+ ",HBlighty='" + HBlighty + "'" +
+ ",HNation='" + HNation + "'" +
+ ",HBlightyType='" + HBlightyType.ToString() + "'" +
+ ",HGovStatus='" + HGovStatus.ToString() + "'" +
+ ",HBloodType='" + HBloodType.ToString() + "'" +
+ ",HStature='" + HStature.ToString() + "'" +
+ ",HAvoird='" + HAvoird.ToString() + "'" +
+ ",HKnowLev='" + HKnowLev.ToString() + "'" +
+ ",HProTitleID='" + HProTitleID.ToString() + "'" +
+ ",HGradSchool='" + HGradSchool.ToString() + "'" +
+ ",HEngLev='" + HEngLev.ToString() + "'" +
+ ",HCompLev='" + HCompLev.ToString() + "'" +
+ ",HSpec='" + HSpec.ToString() + "'" +
+ ",HEmail='" + HEmail.ToString() + "'" +
+ ",HNowAdd='" + HNowAdd.ToString() + "'" +
+ ",HHomeAdd='" + HHomeAdd.ToString() + "'" +
+ ",HIDCard='" + HIDCard.ToString() + "'" +
+ ",HPostalCode='" + HPostalCode.ToString() + "'" +
+ ",HLinkPhone='" + HLinkPhone.ToString() + "'" +
+ ",HMobilePhone='" + HMobilePhone.ToString() + "'" +
+ ",HFax='" + HFax.ToString() + "'" +
+ ",HOldCompany='" + HOldCompany.ToString() + "'" +
+ ",HInsuranceNo='" + HInsuranceNo.ToString() + "'" +
+ ",HJobCardNo='" + HJobCardNo.ToString() + "'" +
+ ",HArchivesNo='" + HArchivesNo.ToString() + "'" +
+ ",HDimissionReason='" + HDimissionReason.ToString() + "'" +
+ ",HDimissionDate='" + HDimissionDate.ToString() + "'" +
+ ",HRelDate='" + HRelDate.ToString() + "'" +
+ ",HInComDate='" + HInComDate.ToString() + "'" +
+ ",HPostID =" + HPostID.ToString() +
+ ",HDutyID =" + HDutyID.ToString() +
+ ",HDormID =" + HDormID.ToString() +
+ ",HBank='" + HBank.ToString() + "'" +
+ ",HBankAccount='" + HBankAccount.ToString() + "'" +
+ ",HGroupID='" + HGroupID.ToString() + "'" +
+ ",HInsurance=" + HInsurance.ToString() + "" +
+ ",HInsuranceSubsidy=" + HInsuranceSubsidy.ToString() + "" +
+ ",HOtherDeduct3=" + HOtherDeduct3.ToString() + "" +
+ ",HMedicare=" + HMedicare.ToString() + "" +
+ ",HDrydock=" + HDrydock.ToString() + "" +
+ ",HWorkType='" + HWorkType.ToString() + "'" +
+ ",HWorkTypeID='" + HWorkTypeID.ToString() + "'" +
+ ",HHighestPay=" + HHighestPay.ToString() + "" +
+ ",HOverPayRate=" + HOverPayRate.ToString() + "" +
+ ",HLeftMoneyRate=" + HLeftMoneyRate.ToString() + "" +
+ ",HCTPrjID='" + HCTPrjID.ToString() + "'" +
+ ",HExamLevPostMoney=" + HExamLevPostMoney.ToString() +
+ ",HBSTDeptID='" + HBSTDeptID.ToString() + "'" +
+
+ ",HAddress='" + HAddress.ToString() + "'" +
+ ",HDeptID= '" + HDeptID + "' Where HItemID=" + HItemID);
+
oCN.RunProcReturn("delete from Gy_Employee_Post where HEmpID = " + HItemID, "Gy_Employee_Post");
string sql3 = "";
foreach (ClsGy_EmployeeSub listOne in list1)
{
sql3 += "insert into Gy_Employee_Post(HEmpID, HPostID, HRemark) Values("
- + HItemID + "," + listOne.HPostID + ",N'" + listOne.HRemark + "');";
+ + HItemID + ",N'" + listOne.HPostID + "',N'" + listOne.HRemark + "');";
+ LogService.Write(sql3);
}
- LogService.Write(sql3);
oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");
}
@@ -1331,7 +1482,7 @@
string sql = string.Empty;
//淇濆瓨
oCN.BeginTran();
- sql = $"delete Gy_Employee where HItemID = {lsmain[0].HItemID}";
+ sql = $"delete Gy_Employee where HItemID = {lsmain[0].HItemID}";
oCN.RunProc(sql);
sql = "set identity_insert Gy_Employee on";
oCN.RunProc(sql);
@@ -1353,7 +1504,7 @@
,HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID
,HOtherDeduct3,HInsurance,HMedicare,HDrydock
,HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress)
- values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}',{lsmain[0].HEmpRate},{lsmain[0].HExamRate},{lsmain[0].HLevel},{lsmain[0].HParentID},{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{lsmain[0].HHighestPay},{lsmain[0].HOverPayRate},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}','{lsmain[0].HHelpCode}',{lsmain[0].HInsuranceSubsidy},'{lsmain[0].HBirthDay}','{lsmain[0].HGradDate}','{lsmain[0].HInsuranceDate}','{lsmain[0].HContractBDate}','{lsmain[0].HContractEDate}','{lsmain[0].HJobCardEDate}','{lsmain[0].HCheckCardEDate}','{lsmain[0].HStayCardEDate}','{lsmain[0].HHealthCardEDate}',{lsmain[0].HAge},'{lsmain[0].HSalaryLev}',{lsmain[0].HContractYear},{lsmain[0].HInsuranceStatus},{lsmain[0].HSignStatus},'{lsmain[0].HSex}','{lsmain[0].HMarr}','{lsmain[0].HBlighty}','{lsmain[0].HNation}','{lsmain[0].HBlightyType}','{lsmain[0].HGovStatus}','{lsmain[0].HBloodType}','{lsmain[0].HStature}','{lsmain[0].HAvoird}','{lsmain[0].HKnowLev}','{lsmain[0].HProTitleID}','{lsmain[0].HGradSchool}','{lsmain[0].HEngLev}','{lsmain[0].HCompLev}','{lsmain[0].HSpec}','{lsmain[0].HEmail}','{lsmain[0].HNowAdd}','{lsmain[0].HHomeAdd}','{lsmain[0].HIDCard}','{lsmain[0].HLinkPhone}','{lsmain[0].HMobilePhone}','{lsmain[0].HFax}','{lsmain[0].HOldCompany}','{lsmain[0].HInsuranceNo}','{lsmain[0].HJobCardNo}','{lsmain[0].HArchivesNo}','{lsmain[0].HWorkType}','{lsmain[0].HDimissionReason}','{lsmain[0].HDimissionDate}','{lsmain[0].HInComDate}','{lsmain[0].HSignDate}','{lsmain[0].HRelDate}',{lsmain[0].HPostID},{lsmain[0].HDormID},{lsmain[0].HDutyID},{lsmain[0].HLeftMoneyRate},'{lsmain[0].HEmpType}','{lsmain[0].HPayType}','{lsmain[0].HOverType}',{lsmain[0].HNoBrushFlag},{lsmain[0].HShiftFlag},{lsmain[0].HStopwagesFlag},'{lsmain[0].HPostalCode}','{lsmain[0].HBank}',{lsmain[0].HBasePay},{lsmain[0].HExamLevPostMoney},{lsmain[0].HBSTDeptID},{lsmain[0].HOtherDeduct3},{lsmain[0].HInsurance},{lsmain[0].HMedicare},{lsmain[0].HDrydock},'{lsmain[0].HBankAccount}',{lsmain[0].HGroupID},{lsmain[0].HDeptID},{lsmain[0].HWorkTypeID},{lsmain[0].HCTPrjID},{lsmain[0].HUSEORGID},'{lsmain[0].HAddress}')", ref DBUtility.ClsPub.sExeReturnInfo);
+ values('{lsmain[0].HItemID}','{lsmain[0].HNumber}','{lsmain[0].HName}','{lsmain[0].HShortNumber}','{lsmain[0].HEmpRate}','{lsmain[0].HExamRate}','{lsmain[0].HLevel}','{lsmain[0].HParentID}','{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)}','{lsmain[0].HHighestPay}','{lsmain[0].HOverPayRate}','{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) }','{lsmain[0].HRemark}','{lsmain[0].HHelpCode}','{lsmain[0].HInsuranceSubsidy}','{lsmain[0].HBirthDay}','{lsmain[0].HGradDate}','{lsmain[0].HInsuranceDate}','{lsmain[0].HContractBDate}','{lsmain[0].HContractEDate}','{lsmain[0].HJobCardEDate}','{lsmain[0].HCheckCardEDate}','{lsmain[0].HStayCardEDate}','{lsmain[0].HHealthCardEDate}','{lsmain[0].HAge}','{lsmain[0].HSalaryLev}','{lsmain[0].HContractYear}','{lsmain[0].HInsuranceStatus}','{lsmain[0].HSignStatus}','{lsmain[0].HSex}','{lsmain[0].HMarr}','{lsmain[0].HBlighty}','{lsmain[0].HNation}','{lsmain[0].HBlightyType}','{lsmain[0].HGovStatus}','{lsmain[0].HBloodType}','{lsmain[0].HStature}','{lsmain[0].HAvoird}','{lsmain[0].HKnowLev}','{lsmain[0].HProTitleID}','{lsmain[0].HGradSchool}','{lsmain[0].HEngLev}','{lsmain[0].HCompLev}','{lsmain[0].HSpec}','{lsmain[0].HEmail}','{lsmain[0].HNowAdd}','{lsmain[0].HHomeAdd}','{lsmain[0].HIDCard}','{lsmain[0].HLinkPhone}','{lsmain[0].HMobilePhone}','{lsmain[0].HFax}','{lsmain[0].HOldCompany}','{lsmain[0].HInsuranceNo}','{lsmain[0].HJobCardNo}','{lsmain[0].HArchivesNo}','{lsmain[0].HWorkType}','{lsmain[0].HDimissionReason}','{lsmain[0].HDimissionDate}','{lsmain[0].HInComDate}','{lsmain[0].HSignDate}','{lsmain[0].HRelDate}','{lsmain[0].HPostID}','{lsmain[0].HDormID}','{lsmain[0].HDutyID}','{lsmain[0].HLeftMoneyRate}','{lsmain[0].HEmpType}','{lsmain[0].HPayType}','{lsmain[0].HOverType}','{lsmain[0].HNoBrushFlag}','{lsmain[0].HShiftFlag}','{lsmain[0].HStopwagesFlag}','{lsmain[0].HPostalCode}','{lsmain[0].HBank}','{lsmain[0].HBasePay}','{lsmain[0].HExamLevPostMoney}','{lsmain[0].HBSTDeptID}','{lsmain[0].HOtherDeduct3}','{lsmain[0].HInsurance}','{lsmain[0].HMedicare}','{lsmain[0].HDrydock}','{lsmain[0].HBankAccount}','{lsmain[0].HGroupID}','{lsmain[0].HDeptID}','{lsmain[0].HWorkTypeID}','{lsmain[0].HCTPrjID}','{lsmain[0].HUSEORGID}','{lsmain[0].HAddress}')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
sql = "set identity_insert Gy_Employee off";
oCN.RunProc(sql);
--
Gitblit v1.9.1