|
@@ -114,6 +114,26 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
|
+ public Result<Object> getDesignData(String date, Integer pageSize, Integer pageNo,Integer designRole) {
|
|
|
|
+ String[] split = date.split("-");
|
|
|
|
+ String year = split[0];
|
|
|
|
+ String monthStr = split[1];
|
|
|
|
+ String month = "";
|
|
|
|
+ if ("10".equals(month)) {
|
|
|
|
+ month = "10";
|
|
|
|
+ } else {
|
|
|
|
+ month = monthStr.replace("0", "");
|
|
|
|
+ }
|
|
|
|
+ Integer total = deliveryValidMapper.getDesignDataTotal(year, month,designRole);
|
|
|
|
+ PageHelper.startPage(pageNo, pageSize, true);
|
|
|
|
+ List<JSONObject> data = deliveryValidMapper.getDesignData(year, month,designRole);
|
|
|
|
+ PageInfo<JSONObject> page = new PageInfo<>();
|
|
|
|
+ page.setList(data);
|
|
|
|
+ page.setTotal(total);
|
|
|
|
+ return Result.OK(page);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
public Result<Object> projectData(String date, Integer pageSize, Integer pageNo) {
|
|
public Result<Object> projectData(String date, Integer pageSize, Integer pageNo) {
|
|
String[] split = date.split("-");
|
|
String[] split = date.split("-");
|
|
String year = split[0];
|
|
String year = split[0];
|