From 36601a10fb46f8a8692ff823193c58c7df0a651c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=A0=8B?= <lidong@21tb.com>
Date: Thu, 28 Mar 2024 17:12:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=96=E5=87=BA=E5=87=BA=E5=B7=AEaction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/weaver/interfaces/hostar/action/OutSignSyncAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/weaver/interfaces/hostar/action/OutSignSyncAction.java b/src/weaver/interfaces/hostar/action/OutSignSyncAction.java
index 7dfa23b..4dd023b 100644
--- a/src/weaver/interfaces/hostar/action/OutSignSyncAction.java
+++ b/src/weaver/interfaces/hostar/action/OutSignSyncAction.java
@@ -61,7 +61,7 @@ public class OutSignSyncAction implements Action {
                         "from mobile_sign a " +
                         "left join uf_outsigntype c " +
                         "on c.outsignid = a.id " +
-                        "where operate_date > '" + startDate + "' and operate_date < '" + endDate + "' and operate in (?) ";
+                        "where operate_date > '" + startDate + "' and operate_date < '" + endDate + "' and operater in (?) ";
                 rs.executeQuery(acqOutSignSql, resourceid);
                 while (rs.next()) {
                     String signinfo = Util.null2String(rs.getString("signinfo"));

From 99f62328cff20861bc7e5e315237ca6328537235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=A0=8B?= <lidong@21tb.com>
Date: Thu, 28 Mar 2024 17:13:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAbug-v1.0=E5=BE=85=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/kq/cmd/report/ExportDailyExcelCmd.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java b/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java
index 5adab4d..ca19c1b 100644
--- a/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java
+++ b/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java
@@ -185,18 +185,18 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
       }else {
         forgotBeginWorkCheck_field = " isnull(b.forgotBeginWorkCheck,0) ";
       }
-
-      String backFields = " (select zm.cccb from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as mealAllowance," +
-              " (select zm.zdcb from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as statAllowance," +
-              " (select zm.jmybcb from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as nightAllowance," +
-              " (select zm.hrzdcb from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as otherStatAllowance," +
-              " (select zm.ybbz from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as nightShiftSubsidy," +
+        String backFields = " zm.cccb as mealAllowance," +
+                " zm.zdcb as statAllowance," +
+                " zm.jmybcb as nightAllowance," +
+                " zm.hrzdcb as otherStatAllowance," +
+                " zm.ybbz as nightShiftSubsidy, "+
               " a.id,a.lastname,a.subcompanyid1 as subcompanyid,a.departmentid, a.workcode,b.jobtitle,a.dsporder," +
               " b.kqdate, b.workdays,b.workMins,b.serialid, b.attendancedays,FLOOR( b.attendanceMins / 30 ) * 30 AS attendanceMins ,b.beLate," +
               " b.beLateMins,b.graveBeLate,b.graveBeLateMins,b.leaveEearly,b.leaveEarlyMins,b.graveLeaveEarly," +
               " b.graveLeaveEarlyMins,b.absenteeism,b.signdays,b.signmins, "+
               " b.absenteeismMins ,(b.forgotCheck+"+forgotBeginWorkCheck_field+") forgotCheck,zeropoint ";
-      String sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
+        String sqlFrom = " from hrmresource a, kq_format_total b,uf_cbxxjlb zm " +
+                "where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"' and zm.xm=a.id and zm.rq = b.kqdate ";
       String sqlWhere = rightSql;
       if(subCompanyId.length()>0){
         sqlWhere +=" and a.subcompanyid1 in("+subCompanyId+") ";