From bf8f55aaa9a3c74d9d48810305ac791d7adeba9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 17 Dec 2024 15:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BC=95=E7=94=A8=E7=8F=AD?=
 =?UTF-8?q?=E6=AC=A1=E7=BB=99=E5=87=BA=E6=8C=89=E9=92=AE=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RemoteAttend4SalaryServiceImpl.java  | 25 ++++++++++++++++---
 .../sys/constant/SalarySysConstant.java       |  3 +++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
index eeddfd41d..c54bbf10b 100644
--- a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
+++ b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
@@ -2,12 +2,15 @@ package com.engine.salary.remote.attend.service.impl;
 
 import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.kq.cmd.report.GetKQReportCmd;
 import com.engine.salary.mapper.datacollection.AttendQuoteFieldMapper;
 import com.engine.salary.remote.attend.cmd.GetSearchListCmd;
 import com.engine.salary.remote.attend.entity.Attend4Salary;
 import com.engine.salary.remote.attend.service.RemoteAttend4SalaryService;
+import com.engine.salary.sys.service.SalarySysConfService;
+import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
@@ -20,11 +23,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import weaver.general.BaseBean;
 import weaver.general.Util;
+import weaver.hrm.User;
 
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.engine.salary.sys.constant.SalarySysConstant.ATTENDANCE_SERIAL_COLLECTION_BTN;
+
 @Slf4j
 public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAttend4SalaryService {
     private final Boolean isLog = "true".equals(new BaseBean().getPropValue("hrmSalary", "log"));
@@ -33,12 +39,23 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
         return MapperProxyFactory.getProxy(AttendQuoteFieldMapper.class);
     }
 
+    private SalarySysConfService getSalarySysConfService(User user) {
+        return ServiceUtil.getService(SalarySysConfServiceImpl.class, user);
+    }
+
+    //是否采集考勤班次数据
+    boolean isCollectAttendanceSerial = "1".equals(getSalarySysConfService(user).getValueByCode(ATTENDANCE_SERIAL_COLLECTION_BTN));
+
+
     @Override
     public List<Map<String, String>> getColumns() {
 
-        //兼容获取班次信息字段
-        List<String> attendanceSerials = getAttendQuoteFieldMapper().getAttendanceSerials();
-        String attendanceSerial = Joiner.on(",").join((Iterable<?>) attendanceSerials);
+        //是否采集考勤班次数据
+        String attendanceSerial = "";
+        if (isCollectAttendanceSerial) {
+            List<String> attendanceSerials = getAttendQuoteFieldMapper().getAttendanceSerials();
+            attendanceSerial = Joiner.on(",").join((Iterable<?>) attendanceSerials);
+        }
 
         Map<String, Object> paramsMap = new HashMap<String, Object>();
         paramsMap.put("typeselect", "3");
@@ -146,7 +163,7 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
             paramsMap.put("resourceId", String.join(",", resourceIds));
             paramsMap.put("isNoAccount", "1");
             //班次
-            paramsMap.put("attendanceSerial", attend4Salary.getAttendanceSerial());
+            paramsMap.put("attendanceSerial", isCollectAttendanceSerial ? attend4Salary.getAttendanceSerial() : "");
             paramsMap.put("isFromMyAttendance", "1");
             Map<String, Object> temp = new HashMap<String, Object>();
             temp.put("data", JSONObject.toJSONString(paramsMap));
diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java
index 4f5966095..7a3c052be 100644
--- a/src/com/engine/salary/sys/constant/SalarySysConstant.java
+++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java
@@ -214,4 +214,7 @@ public class SalarySysConstant {
      * 快照时间点
      */
     public static final String SHOT_EMP_TIME_TYPE = "SHOT_EMP_TIME_TYPE";
+
+    //是否采集考勤班次数据,0：关闭  1：开启
+    public static final String ATTENDANCE_SERIAL_COLLECTION_BTN = "ATTENDANCE_SERIAL_COLLECTION_BTN";
 }