修改bug

Pu Zhibing

2024-09-29 adf2ede692b76cf95d0cec80f4087e52d760b219

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

@@ -77,20 +77,20 @@
    public String receiveRecord(Model model,Integer activityId){
        model.addAttribute("activityId",activityId);
        DriverActivity driverActivity = driverActivityService.selectById(activityId);
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        model.addAttribute("startTime", sdf.format(driverActivity.getStartTime()));
        model.addAttribute("endTime", sdf.format(driverActivity.getEndTime()));
        DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId).eq("type",1));
        model.addAttribute("id1",driverActivityRegistered.getId());
        model.addAttribute("id1", null == driverActivityRegistered ? 0 : driverActivityRegistered.getId());
        driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId).eq("type",2));
        model.addAttribute("id2",driverActivityRegistered.getId());
        model.addAttribute("id2", null == driverActivityRegistered ? 0 : driverActivityRegistered.getId());
        DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",1));
        model.addAttribute("id3",driverActivityOnline.getId());
        model.addAttribute("id3", null == driverActivityOnline ? 0 : driverActivityOnline.getId());
        //统计专车在线
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
        model.addAttribute("id4",driverActivityOnline.getId());
        model.addAttribute("id4", null == driverActivityOnline ? 0 : driverActivityOnline.getId());
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",3));
        model.addAttribute("id5",driverActivityOnline.getId());
        model.addAttribute("id5", null == driverActivityOnline ? 0 : driverActivityOnline.getId());
        DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",activityId));
        model.addAttribute("id6",driverActivityOrder.getId());
        return PREFIX + "receiveRecord.html";
@@ -149,28 +149,28 @@
        }
        map.put("money3",money);
        map.put("number3",number);
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
//        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
        //统计出租车在线
        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
//        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
        money=0d;
        number=0;
        for(DriverActivityHistory history:historyList){
            totalMOney+=history.getMoney();
            money+=history.getMoney();
            number+=1;
        }
//        for(DriverActivityHistory history:historyList){
//            totalMOney+=history.getMoney();
//            money+=history.getMoney();
//            number+=1;
//        }
        map.put("money4",money);
        map.put("number4",number);
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",3));
//        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",3));
        //统计城际在线
        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
//        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
        money=0d;
        number=0;
        for(DriverActivityHistory history:historyList){
            totalMOney+=history.getMoney();
            money+=history.getMoney();
            number+=1;
        }
//        for(DriverActivityHistory history:historyList){
//            totalMOney+=history.getMoney();
//            money+=history.getMoney();
//            number+=1;
//        }
        map.put("money5",money);
        map.put("number5",number);
        DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",activityId));
@@ -241,14 +241,16 @@
    @ResponseBody
    public Object add(String staTime, String startTime, String num1, Double num2
            , Double num3
            , Integer num4
            , String num4
            , Double num5
            , Integer num6
            , Double num7
            , Integer num8
            , Double num9
            , Integer num10
            , Double num11) {
            , Double num11
            , String num12
    ) {

        driverActivityService.insertOrUpdate(null,staTime,startTime,  num1,  num2
                ,  num3
@@ -259,7 +261,8 @@
                ,  num8
                ,  num9
                ,  num10
                ,  num11);
                ,  num11
        , num12);
        return SUCCESS_TIP;
    }

@@ -280,14 +283,16 @@
    @ResponseBody
    public Object update(Integer id,String staTime, String startTime, String num1, Double num2
            , Double num3
            , Integer num4
            , String num4
            , Double num5
            , Integer num6
            , Double num7
            , Integer num8
            , Double num9
            , Integer num10
            , Double num11) {
            , Double num11
            , String num12
    ) {
        driverActivityService.insertOrUpdate(id,staTime,startTime,  num1,  num2
                ,  num3
                ,  num4
@@ -297,7 +302,8 @@
                ,  num8
                ,  num9
                ,  num10
                ,  num11);
                ,  num11
        ,num12);
        return SUCCESS_TIP;
    }
    @RequestMapping(value = "/updateStatus")