From 63610047f4921b0bdcb0042f54c5197b62746446 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 15 八月 2023 14:28:42 +0800
Subject: [PATCH] 异常工时申请单：添加子表重复校验，子表做颜色区分，子表单元格根据宽度隐藏内容，取消分页，添加合计行，根据职员带出工作中，取消上一行下一行
---
WebAPI/Controllers/人事管理/离职申请/HR_EmpDimissionBillController.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git "a/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\347\246\273\350\201\214\347\224\263\350\257\267/HR_EmpDimissionBillController.cs" "b/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\347\246\273\350\201\214\347\224\263\350\257\267/HR_EmpDimissionBillController.cs"
index fd15244..91dfd73 100644
--- "a/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\347\246\273\350\201\214\347\224\263\350\257\267/HR_EmpDimissionBillController.cs"
+++ "b/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\347\246\273\350\201\214\347\224\263\350\257\267/HR_EmpDimissionBillController.cs"
@@ -11,7 +11,7 @@
using System.Windows.Forms;
using WebAPI.Models;
-namespace WebAPI.Controllers.椤圭洰绠＄悊.宸ヤ綔浠诲姟
+namespace WebAPI.Controllers.浜轰簨绠＄悊.绂昏亴鐢宠
{
public class HR_EmpDimissionBillController : ApiController
{
@@ -19,7 +19,7 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
+ public DAL.ClsHR_EmpDimissionBill BillOld = new DAL.ClsHR_EmpDimissionBill();
string user_LongShan = "";
string HName_LongShan = "";
@@ -801,9 +801,14 @@
{
try
{
- string sql = @"select b.HItemID HDeptID,b.HName HDeptName,c.HItemID HPostID,c.HName HPostName from Gy_Employee AS a
+ string sql = @"select
+ b.HItemID HDeptID, b.HNumber HDeptNumber, b.HName HDeptName
+ , c.HItemID HPostID, c.HNumber HPostNumber, c.HName HPostName
+ , d.HItemID HWorkTypeID, d.HNumber HWorkTypeNumber, d.HName HWorkTypeName, d.HPayMoney
+ from Gy_Employee AS a
LEFT OUTER JOIN Gy_Department AS b on a.HDeptID = b.HItemID
LEFT OUTER JOIN Gy_Post AS c on a.HPostID = c.HItemID
+ LEFT OUTER JOIN Gy_WorkType AS d on a.HWorkTypeID = d.HItemID
where a.HItemID = " + HEmpID;
ds = oCN.RunProcReturn(sql, "Gy_EmployeeInfo");
--
Gitblit v1.9.1