|
@@ -10,6 +10,7 @@ import com.boman.domain.GenTable;
|
|
|
import com.boman.domain.GenTableColumn;
|
|
|
import com.boman.domain.constant.FormDataConstant;
|
|
|
import com.boman.domain.dto.*;
|
|
|
+import com.boman.web.core.mapper.AttendanceMapper;
|
|
|
import com.boman.web.core.mapper.StandardlyMapper;
|
|
|
import com.boman.web.core.service.TableServiceCmdService;
|
|
|
import com.boman.web.core.service.attendance.rules.AttendanceRulesService;
|
|
@@ -61,6 +62,8 @@ public class AttendanceServiceImpl implements AttendanceService {
|
|
|
private IBaseSelectService selectService;
|
|
|
@Autowired
|
|
|
private StandardlyMapper standardlyMapper;
|
|
|
+ @Autowired
|
|
|
+ private AttendanceMapper attendanceMapper;
|
|
|
|
|
|
/**
|
|
|
* 功能描述: 根据tableName和userId查找当月考勤
|
|
@@ -443,7 +446,7 @@ public class AttendanceServiceImpl implements AttendanceService {
|
|
|
List<GenTableColumn> columns = genTable.getColumns();
|
|
|
JSONObject packCondition = ifNullSetEmpty(selectService.packColCondition(columns, condition));
|
|
|
JSONObject result = new JSONObject();
|
|
|
- List<JSONObject> rows = selectService.selectByCondition(tableName, condition, packCondition, null, dto);
|
|
|
+ List<JSONObject> rows = attendanceMapper.selectByCondition(tableName);
|
|
|
|
|
|
List<Map<String, Object>> detailedRecordList = new ArrayList<>();
|
|
|
if (isEmpty(rows)) {
|