From 7bef807a510d85c36f97b850c4baf9cef75e72cf Mon Sep 17 00:00:00 2001
From: zhangming <965499528@qq.com>
Date: Fri, 22 Mar 2024 10:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A4=90=E8=A1=A5=E6=8A=A5=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/hostar/thread/HandleCBDataThread.java    | 13 ++++++++++---
 src/com/engine/kq/biz/KQFormatData.java             | 13 ++++++++++---
 .../kq/cmd/attendanceButton/PunchOutButtonCmd.java  |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/hostar/thread/HandleCBDataThread.java b/src/com/engine/hostar/thread/HandleCBDataThread.java
index 69ebcc5..c870ea8 100644
--- a/src/com/engine/hostar/thread/HandleCBDataThread.java
+++ b/src/com/engine/hostar/thread/HandleCBDataThread.java
@@ -118,9 +118,16 @@ public class HandleCBDataThread  extends BaseBean implements Runnable{
                 SimpleDateFormat sdfTime = new SimpleDateFormat("HH:mm:ss");//设置日期格式
                 String nowDate = sdfDate.format(new Date());
                 String nowTime = sdfTime.format(new Date());
-                rs1.executeUpdate("insert into uf_cbxxjlb (xm, rq, hrzdcb, jmybcb, zdcb, ybbz, cccb, ldbz, formmodeid, MODEUUID, " +
-                                "modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,? ,?, ?)",
-                        userId, kqDate, otherStatAllowance, nightAllowance, statAllowance, nightShiftSubsidy, mealAllowance, zeropoint, cbxxjlModeId, uuidT, "1", "0", nowDate, nowTime);
+                String gh = null;
+                String bm = null;
+                rs1.executeQuery("SELECT workcode, departmentid from hrmresource where id = ?", userId);
+                if (rs1.next()) {
+                    gh = rs1.getString("workcode");
+                    bm = rs1.getString("departmentid");
+                }
+                rs1.executeUpdate("insert into uf_cbxxjlb (xm, rq, gh, bm, hrzdcb, jmybcb, zdcb, ybbz, cccb, ldbz, formmodeid, MODEUUID, " +
+                                "modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,? ,?, ?)",
+                        userId, kqDate, gh, bm, otherStatAllowance, nightAllowance, statAllowance, nightShiftSubsidy, mealAllowance, zeropoint, cbxxjlModeId, uuidT, "1", "0", nowDate, nowTime);
                 RecordSet qxcgRs = new RecordSet();
                 qxcgRs.execute("select id from uf_cbxxjlb where MODEUUID = '" + uuidT + "'");
                 Integer idT = 0;
diff --git a/src/com/engine/kq/biz/KQFormatData.java b/src/com/engine/kq/biz/KQFormatData.java
index 2ac2fba..84e18c3 100644
--- a/src/com/engine/kq/biz/KQFormatData.java
+++ b/src/com/engine/kq/biz/KQFormatData.java
@@ -251,9 +251,16 @@ public class KQFormatData extends BaseBean {
         SimpleDateFormat sdfTime = new SimpleDateFormat("HH:mm:ss");//设置日期格式
         String nowDate = sdfDate.format(new Date());
         String nowTime = sdfTime.format(new Date());
-        rs1.executeUpdate("insert into uf_cbxxjlb (xm, rq, hrzdcb, jmybcb, zdcb, ybbz, cccb, ldbz, formmodeid, MODEUUID, " +
-                        "modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,? ,?)",
-                userId, kqDate, otherStatAllowance, nightAllowance, statAllowance, nightShiftSubsidy, mealAllowance, zeropoint, cbxxjlModeId, uuidT, "1", "0", nowDate, nowTime);
+        String gh = null;
+        String bm = null;
+        rs1.executeQuery("SELECT workcode, departmentid from hrmresource where id = ?", userId);
+        if (rs1.next()) {
+          gh = rs1.getString("workcode");
+          bm = rs1.getString("departmentid");
+        }
+        rs1.executeUpdate("insert into uf_cbxxjlb (xm, rq, gh, bm, hrzdcb, jmybcb, zdcb, ybbz, cccb, ldbz, formmodeid, MODEUUID, " +
+                        "modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,? ,?)",
+                userId, kqDate, gh, bm ,otherStatAllowance, nightAllowance, statAllowance, nightShiftSubsidy, mealAllowance, zeropoint, cbxxjlModeId, uuidT, "1", "0", nowDate, nowTime);
         RecordSet qxcgRs = new RecordSet();
         qxcgRs.execute("select id from uf_cbxxjlb where MODEUUID = '" + uuidT + "'");
         Integer idT = 0;
diff --git a/src/com/engine/kq/cmd/attendanceButton/PunchOutButtonCmd.java b/src/com/engine/kq/cmd/attendanceButton/PunchOutButtonCmd.java
index 266b66c..918c585 100644
--- a/src/com/engine/kq/cmd/attendanceButton/PunchOutButtonCmd.java
+++ b/src/com/engine/kq/cmd/attendanceButton/PunchOutButtonCmd.java
@@ -313,7 +313,7 @@ public class PunchOutButtonCmd extends AbstractCommonCommand<Map<String, Object>
                 " FROM " +
                 " workflow_requestbase " +
                 " WHERE " +
-                " requestid IN ( SELECT requestid FROM " + outTableName + " WHERE (sqr = '" + userId + "' or ','+CAST(nbtxr AS varchar(max))+',' like '%,'+CAST("+userId+" AS varchar(10))+',%') and ksrq <='" + sqlDate + "' and (((sjjsrq is null or sjjsrq = '') and yjjsrq >= '" + sqlDate + "') or (sjjsrq is not null and sjjsrq != '' and sjjsrq >= '" + sqlDate + "'))) ) " +
+                " requestid IN ( SELECT requestid FROM " + outTableName + " WHERE (sqr = '" + userId + "' or ','+CAST(nbtxr AS varchar(max))+',' like '%,'+CAST("+userId+" AS varchar(10))+',%') and ksrq <='" + sqlDate + "' and (((sjjsrq is null or sjjsrq = '') and yjjsrq >= '" + sqlDate + "') or (sjjsrq is not null and sjjsrq != '' and sjjsrq >= '" + sqlDate + "'))) " +
 //              " AND currentnodetype = 3 " +
                 ") a ";
         rs.executeQuery(acqEvecAndOutSql);