打卡自动对班

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

@@ -43,7 +43,7 @@ public class PunchButtonCmd extends AbstractCommonCommand<Map<String, Object>> {
     private HttpServletRequest request;
     private Map<String,Object> logMap = Maps.newHashMap();
     private Map<String,Object> workTimeEntityLogMap = Maps.newHashMap();
-    private final List<String> LIST = Arrays.asList("1", "8", "14","15");
+    private final List<String> LIST = new ArrayList<>();
 
     public PunchButtonCmd(HttpServletRequest request,Map<String, Object> params, User user) {
         this.request = request;
@@ -359,14 +359,21 @@ public class PunchButtonCmd extends AbstractCommonCommand<Map<String, Object>> {
 
         //增加自动排班
         kqLog.info("PunchButtonCmd.format in >>>>>userId" + userId + "kqDate==" + signDate+"format.groupId:"+groupid+"format.serialId:"+workTimeEntity.getSerialId());
+        //责任制考勤组id收集
+        rs.executeQuery("select kqzid from uf_zrzkqz");
+        while (rs.next()){
+            LIST.add(Util.null2String(rs.getString("kqzid")));
+        }
+        kqLog.info("PunchButtonCmd.LIST"+LIST);
         if(LIST.contains(groupid)&&StringUtils.isBlank(workTimeEntity.getSerialId())) {
             RecordSet rt = new RecordSet();
             //休息日或节假日给休息班次
-            int changeType = KQOvertimeRulesBiz.getChangeType(Util.null2String(userId), signDate);
-            kqLog.info("format.changeType:" + changeType);
+            //int changeType = KQOvertimeRulesBiz.getChangeType(Util.null2String(userId), signDate);
+            boolean holiday = KQHolidaySetBiz.isHoliday(Util.null2String(userId), signDate,true);
+            kqLog.info("format.holiday:" + holiday);
             String sql = "insert into kq_shiftschedule(kqdate,serialid,resourceid,groupid,isdelete)values(?,?,?,?,?)";
             //考勤当天是节假日或者休息日
-            if (changeType != 2) {
+            if (holiday) {
                 //休息班
                 boolean b = rt.executeUpdate(sql, signDate, "-1", Util.null2String(userId), groupid, "0");
                 kqLog.info("PunchButtonCmd.b1:" + b);

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

@@ -39,7 +39,7 @@ public class PunchOutButtonCmd extends AbstractCommonCommand<Map<String, Object>
   BaseBean bb = new BaseBean();
   private Map<String,Object> logMap = Maps.newHashMap();
   private Map<String,Object> workTimeEntityLogMap = Maps.newHashMap();
-  private final List<String> LIST = Arrays.asList("1", "8", "14","15");
+  private final List<String> LIST = new ArrayList<>();
 
   public PunchOutButtonCmd(HttpServletRequest request, Map<String, Object> params, User user) {
     this.request = request;
@@ -355,15 +355,22 @@ public class PunchOutButtonCmd extends AbstractCommonCommand<Map<String, Object>
           bb.writeLog("isok: " + isok);
           //自动对班
           kqLog.info("PunchOutButtonCmd.format in >>>>>userId" + userId + "kqDate==" + signDate+"format.groupId:"+groupid+"format.serialId:"+workTimeEntity.getSerialId());
+          //责任制考勤组id收集
+          rs.executeQuery("select kqzid from uf_zrzkqz");
+          while (rs.next()){
+            LIST.add(Util.null2String(rs.getString("kqzid")));
+          }
+          kqLog.info("PunchOutButtonCmd.LIST"+LIST);
           if(LIST.contains(groupid)&&StringUtils.isBlank(workTimeEntity.getSerialId())) {
             RecordSet rt = new RecordSet();
             boolean b;
             //休息日或节假日给休息班次
-            int changeType = KQOvertimeRulesBiz.getChangeType(Util.null2String(userId), signDate);
-            kqLog.info("format.changeType:" + changeType);
+            //int changeType = KQOvertimeRulesBiz.getChangeType(Util.null2String(userId), signDate);
+            boolean holiday = KQHolidaySetBiz.isHoliday(Util.null2String(userId), signDate,true);
+            kqLog.info("format.holiday:" + holiday);
             String sql = "insert into kq_shiftschedule(kqdate,serialid,resourceid,groupid,isdelete)values(?,?,?,?,?)";
             //考勤当天是节假日或者休息日
-            if (changeType != 2) {
+            if (holiday) {
               //休息班
                b = rt.executeUpdate(sql, signDate, "-1", Util.null2String(userId), groupid, "0");
               kqLog.info("PunchOutButtonCmd.b1:" + b);