Commit 1322ac77 authored by lwy's avatar lwy

工时管理

parent 18d885fa
...@@ -26,7 +26,7 @@ public interface ITimesheetService ...@@ -26,7 +26,7 @@ public interface ITimesheetService
* @param timesheet 工时记录 * @param timesheet 工时记录
* @return 工时记录集合 * @return 工时记录集合
*/ */
public List<TimesheetVo> selectTimesheetList(Timesheet timesheet); // public List<TimesheetVo> selectTimesheetList(Timesheet timesheet);
/** /**
* 新增工时记录 * 新增工时记录
......
...@@ -4,6 +4,7 @@ import java.math.BigDecimal; ...@@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
//import com.ruoyi.domain.TimesheetVo;
import com.ruoyi.domain.TimesheetVo; import com.ruoyi.domain.TimesheetVo;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -42,7 +43,7 @@ public class TimesheetServiceImpl implements ITimesheetService ...@@ -42,7 +43,7 @@ public class TimesheetServiceImpl implements ITimesheetService
* @param timesheet 工时记录 * @param timesheet 工时记录
* @return 工时记录 * @return 工时记录
*/ */
@Override /* @Override
public List<TimesheetVo> selectTimesheetList(Timesheet timesheet) public List<TimesheetVo> selectTimesheetList(Timesheet timesheet)
{ {
// 执行查询 // 执行查询
...@@ -63,7 +64,7 @@ public class TimesheetServiceImpl implements ITimesheetService ...@@ -63,7 +64,7 @@ public class TimesheetServiceImpl implements ITimesheetService
return timesheetVos; return timesheetVos;
// return timesheetMapper.selectTimesheetList(timesheet); // return timesheetMapper.selectTimesheetList(timesheet);
} }*/
/** /**
* 新增工时记录 * 新增工时记录
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment