|
|
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
+import com.uas.platform.b2b.mobile.dao.FeePleaseDao;
|
|
|
import com.uas.platform.b2b.mobile.dao.FeePleaseDetailDao;
|
|
|
import com.uas.platform.b2b.mobile.model.FeePlease;
|
|
|
import com.uas.platform.b2b.mobile.model.FeePleaseDetail;
|
|
|
@@ -28,6 +29,9 @@ public class FeePleaseServiceImpl implements FeePleaseService {
|
|
|
@Autowired
|
|
|
private FeePleaseDetailDao feePleaseDetailDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private FeePleaseDao feePleaseDao;
|
|
|
+
|
|
|
@Override
|
|
|
public ModelMap saveFeePlease(FeePlease feePlease, List<FeePleaseDetail> feePleaseDetails) {
|
|
|
ModelMap map = new ModelMap();
|
|
|
@@ -45,19 +49,19 @@ public class FeePleaseServiceImpl implements FeePleaseService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public ModelMap getFeePlease(Long enuu, String emcode, Integer pageNumber, Integer pageSize) {
|
|
|
+ public ModelMap getFeePlease(Long enuu, Long emcode, Integer pageNumber, Integer pageSize) {
|
|
|
ModelMap map = new ModelMap();
|
|
|
final PageInfo pageInfo = new PageInfo();
|
|
|
pageInfo.setPageNumber(pageNumber);
|
|
|
pageInfo.setPageNumber(pageNumber);
|
|
|
- pageInfo.filter("fp_emcode", emcode);
|
|
|
+ pageInfo.filter("emcode", emcode);
|
|
|
pageInfo.filter("enuu", enuu);
|
|
|
- Page<FeePleaseDetail> feePleaseDetails = feePleaseDetailDao.findAll(new Specification<FeePleaseDetail>() {
|
|
|
- public Predicate toPredicate(Root<FeePleaseDetail> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
+ Page<FeePlease> feePleases = feePleaseDao.findAll(new Specification<FeePlease>() {
|
|
|
+ public Predicate toPredicate(Root<FeePlease> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
|
|
|
}
|
|
|
}, pageInfo);
|
|
|
- map.put("data", feePleaseDetails.getContent());
|
|
|
+ map.put("data", feePleases.getContent());
|
|
|
return map;
|
|
|
}
|
|
|
}
|