修改bug和管理后台报表

Pu Zhibing

5 天以前 b1f2f102034b4433201225b67a9fc78c08e532f0

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java

@@ -63,6 +63,9 @@
    private ITUserService appUserService;
    @Autowired
    private IOrderCancelService orderCancelService;
    
    @Autowired
    private ITCompanyService companyService;

    public static void main(String[] args) {
        // 获取今天的日期
@@ -99,6 +102,8 @@
     */
    @RequestMapping("/commission")
    public String index( Model model) {
        List<TCompany> tCompanies = companyService.selectList(new EntityWrapper<TCompany>().eq("state", 0).ne("flag", 3));
        model.addAttribute("company", tCompanies);
        return PREFIX + "commission.html";
    }

@@ -117,7 +122,7 @@
     */
    @RequestMapping(value = "/commission/getCount")
    @ResponseBody
    public Object getCount(Integer time,String insertTime,Integer state) {
    public Object getCount(Integer time,String insertTime,Integer state, Integer company) {
        if (time == null){
            time =1;
        }
@@ -246,7 +251,9 @@
                    if (tOrderPrivateCar==null){
                        continue;
                    }

                    if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
                        continue;
                    }
                    platformVO.setMoney(new BigDecimal(income.getMoney()));
                    if (tOrderPrivateCar.getState()!=10 && tOrderPrivateCar.getPayType() == null){
                        continue;
@@ -268,7 +275,9 @@
                    if (tOrderLogistics==null){
                        continue;
                    }

                    if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
                        continue;
                    }
                    platformVO.setMoney(new BigDecimal(income.getMoney()));

                    if (tOrderLogistics.getState()!=10 && tOrderLogistics.getPayType() == null){
@@ -289,6 +298,9 @@
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(settlementDetail.getOrderId());

                    if (tOrderPrivateCar==null){
                        continue;
                    }
                    if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
                        continue;
                    }
                    platformVO.setCode(tOrderPrivateCar.getOrderNum());
@@ -329,6 +341,9 @@
                    TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(settlementDetail.getOrderId());

                    if (tOrderLogistics==null){
                        continue;
                    }
                    if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
                        continue;
                    }
                    String string1 = settlementDetail.getPrice().toString();
@@ -1716,7 +1731,7 @@
     */
    @RequestMapping(value = "/commission/list")
    @ResponseBody
    public Object list(Integer time,String insertTime,Integer state) {
    public Object list(Integer time,String insertTime,Integer state, Integer company) {

        if (time == null){
            time =1;
@@ -1873,6 +1888,9 @@
                    if (tOrderPrivateCar==null){
                        continue;
                    }
                    if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
                        continue;
                    }
                    platformVO.setCode(tOrderPrivateCar.getOrderNum());
                    TDriver tDriver = driverMap.get(tOrderPrivateCar.getDriverId());
                    if (tDriver != null){
@@ -1941,6 +1959,9 @@
                    TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(income.getIncomeId());

                    if (tOrderLogistics==null){
                        continue;
                    }
                    if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
                        continue;
                    }
                    platformVO.setCode(tOrderLogistics.getOrderNum());
@@ -2012,6 +2033,10 @@
                    if (tOrderPrivateCar==null){
                        continue;
                    }
    
                    if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
                        continue;
                    }
                    platformVO.setCode(tOrderPrivateCar.getOrderNum());
                    TDriver tDriver = driverMap.get(tOrderPrivateCar.getDriverId());
                    if (tDriver!=null){
@@ -2058,6 +2083,10 @@
                    if (tOrderLogistics==null){
                        continue;
                    }
    
                    if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
                        continue;
                    }
                    platformVO.setCode(tOrderLogistics.getOrderNum());
                    TDriver tDriver1 = driverMap.get(tOrderLogistics.getDriverId());
                    if (tDriver1!=null){