|
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.ui.ModelMap;
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
|
|
|
|
+import com.uas.platform.b2b.mobile.dao.WorkOvertimeDao;
|
|
|
import com.uas.platform.b2b.mobile.dao.WorkOvertimeDetDao;
|
|
import com.uas.platform.b2b.mobile.dao.WorkOvertimeDetDao;
|
|
|
import com.uas.platform.b2b.mobile.model.WorkOvertime;
|
|
import com.uas.platform.b2b.mobile.model.WorkOvertime;
|
|
|
import com.uas.platform.b2b.mobile.model.WorkOvertimeDet;
|
|
import com.uas.platform.b2b.mobile.model.WorkOvertimeDet;
|
|
@@ -28,6 +29,9 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private WorkOvertimeDetDao workOvertimeDetDao;
|
|
private WorkOvertimeDetDao workOvertimeDetDao;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private WorkOvertimeDao workOvertimeDao;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public ModelMap saveWorkOvertime(WorkOvertime workOvertime, List<WorkOvertimeDet> workOvertimeDets) {
|
|
public ModelMap saveWorkOvertime(WorkOvertime workOvertime, List<WorkOvertimeDet> workOvertimeDets) {
|
|
|
ModelMap map = new ModelMap();
|
|
ModelMap map = new ModelMap();
|
|
@@ -52,8 +56,8 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
|
|
|
pageInfo.setPageNumber(pageNumber);
|
|
pageInfo.setPageNumber(pageNumber);
|
|
|
pageInfo.filter("emcode", emcode);
|
|
pageInfo.filter("emcode", emcode);
|
|
|
pageInfo.filter("enuu", enuu);
|
|
pageInfo.filter("enuu", enuu);
|
|
|
- Page<WorkOvertimeDet> workOvertimeDets = workOvertimeDetDao.findAll(new Specification<WorkOvertimeDet>() {
|
|
|
|
|
- public Predicate toPredicate(Root<WorkOvertimeDet> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
|
|
|
|
+ Page<WorkOvertime> workOvertimeDets = workOvertimeDao.findAll(new Specification<WorkOvertime>() {
|
|
|
|
|
+ public Predicate toPredicate(Root<WorkOvertime> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
|
|
return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
|
|
|
}
|
|
}
|
|
|
}, pageInfo);
|
|
}, pageInfo);
|