lims-ruoyi-after.git

			@@ -12,27 +12,28 @@
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.google.common.util.concurrent.AtomicDouble;
			import com.ruoyi.common.core.domain.entity.SysDictData;
			import com.ruoyi.common.core.domain.entity.User;
			import com.ruoyi.common.enums.*;
			import com.ruoyi.common.utils.api.icc.IccApiUtil;
			import com.ruoyi.common.utils.api.icc.model.GetResultPageRequest;
			import com.ruoyi.common.utils.api.icc.model.GetResultPageResponse;

			import com.ruoyi.performance.dto.PerformanceShiftMapDto;
			import com.ruoyi.performance.dto.StaffAttendanceDTO;
			import com.ruoyi.performance.excel.StaffAttendanceAnnotationTextExcelData;
			import com.ruoyi.performance.excel.StaffAttendanceExcelData;
			import com.ruoyi.performance.excel.handler.attendance.CommentWriteHandler;
			import com.ruoyi.performance.mapper.StaffAttendanceTrackingRecordMapper;
			import com.ruoyi.performance.pojo.StaffAttendanceTrackingRecord;
			import com.ruoyi.performance.service.StaffAttendanceTrackingRecordService;
			import com.ruoyi.performance.dto.PerformanceShiftMapDto;
			import com.ruoyi.performance.mapper.PerformanceShiftMapper;
			import com.ruoyi.performance.mapper.ShiftTimeMapper;
			import com.ruoyi.performance.mapper.StaffAttendanceTrackingRecordMapper;
			import com.ruoyi.performance.pojo.ShiftTime;
			import com.ruoyi.performance.pojo.StaffAttendanceTrackingRecord;
			import com.ruoyi.performance.service.StaffAttendanceTrackingRecordService;
			import com.ruoyi.performance.utils.HourDiffCalculator;
			import com.ruoyi.performance.utils.TimeDiffCalculator;
			import com.ruoyi.performance.vo.StaffAttendanceVO;
			import com.ruoyi.system.mapper.UserMapper;
			import com.ruoyi.system.service.ISysDictTypeService;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang3.ObjectUtils;
			import org.apache.commons.lang3.StringUtils;
			@@ -71,6 +72,9 @@
			private IccApiUtil iccApiUtil;

			@Autowired
			private ISysDictTypeService sysDictTypeService;

			@Autowired
			private PerformanceShiftMapper performanceShiftMapper;

			@Autowired
			@@ -105,21 +109,6 @@
			private static final String maternityLeaveKeyword = "产";//产假班次关键字

			/**
			* 同步的门禁设备列表
			* channel_name device_code
			* 10.100.22.2_门禁通道_1 1001538
			* 10.100.22.3_门禁通道_1 1001539
			* 10.100.22.4_门禁通道_1 1001540
			* 10.100.22.5_门禁通道_1 1001541
			* 10.100.22.12_门禁通道_1 1001626
			* 10.100.22.13_门禁通道_1 1001627
			* 10.100.22.14_门禁通道_1 1001628
			* 10.100.22.15_门禁通道_1 1001629
			*/
			private final static List<String> syncDeviceCode = Arrays.asList("1001538", "1001539", "1001540", "1001541",
			"1001626", "1001627", "1001628", "1001629");

			/**
			* 上班时间判定边界小时数
			*/
			private final static long WORK_TIME_BOUNDARY = 2L;
			@@ -130,7 +119,9 @@
			if (ObjectUtil.isAllEmpty(startDate, endDate)) {
			throw new RuntimeException("同步日期不能为空");
			}

			//查询门禁设备字典列表
			List<SysDictData> performanceIccDevice = sysDictTypeService.selectDictDataByType("performance_icc_device");
			Set<String> syncDeviceCode = performanceIccDevice.stream().map(SysDictData::getDictValue).collect(Collectors.toSet());
			// 查询已同步的记录
			List<Long> trackingRecordIccIdList = baseMapper.selectIccIdList();
			try {

	basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -69,7 +69,7 @@
			return null;
			}
			String[] split = insSample.getFactory().split(" - ");
			split[3] = split[3].replace("- ", "");
			// split[3] = split[3].replace("- ", "");
			String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
			list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree, insSample.getIsCableTag());
			if (list.isEmpty()) {