添加 app报表接口

guoyujie

2025-10-28 bf88860c7a8776c8218bafd2324def5210c0249c

添加 app报表接口

 north-glass-erp/src/main/java/com/example/erp/controller/AppController.java

@@ -2,6 +2,7 @@

import com.example.erp.common.Result;
import com.example.erp.entity.sd.Order;
import com.example.erp.service.sd.DeliveryService;
import com.example.erp.service.sd.OrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,10 +21,17 @@
@Api(value="App专属接口",tags={"App专属接口"})
public class AppController {
    private final OrderService orderService;
    private final DeliveryService deliveryService;

    @ApiOperation("订单报表")
    @PostMapping("/getOrderList")
    public Result getOrderList(@RequestBody List<LocalDate> dates) {
    public Result getOrderList(@RequestBody List<String> dates) {
        return Result.success(orderService.appGetOrderList(dates));
    }

    @ApiOperation("发货报表")
    @PostMapping("/getDeliveryList")
    public Result getDeliveryList(@RequestBody List<String> dates) {
        return Result.success(deliveryService.appGetDeliveryList(dates));
    }
}

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java

@@ -63,5 +63,5 @@
    boolean updateDeliveryPrintNumber(@Param("deliveryId") String deliveryId);



    List<Delivery> selectByDate(String startDate, String endDate);
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java

@@ -968,4 +968,27 @@
    }


    public Object appGetDeliveryList(List<String> dates) {
        //设置当前时间
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(30).toString();
        if(dates !=null && dates.size()==2){
            if(dates.get(0) != null){
                startDate = String.valueOf(dates.get(0));
            }
            if(dates.get(1) != null){
                endDate = String.valueOf(dates.get(1));
            }
        }
        List<String> date = new ArrayList<>();
        date.add(startDate);
        date.add(endDate);

        List<Delivery> deliveryList = deliveryMapper.selectByDate(startDate, endDate);
        Map<String,Object> map = new HashMap<>();
        map.put("data",deliveryList);
        map.put("date",date);

        return map;
    }
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -29,6 +29,7 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -1024,7 +1025,8 @@
        return true;
    }

    public Map<String,Object> appGetOrderList(List<LocalDate> dates) {
    public Map<String,Object> appGetOrderList(List<String> dates) {
        //设置当前时间
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(30).toString();
        if(dates !=null && dates.size()==2){
@@ -1035,6 +1037,11 @@
                endDate = String.valueOf(dates.get(1));
            }
        }
        List<String> date = new ArrayList<>();
        date.add(startDate);
        date.add(endDate);


        List<Order> list = orderMapper.selectList(new LambdaQueryWrapper<Order>()
                .gt(Order::getCreateOrder,0)
                .between(Order::getCreateTime,startDate, endDate)
@@ -1042,8 +1049,8 @@

        Map<String,Object> map = new HashMap<>();
        map.put("data",list);
        map.put("date",date);

        return map;
        //return orderMapper.
    }
}

 north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml

@@ -373,6 +373,10 @@

    </update>

    <select id="selectByDate">
        select * from sd.delivery
        where create_time between #{startDate} and #{endDate}
    </select>


</mapper>