src/com/engine/kq/biz/KQFormatData.java

@@ -943,8 +943,7 @@ public class KQFormatData extends BaseBean {
 
         boolean isondutyfreecheck =false;
         boolean isoffdutyfreecheck =false;
-//        Map<String, String> model_ShiftRule = kqFormatShiftRule.getModel_ShiftRule(i, workTime.getSerialId());
-        Map<String, String> model_ShiftRule = new HashMap<>();
+        Map<String, String> model_ShiftRule = kqFormatShiftRule.getModel_ShiftRule(i, workTime.getSerialId());
         Iterator iter = model_ShiftRule.entrySet().iterator();
         while (iter.hasNext()) {
           Map.Entry entry = (Map.Entry) iter.next();

src/com/engine/kq/cmd/attendanceButton/PunchOutButtonCmd.java

@@ -50,7 +50,7 @@ public class PunchOutButtonCmd extends AbstractCommonCommand<Map<String, Object>
   public Map<String, Object> execute(CommandContext commandContext) {
     Map<String, Object> retmap = new HashMap<String, Object>();
     try{
-      bb.writeLog("PunchOutButtonCmd-start");
+
       insertSign(retmap);
 
     }catch (Exception e) {

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 = " zm.cccb as mealAllowance," +
-                " zm.zdcb as statAllowance," +
-                " zm.jmybcb as nightAllowance," +
-                " zm.hrzdcb as otherStatAllowance," +
-                " zm.ybbz as nightShiftSubsidy, "+
+
+      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," +
               " 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,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 sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
       String sqlWhere = rightSql;
       if(subCompanyId.length()>0){
         sqlWhere +=" and a.subcompanyid1 in("+subCompanyId+") ";

src/com/engine/kq/cmd/report/ExportExcelCmd.java

@@ -583,8 +583,7 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
       String fileName = SystemEnv.getHtmlLabelName(390351, user.getLanguage())+" "+fromDate+" "+toDate;
       workbook.put("fileName", fileName);
       ExcelUtil ExcelUtil = new ExcelUtil();
-//      Map<String, Object> exportMap = ExcelUtil.export(workbook, request, response,true);
-      Map<String, Object> exportMap = new HashMap<>();
+      Map<String, Object> exportMap = ExcelUtil.export(workbook, request, response,true);
       retmap.putAll(exportMap);
       retmap.put("status", "1");
     } catch (Exception e) {

src/weaver/interfaces/hostar/action/OutSignSyncAction.java

@@ -11,18 +11,14 @@ import weaver.interfaces.workflow.action.Action;
 import weaver.soa.workflow.request.Property;
 import weaver.soa.workflow.request.RequestInfo;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class OutSignSyncAction implements Action {
 
     BaseBean bb = new BaseBean();
-
     @Override
     public String execute(RequestInfo requestInfo) {
-        bb.writeLog("OutSignSyncAction-start");
+
         String startDate = "";
         String endDate = "";
         String resourceid = "";
@@ -65,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 operater in (?) ";
+                        "where operate_date > '" + startDate + "' and operate_date < '" + endDate + "' and operate in (?) ";
                 rs.executeQuery(acqOutSignSql, resourceid);
                 while (rs.next()) {
                     String signinfo = Util.null2String(rs.getString("signinfo"));

src/weaver/interfaces/hostar/job/AddOvertimeSignJob.java

@@ -1,7 +1,10 @@
 package weaver.interfaces.hostar.job;
 
 import com.engine.hostar.util.HostarUtil;
+import com.engine.kq.biz.KQGroupMemberComInfo;
+import com.engine.kq.biz.KQHolidaySetBiz;
 import com.engine.kq.biz.KQOvertimeRulesBiz;
+import jdk.management.resource.ResourceId;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tools.ant.util.DateUtils;
 import weaver.conn.RecordSet;