From a825c44ff42da28c26c26a17b65dba6c1c896262 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 16 十一月 2022 17:03:15 +0800
Subject: [PATCH] 完善修复基础资料列表增删改查功能（物料，仓库，职员，部门，组织，计量单位）
---
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 677 +++++++++++++++++++++++++++++++------------------------
1 files changed, 382 insertions(+), 295 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index 0dca6d2..f993172 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -27,36 +28,45 @@
/// </summary>
[Route("Gy_Employee/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user,string Organization)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_EmployeeList where 绂佺敤鏍囪='' ", "h_v_IF_EmployeeList");
- }
- else
- {
- string sql1 = "select * from h_v_IF_EmployeeList where 绂佺敤鏍囪='' ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
+ string sql1 = string.Format(@"select * from h_v_IF_EmployeeList where 缁勭粐鍚嶇О='" + Organization + "'");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by 鑱屽憳浠ｇ爜", "h_v_IF_EmployeeList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = sql1 + sWhere + " order by 鑱屽憳浠ｇ爜";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
}
+
+ //娣诲姞鍒楀悕
+ 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 = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
}
catch (Exception e)
{
@@ -68,191 +78,191 @@
}
}
- /// <summary>
- /// 鏂板鑱屽憳-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_Employee/AddNew")]
- [HttpPost]
- public object AddNew([FromBody] JObject oMain)
- {
- try
- {
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- //鍙嶅簭鍒楀寲
- msg1 = "[" + msg1.ToString() + "]";
+ ///// <summary>
+ ///// 鏂板鑱屽憳-淇濆瓨鎸夐挳
+ /////鍙傛暟锛歴tring sql銆�
+ /////杩斿洖鍊硷細object銆�
+ ///// </summary>
+ //[Route("Gy_Employee/AddNew")]
+ //[HttpPost]
+ //public object AddNew([FromBody] JObject oMain)
+ //{
+ // try
+ // {
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // //鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
- DAL.ClsGy_Employee_Ctl oDept = new DAL.ClsGy_Employee_Ctl();
- DAL.ClsGy_Employee_View oDeptHlp = new DAL.ClsGy_Employee_View();
- List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg1);
+ // DAL.ClsGy_Employee_Ctl oDept = new DAL.ClsGy_Employee_Ctl();
+ // DAL.ClsGy_Employee_View oDeptHlp = new DAL.ClsGy_Employee_View();
+ // List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg1);
- long HItemID = list[0].HItemID;
- string HNumber = list[0].HNumber;
- string HName = list[0].HName;
- string HShortNumber = list[0].HNumber;
- long HParentID = list[0].HParentID;
- long HLevel = 1;
- string HHelpCode = list[0].HHelpCode;
- bool HEndFlag = list[0].HEndFlag;
- bool HStopflag = list[0].HStopflag;
- string HRemark = list[0].HRemark;
- string HUseFlag = list[0].HUseFlag;
- string HSex = list[0].HSex;
- string HIDCard = list[0].HIDCard;
- string HBirthDay = list[0].HBirthDay;
- string HAddress = list[0].HAddress;
- string HLinkPhone = list[0].HLinkPhone;
- string HMobilePhone = list[0].HMobilePhone;
- string HFax = list[0].HFax;
- string HPostalCode = list[0].HPostalCode;
- string HEmail = list[0].HEmail;
- string HBank = list[0].HBank;
- string HBankAccount = list[0].HBankAccount;
- long HGroupID = list[0].HGroupID;
- long HDeptID = list[0].HDeptID;
- long HPostID = list[0].HPostID;
- long HWorkTypeID = list[0].HWorkTypeID;
- long HCTPrjID = list[0].HCTPrjID;
- long HProcID = list[0].HProcID;
- string HBasePay = list[0].HBasePay;
- DateTime HInComDate = list[0].HInComDate;
- DateTime HDimissionDate = list[0].HDimissionDate;
- bool HOverType = list[0].HOverType;
- string HEmpType = list[0].HEmpType;
- string HOtherDeduct3 = list[0].HOtherDeduct3;
- string HDrydock = list[0].HDrydock;
- string HInsurance = list[0].HInsurance;
- string HMedicare = list[0].HMedicare;
- bool HNoBrushFlag = list[0].HNoBrushFlag;
- bool HShiftFlag = list[0].HShiftFlag;
- DateTime HContactDate = list[0].HContactDate;
- bool HStopwagesFlag = list[0].HStopwagesFlag;
- string HDimissionReason = list[0].HDimissionReason;
- long HDormID = list[0].HDormID;
- string HArchivesNo = list[0].HArchivesNo;
- DateTime HStayCardEDate = list[0].HStayCardEDate;
- DateTime HCheckCardEDate = list[0].HCheckCardEDate;
- string HJobCardNo = list[0].HJobCardNo;
- DateTime HJobCardEDate = list[0].HJobCardEDate;
- string HWorkType = list[0].HWorkType;
- long HContractYear = list[0].HContractYear;
- DateTime HContractBDate = list[0].HContractBDate;
- DateTime HContractEDate = list[0].HContractEDate;
- string HInsuranceNo = list[0].HInsuranceNo;
- DateTime HInsuranceDate = list[0].HInsuranceDate;
- string HInsuranceStatus = list[0].HInsuranceStatus;
- DateTime HSignDate = list[0].HSignDate;
- bool HSignStatus = list[0].HSignStatus;
- string HOldCompany = list[0].HOldCompany;
- string HMarr = list[0].HMarr;
- string HHomeAdd = list[0].HHomeAdd;
- string HNowAdd = list[0].HNowAdd;
- string HSpec = list[0].HSpec;
- string HCompLev = list[0].HCompLev;
- string HEngLev = list[0].HEngLev;
- DateTime HGradDate = list[0].HGradDate;
- string HGradSchool = list[0].HGradSchool;
- string HSalaryLev = list[0].HSalaryLev;
- long HDutyID = list[0].HDutyID;
- string HProTitleID = list[0].HProTitleID;
- string HKnowLev = list[0].HKnowLev;
- string HAvoird = list[0].HAvoird;
- string HStature = list[0].HStature;
- string HBloodType = list[0].HBloodType;
- string HBlightyType = list[0].HBlightyType;
- string HGovStatus = list[0].HGovStatus;
- string HNation = list[0].HNation;
- string HBlighty = list[0].HBlighty;
- long HAge = list[0].HAge;
- string HExamLevPostMoney = list[0].HExamLevPostMoney;
- string HBSTDeptID = list[0].HBSTDeptID;
- string HRelDate = list[0].HRelDate;
- string HHighestPay = list[0].HHighestPay;
- string HOverPayRate = list[0].HOverPayRate;
- string HLeftMoneyRate = list[0].HLeftMoneyRate;
- string HInsuranceSubsidy = list[0].HInsuranceSubsidy;
- string HPayType = list[0].HPayType;
- string HStdDayTimes = list[0].HStdDayTimes;
- string HStdDayPay = list[0].HStdDayPay;
- string HMinDayPay = list[0].HMinDayPay;
- string HMinMonthPay = list[0].HMinMonthPay;
- DateTime HMadeDate = list[0].HMadeDate;
- string HEmpRate = list[0].HEmpRate;
- string HExamRate = list[0].HExamRate;
- DateTime HHealthCardEDate = list[0].HHealthCardEDate;
+ // long HItemID = list[0].HItemID;
+ // string HNumber = list[0].HNumber;
+ // string HName = list[0].HName;
+ // string HShortNumber = list[0].HNumber;
+ // long HParentID = list[0].HParentID;
+ // long HLevel = 1;
+ // string HHelpCode = list[0].HHelpCode;
+ // bool HEndFlag = list[0].HEndFlag;
+ // bool HStopflag = list[0].HStopflag;
+ // string HRemark = list[0].HRemark;
+ // string HUseFlag = list[0].HUseFlag;
+ // string HSex = list[0].HSex;
+ // string HIDCard = list[0].HIDCard;
+ // string HBirthDay = list[0].HBirthDay;
+ // string HAddress = list[0].HAddress;
+ // string HLinkPhone = list[0].HLinkPhone;
+ // string HMobilePhone = list[0].HMobilePhone;
+ // string HFax = list[0].HFax;
+ // string HPostalCode = list[0].HPostalCode;
+ // string HEmail = list[0].HEmail;
+ // string HBank = list[0].HBank;
+ // string HBankAccount = list[0].HBankAccount;
+ // long HGroupID = list[0].HGroupID;
+ // long HDeptID = list[0].HDeptID;
+ // long HPostID = list[0].HPostID;
+ // long HWorkTypeID = list[0].HWorkTypeID;
+ // long HCTPrjID = list[0].HCTPrjID;
+ // long HProcID = list[0].HProcID;
+ // string HBasePay = list[0].HBasePay;
+ // DateTime HInComDate = list[0].HInComDate;
+ // DateTime HDimissionDate = list[0].HDimissionDate;
+ // bool HOverType = list[0].HOverType;
+ // string HEmpType = list[0].HEmpType;
+ // string HOtherDeduct3 = list[0].HOtherDeduct3;
+ // string HDrydock = list[0].HDrydock;
+ // string HInsurance = list[0].HInsurance;
+ // string HMedicare = list[0].HMedicare;
+ // bool HNoBrushFlag = list[0].HNoBrushFlag;
+ // bool HShiftFlag = list[0].HShiftFlag;
+ // DateTime HContactDate = list[0].HContactDate;
+ // bool HStopwagesFlag = list[0].HStopwagesFlag;
+ // string HDimissionReason = list[0].HDimissionReason;
+ // long HDormID = list[0].HDormID;
+ // string HArchivesNo = list[0].HArchivesNo;
+ // DateTime HStayCardEDate = list[0].HStayCardEDate;
+ // DateTime HCheckCardEDate = list[0].HCheckCardEDate;
+ // string HJobCardNo = list[0].HJobCardNo;
+ // DateTime HJobCardEDate = list[0].HJobCardEDate;
+ // string HWorkType = list[0].HWorkType;
+ // long HContractYear = list[0].HContractYear;
+ // DateTime HContractBDate = list[0].HContractBDate;
+ // DateTime HContractEDate = list[0].HContractEDate;
+ // string HInsuranceNo = list[0].HInsuranceNo;
+ // DateTime HInsuranceDate = list[0].HInsuranceDate;
+ // bool HInsuranceStatus = list[0].HInsuranceStatus;
+ // DateTime HSignDate = list[0].HSignDate;
+ // bool HSignStatus = list[0].HSignStatus;
+ // string HOldCompany = list[0].HOldCompany;
+ // string HMarr = list[0].HMarr;
+ // string HHomeAdd = list[0].HHomeAdd;
+ // string HNowAdd = list[0].HNowAdd;
+ // string HSpec = list[0].HSpec;
+ // string HCompLev = list[0].HCompLev;
+ // string HEngLev = list[0].HEngLev;
+ // DateTime HGradDate = list[0].HGradDate;
+ // string HGradSchool = list[0].HGradSchool;
+ // string HSalaryLev = list[0].HSalaryLev;
+ // long HDutyID = list[0].HDutyID;
+ // string HProTitleID = list[0].HProTitleID;
+ // string HKnowLev = list[0].HKnowLev;
+ // string HAvoird = list[0].HAvoird;
+ // string HStature = list[0].HStature;
+ // string HBloodType = list[0].HBloodType;
+ // string HBlightyType = list[0].HBlightyType;
+ // string HGovStatus = list[0].HGovStatus;
+ // string HNation = list[0].HNation;
+ // string HBlighty = list[0].HBlighty;
+ // long HAge = list[0].HAge;
+ // string HExamLevPostMoney = list[0].HExamLevPostMoney;
+ // string HBSTDeptID = list[0].HBSTDeptID;
+ // string HRelDate = list[0].HRelDate;
+ // string HHighestPay = list[0].HHighestPay;
+ // string HOverPayRate = list[0].HOverPayRate;
+ // string HLeftMoneyRate = list[0].HLeftMoneyRate;
+ // string HInsuranceSubsidy = list[0].HInsuranceSubsidy;
+ // string HPayType = list[0].HPayType;
+ // string HStdDayTimes = list[0].HStdDayTimes;
+ // string HStdDayPay = list[0].HStdDayPay;
+ // string HMinDayPay = list[0].HMinDayPay;
+ // string HMinMonthPay = list[0].HMinMonthPay;
+ // DateTime HMadeDate = list[0].HMadeDate;
+ // string HEmpRate = list[0].HEmpRate;
+ // string HExamRate = list[0].HExamRate;
+ // DateTime HHealthCardEDate = list[0].HHealthCardEDate;
- if (!DBUtility.ClsPub.AllowNumber(HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ // if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- oCN.RunProc("Insert into Gy_Employee (" +
- "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
- ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
- ",HStopflag,HRemark,HHelpCode,HInsuranceSubsidy" +
- ",HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate" +
- ",HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate" +
- ",HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus" +
- ",HSex,HMarr,HBlighty,HNation,HBlightyType" +
- ",HGovStatus,HBloodType,HStature,HAvoird,HKnowLev" +
- ",HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec" +
- ",HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax" +
- ",HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason" +
- ",HDimissionDate,HInComDate,HSignDate,HRelDate" +
- ",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
- ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
- ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
- ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
- ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" +
- ") " +
- " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "'," + HEmpRate.ToString() + "," + HExamRate.ToString() +
- "," + HLevel + "," + HParentID + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HHighestPay.ToString() + "," + HOverPayRate.ToString() +
- "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" + ",'" + HHelpCode + "'," + HInsuranceSubsidy.ToString() + "" +
- ",'" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
- ",'" + HJobCardEDate + "','" + HCheckCardEDate + "','" + HStayCardEDate + "','" + HHealthCardEDate + "'" +
- "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + HInsuranceStatus + "," + Convert.ToString(HSignStatus ? 1 : 0) +
- ",'" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
- ",'" + HGovStatus + "','" + HBloodType + "','" + HStature + "','" + HAvoird + "','" + HKnowLev + "'" +
- ",'" + HProTitleID + "','" + HGradSchool + "','" + HEngLev + "','" + HCompLev + "','" + HSpec + "'" +
- ",'" + HEmail + "','" + HNowAdd + "','" + HHomeAdd + "','" + HIDCard + "','" + HLinkPhone + "','" + HMobilePhone + "','" + HFax + "'" +
- ",'" + HOldCompany + "','" +HInsuranceNo + "','" +HJobCardNo + "','" +HArchivesNo + "','" + HWorkType + "','" + HDimissionReason + "'" +
- ",'" + HDimissionDate + "','" + HInComDate + "','" + HSignDate + "','" + HRelDate + "'" +
- "," + HPostID.ToString() + "," +HDormID.ToString() + "," + HDutyID.ToString() + "," + HLeftMoneyRate.ToString() +
- ",'" + HEmpType + "'" + ",'" + HPayType + "'" + "," + DBUtility.ClsPub.BoolToString(HOverType) + "" + "," + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HShiftFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HStopwagesFlag) + "" +
- ",'" + HPostalCode + "','" + HBank + "'," + HBasePay.ToString() + "," + HExamLevPostMoney.ToString() + ",'" + HBSTDeptID + "'" +
- "," + HOtherDeduct3.ToString() + "" + "," + HInsurance.ToString() + "" + "," + HMedicare.ToString() + "" + "," + HDrydock.ToString() + "" +
- ",'" + HBankAccount + "'" + "," + HGroupID.ToString() + "" + "," + HDeptID.ToString() + "," + HWorkTypeID.ToString() + "," + HCTPrjID.ToString() + ",'" + HAddress + "'" +
- ")");
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_Employee set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
-
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
- //objJsonResult.data = null;
- return objJsonResult;
- }
- catch (Exception e)
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
+ // //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ // oCN.BeginTran();
+ // oCN.RunProc("Insert into Gy_Employee (" +
+ // "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
+ // ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
+ // ",HStopflag,HRemark,HHelpCode,HInsuranceSubsidy" +
+ // ",HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate" +
+ // ",HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate" +
+ // ",HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus" +
+ // ",HSex,HMarr,HBlighty,HNation,HBlightyType" +
+ // ",HGovStatus,HBloodType,HStature,HAvoird,HKnowLev" +
+ // ",HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec" +
+ // ",HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax" +
+ // ",HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason" +
+ // ",HDimissionDate,HInComDate,HSignDate,HRelDate" +
+ // ",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
+ // ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
+ // ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
+ // ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
+ // ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" +
+ // ") " +
+ // " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "'," + HEmpRate.ToString() + "," + HExamRate.ToString() +
+ // "," + HLevel + "," + HParentID + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HHighestPay.ToString() + "," + HOverPayRate.ToString() +
+ // "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" + ",'" + HHelpCode + "'," + HInsuranceSubsidy.ToString() + "" +
+ // ",'" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
+ // ",'" + HJobCardEDate + "','" + HCheckCardEDate + "','" + HStayCardEDate + "','" + HHealthCardEDate + "'" +
+ // "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + HInsuranceStatus + "," + Convert.ToString(HSignStatus ? 1 : 0) +
+ // ",'" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
+ // ",'" + HGovStatus + "','" + HBloodType + "','" + HStature + "','" + HAvoird + "','" + HKnowLev + "'" +
+ // ",'" + HProTitleID + "','" + HGradSchool + "','" + HEngLev + "','" + HCompLev + "','" + HSpec + "'" +
+ // ",'" + HEmail + "','" + HNowAdd + "','" + HHomeAdd + "','" + HIDCard + "','" + HLinkPhone + "','" + HMobilePhone + "','" + HFax + "'" +
+ // ",'" + HOldCompany + "','" + HInsuranceNo + "','" + HJobCardNo + "','" + HArchivesNo + "','" + HWorkType + "','" + HDimissionReason + "'" +
+ // ",'" + HDimissionDate + "','" + HInComDate + "','" + HSignDate + "','" + HRelDate + "'" +
+ // "," + HPostID.ToString() + "," + HDormID.ToString() + "," + HDutyID.ToString() + "," + HLeftMoneyRate.ToString() +
+ // ",'" + HEmpType + "'" + ",'" + HPayType + "'" + "," + DBUtility.ClsPub.BoolToString(HOverType) + "" + "," + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HShiftFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HStopwagesFlag) + "" +
+ // ",'" + HPostalCode + "','" + HBank + "'," + HBasePay.ToString() + "," + HExamLevPostMoney.ToString() + ",'" + HBSTDeptID + "'" +
+ // "," + HOtherDeduct3.ToString() + "" + "," + HInsurance.ToString() + "" + "," + HMedicare.ToString() + "" + "," + HDrydock.ToString() + "" +
+ // ",'" + HBankAccount + "'" + "," + HGroupID.ToString() + "" + "," + HDeptID.ToString() + "," + HWorkTypeID.ToString() + "," + HCTPrjID.ToString() + ",'" + HAddress + "'" +
+ // ")");
+ // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ // oCN.RunProc("Update Gy_Employee set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ // oCN.Commit();
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ // //objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.Message;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
/// <summary>
/// 淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -271,9 +281,20 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
+ string msg3 = sArray[1].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
+
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg2);
@@ -284,22 +305,22 @@
string HShortNumber = list[0].HNumber;
long HParentID = list[0].HParentID;
long HLevel = 1;
- string HHelpCode = list[0].HHelpCode;
+ string HHelpCode = list[0].HHelpCode ?? "";
bool HEndFlag = list[0].HEndFlag;
bool HStopflag = list[0].HStopflag;
string HRemark = list[0].HRemark;
- string HUseFlag = list[0].HUseFlag;
+ string HUseFlag = list[0].HUseFlag ?? "";
string HSex = list[0].HSex;
string HIDCard = list[0].HIDCard;
string HBirthDay = list[0].HBirthDay;
- string HAddress = list[0].HAddress;
+ string HAddress = list[0].HAddress ?? "";
string HLinkPhone = list[0].HLinkPhone;
string HMobilePhone = list[0].HMobilePhone;
string HFax = list[0].HFax;
string HPostalCode = list[0].HPostalCode;
string HEmail = list[0].HEmail;
- string HBank = list[0].HBank;
- string HBankAccount = list[0].HBankAccount;
+ string HBank = list[0].HBank ?? "";
+ string HBankAccount = list[0].HBankAccount ?? "";
long HGroupID = list[0].HGroupID;
long HDeptID = list[0].HDeptID;
long HPostID = list[0].HPostID;
@@ -307,8 +328,8 @@
long HCTPrjID = list[0].HCTPrjID;
long HProcID = list[0].HProcID;
string HBasePay = list[0].HBasePay;
- DateTime HInComDate = list[0].HInComDate;
- DateTime HDimissionDate = list[0].HDimissionDate;
+ DateTime HInComDate = list[0].HInComDate; //杩涘巶鏃ユ湡
+ DateTime HDimissionDate = list[0].HDimissionDate; //绂昏亴鏃ユ湡 (鍏佽NULL)
bool HOverType = list[0].HOverType;
string HEmpType = list[0].HEmpType;
string HOtherDeduct3 = list[0].HOtherDeduct3;
@@ -317,64 +338,65 @@
string HMedicare = list[0].HMedicare;
bool HNoBrushFlag = list[0].HNoBrushFlag;
bool HShiftFlag = list[0].HShiftFlag;
- DateTime HContactDate = list[0].HContactDate;
+ //DateTime HContactDate = list[0].HContactDate; //鍚堝悓鏃ユ湡
bool HStopwagesFlag = list[0].HStopwagesFlag;
string HDimissionReason = list[0].HDimissionReason;
long HDormID = list[0].HDormID;
string HArchivesNo = list[0].HArchivesNo;
- DateTime HStayCardEDate = list[0].HStayCardEDate;
- DateTime HCheckCardEDate = list[0].HCheckCardEDate;
- string HJobCardNo = list[0].HJobCardNo;
- DateTime HJobCardEDate = list[0].HJobCardEDate;
+ DateTime HStayCardEDate = list[0].HStayCardEDate; //鏆備綇璇佸埌鏈熸棩
+ DateTime HCheckCardEDate = Convert.ToDateTime("1900/1/1"); //瀹℃璇佸埌鏈熸棩
+ string HJobCardNo = list[0].HJobCardNo ?? "";
+ DateTime HJobCardEDate = Convert.ToDateTime("1900/1/1"); //灏变笟璇佸埌鏈熸棩
string HWorkType = list[0].HWorkType;
long HContractYear = list[0].HContractYear;
- DateTime HContractBDate = list[0].HContractBDate;
- DateTime HContractEDate = list[0].HContractEDate;
+ DateTime HContractBDate = list[0].HContractBDate; //鍚堝悓寮�濮嬫棩
+ DateTime HContractEDate = list[0].HContractEDate; //鍚堝悓鍒版湡鏃�
string HInsuranceNo = list[0].HInsuranceNo;
- DateTime HInsuranceDate = list[0].HInsuranceDate;
- string HInsuranceStatus = list[0].HInsuranceStatus;
- DateTime HSignDate = list[0].HSignDate;
+ DateTime HInsuranceDate = list[0].HInsuranceDate; //鍙備繚鏃ユ湡
+ bool HInsuranceStatus = list[0].HInsuranceStatus;
+ DateTime HSignDate = Convert.ToDateTime("1900/1/1"); //绛剧害鏃ユ湡
bool HSignStatus = list[0].HSignStatus;
- string HOldCompany = list[0].HOldCompany;
- string HMarr = list[0].HMarr;
- string HHomeAdd = list[0].HHomeAdd;
- string HNowAdd = list[0].HNowAdd;
- string HSpec = list[0].HSpec;
- string HCompLev = list[0].HCompLev;
- string HEngLev = list[0].HEngLev;
- DateTime HGradDate = list[0].HGradDate;
- string HGradSchool = list[0].HGradSchool;
- string HSalaryLev = list[0].HSalaryLev;
+ string HOldCompany = list[0].HOldCompany ?? "";
+ string HMarr = list[0].HMarr ?? "";
+ string HHomeAdd = list[0].HHomeAdd ?? "";
+ string HNowAdd = list[0].HNowAdd ?? "";
+ string HSpec = list[0].HSpec ?? "";
+ string HCompLev = list[0].HCompLev ?? "";
+ string HEngLev = list[0].HEngLev ?? "";
+ DateTime HGradDate = list[0].HGradDate; //姣曚笟鏃ユ湡
+ string HGradSchool = list[0].HGradSchool ?? "";
+ string HSalaryLev = list[0].HSalaryLev ?? "";
long HDutyID = list[0].HDutyID;
- string HProTitleID = list[0].HProTitleID;
- string HKnowLev = list[0].HKnowLev;
- string HAvoird = list[0].HAvoird;
- string HStature = list[0].HStature;
- string HBloodType = list[0].HBloodType;
- string HBlightyType = list[0].HBlightyType;
- string HGovStatus = list[0].HGovStatus;
- string HNation = list[0].HNation;
- string HBlighty = list[0].HBlighty;
+ string HProTitleID = list[0].HProTitleID ?? "";
+ string HKnowLev = list[0].HKnowLev ?? "";
+ string HAvoird = list[0].HAvoird ?? "";
+ string HStature = list[0].HStature ?? "";
+ string HBloodType = list[0].HBloodType ?? "";
+ string HBlightyType = list[0].HBlightyType ?? "";
+ string HGovStatus = list[0].HGovStatus ?? "";
+ string HNation = list[0].HNation ?? "";
+ string HBlighty = list[0].HBlighty ?? "";
long HAge = list[0].HAge;
- string HExamLevPostMoney = list[0].HExamLevPostMoney;
- string HBSTDeptID = list[0].HBSTDeptID;
- string HRelDate = list[0].HRelDate;
- string HHighestPay = list[0].HHighestPay;
- string HOverPayRate = list[0].HOverPayRate;
- string HLeftMoneyRate = list[0].HLeftMoneyRate;
- string HInsuranceSubsidy = list[0].HInsuranceSubsidy;
- string HPayType = list[0].HPayType;
- string HStdDayTimes = list[0].HStdDayTimes;
- string HStdDayPay = list[0].HStdDayPay;
- string HMinDayPay = list[0].HMinDayPay;
- string HMinMonthPay = list[0].HMinMonthPay;
- DateTime HMadeDate = list[0].HMadeDate;
- string HEmpRate = list[0].HEmpRate;
- string HExamRate = list[0].HExamRate;
- DateTime HHealthCardEDate = list[0].HHealthCardEDate;
+ string HExamLevPostMoney = list[0].HExamLevPostMoney ?? "";
+ string HBSTDeptID = list[0].HBSTDeptID ?? "";
+ string HRelDate = list[0].HRelDate ?? "";
+ string HHighestPay = list[0].HHighestPay ?? "";
+ string HOverPayRate = list[0].HOverPayRate ?? "";
+ string HLeftMoneyRate = list[0].HLeftMoneyRate ?? "";
+ string HInsuranceSubsidy = list[0].HInsuranceSubsidy ?? "";
+ string HPayType = list[0].HPayType ?? "";
+ string HStdDayTimes = list[0].HStdDayTimes ?? "";
+ string HStdDayPay = list[0].HStdDayPay ?? "";
+ string HMinDayPay = list[0].HMinDayPay ?? "";
+ string HMinMonthPay = list[0].HMinMonthPay ?? "";
+ //DateTime HMadeDate = list[0].HMadeDate; //寤虹珛鏃ユ湡
+ string HEmpRate = list[0].HEmpRate ?? "";
+ string HExamRate = list[0].HExamRate ?? "";
+ DateTime HHealthCardEDate = Convert.ToDateTime("1900/1/1"); //鍋ュ悍璇佸埌鏈熸棩
+ long HUSEORGID = list[0].HUSEORGID;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -422,25 +444,25 @@
",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
- ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" +
+ ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress" +
") " +
- " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "'," + HEmpRate.ToString() + "," + HExamRate.ToString() +
- "," + HLevel + "," + HParentID + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HHighestPay.ToString() + "," + HOverPayRate.ToString() +
- "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" + ",'" + HHelpCode + "'," + HInsuranceSubsidy.ToString() + "" +
- ",'" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
+ " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "','" + HEmpRate.ToString() + "','" + HExamRate.ToString() +
+ "','" + HLevel + "','" + HParentID + "','" + Convert.ToString(HEndFlag ? 1 : 0) + "','" + HHighestPay.ToString() + "','" + HOverPayRate.ToString() +
+ "','" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "'" + ",'" + HHelpCode + "','" + HInsuranceSubsidy.ToString() +
+ "','" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
",'" + HJobCardEDate + "','" + HCheckCardEDate + "','" + HStayCardEDate + "','" + HHealthCardEDate + "'" +
- "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + HInsuranceStatus + "," + Convert.ToString(HSignStatus ? 1 : 0) +
- ",'" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
+ ",'" + HAge.ToString() + "','" + HSalaryLev + "','" + HContractYear.ToString() + "','" + Convert.ToString(HInsuranceStatus ? 1 : 0) + "','" + Convert.ToString(HSignStatus ? 1 : 0) +
+ "','" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
",'" + HGovStatus + "','" + HBloodType + "','" + HStature + "','" + HAvoird + "','" + HKnowLev + "'" +
",'" + HProTitleID + "','" + HGradSchool + "','" + HEngLev + "','" + HCompLev + "','" + HSpec + "'" +
",'" + HEmail + "','" + HNowAdd + "','" + HHomeAdd + "','" + HIDCard + "','" + HLinkPhone + "','" + HMobilePhone + "','" + HFax + "'" +
",'" + HOldCompany + "','" + HInsuranceNo + "','" + HJobCardNo + "','" + HArchivesNo + "','" + HWorkType + "','" + HDimissionReason + "'" +
",'" + HDimissionDate + "','" + HInComDate + "','" + HSignDate + "','" + HRelDate + "'" +
- "," + HPostID.ToString() + "," + HDormID.ToString() + "," + HDutyID.ToString() + "," + HLeftMoneyRate.ToString() +
- ",'" + HEmpType + "'" + ",'" + HPayType + "'" + "," + DBUtility.ClsPub.BoolToString(HOverType) + "" + "," + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HShiftFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HStopwagesFlag) + "" +
- ",'" + HPostalCode + "','" + HBank + "'," + HBasePay.ToString() + "," + HExamLevPostMoney.ToString() + ",'" + HBSTDeptID + "'" +
- "," + HOtherDeduct3.ToString() + "" + "," + HInsurance.ToString() + "" + "," + HMedicare.ToString() + "" + "," + HDrydock.ToString() + "" +
- ",'" + HBankAccount + "'" + "," + HGroupID.ToString() + "" + "," + HDeptID.ToString() + "," + HWorkTypeID.ToString() + "," + HCTPrjID.ToString() + ",'" + HAddress + "'" + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + HPostID.ToString() + "','" + HDormID.ToString() + "','" + HDutyID.ToString() + "','" + HLeftMoneyRate.ToString() +
+ "','" + HEmpType + "'" + ",'" + HPayType + "'" + ",'" + DBUtility.ClsPub.BoolToString(HOverType) + "','" + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "','" + DBUtility.ClsPub.BoolToString(HShiftFlag) + "','" + DBUtility.ClsPub.BoolToString(HStopwagesFlag) +
+ "','" + HPostalCode + "','" + HBank + "','" + HBasePay.ToString() + "','" + HExamLevPostMoney.ToString() + "','" + HBSTDeptID + "'" +
+ ",'" + HOtherDeduct3.ToString() + "','" + HInsurance.ToString() + "','" + HMedicare.ToString() + "','" + HDrydock.ToString() +
+ "','" + HBankAccount + "'" + ",'" + HGroupID.ToString() + "','" + HDeptID.ToString() + "','" + HWorkTypeID.ToString() + "','" + HCTPrjID.ToString() + "','" + HUSEORGID + "','" + HAddress + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -450,24 +472,90 @@
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
oCN.RunProc("Update Gy_Employee set " +
- "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
- ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
- ",HStopflag,HRemark,HHelpCode,HInsuranceSubsidy" +
- ",HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate" +
- ",HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate" +
- ",HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus" +
- ",HSex,HMarr,HBlighty,HNation,HBlightyType" +
- ",HGovStatus,HBloodType,HStature,HAvoird,HKnowLev" +
- ",HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec" +
- ",HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax" +
- ",HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason" +
- ",HDimissionDate,HInComDate,HSignDate,HRelDate" +
- ",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
- ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
- ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
- ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
- ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ " 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.Commit();
}
objJsonResult.code = "0";
@@ -479,7 +567,7 @@
}
catch (Exception e)
{
- oCN.RollBack();
+ //oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.Message;
@@ -584,7 +672,7 @@
// objJsonResult.data = 1;
// return objJsonResult;
// }
-
+
// //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
// ds = oCN.RunProcReturn("select * from Gy_Employee where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Employee");
// if (oItem.HNumber.Trim() == "")
@@ -739,21 +827,20 @@
/// <returns></returns>
[Route("DeltetGy_Employee")]
[HttpGet]
- public object DeltetGy_Employee(string HItemID)
+ public object DeltetGy_Employee(string HItemID,string user)
{
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;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_Employee_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
@@ -785,7 +872,7 @@
return objJsonResult;
}
- oCN.RunProc("update Gy_Employee set HStopflag=1 where HItemID=" + HItemID);
+ oCN.RunProc("delete from Gy_Employee where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
--
Gitblit v1.9.1