java/IgoTravel.git

			@@ -4,27 +4,27 @@
			import com.baomidou.mybatisplus.plugins.Page;
			import com.stylefeng.guns.core.base.controller.BaseController;
			import com.stylefeng.guns.core.common.constant.factory.PageFactory;
			import com.stylefeng.guns.core.log.LogObjectHolder;
			import com.stylefeng.guns.core.shiro.ShiroKit;
			import com.stylefeng.guns.core.shiro.ShiroUser;
			import com.stylefeng.guns.core.util.DateUtil;
			import com.stylefeng.guns.core.util.SinataUtil;
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Controller;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.ResponseBody;
			import org.springframework.ui.Model;
			import org.springframework.web.bind.annotation.PathVariable;
			import org.springframework.beans.factory.annotation.Autowired;
			import com.stylefeng.guns.core.log.LogObjectHolder;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RequestParam;
			import org.springframework.web.bind.annotation.ResponseBody;

			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.util.Date;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			/**
			* 控制器
			@@ -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";
			@@ -117,11 +117,10 @@
			List<DriverActivityHistory> historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",1).eq("activityId",driverActivityRegistered.getId()).eq("carryOut",2));
			Double totalMOney=0d;
			Double money=0d;
			Integer number=0;
			Integer number=historyList.stream().map(DriverActivityHistory::getDriverId).collect(Collectors.toSet()).size();
			for(DriverActivityHistory history:historyList){
			totalMOney+=history.getMoney();
			money+=history.getMoney();
			number+=1;
			}
			map.put("money1",money);
			map.put("number1",number);
			@@ -129,11 +128,10 @@
			//统计邀请用户注册
			historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",2).eq("activityId",driverActivityRegistered.getId()).eq("carryOut",2));
			money=0d;
			number=0;
			number=historyList.stream().map(DriverActivityHistory::getDriverId).collect(Collectors.toSet()).size();
			for(DriverActivityHistory history:historyList){
			totalMOney+=history.getMoney();
			money+=history.getMoney();
			number+=1;
			}
			map.put("money2",money);
			map.put("number2",number);
			@@ -141,47 +139,45 @@
			//统计专车在线
			historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
			money=0d;
			number=0;
			number=historyList.stream().map(DriverActivityHistory::getDriverId).collect(Collectors.toSet()).size();
			for(DriverActivityHistory history:historyList){
			totalMOney+=history.getMoney();
			money+=history.getMoney();
			number+=1;
			}
			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));
			//统计订单数
			historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",4).eq("activityId",driverActivityOrder.getId()).eq("carryOut",2));
			money=0d;
			number=0;
			number=historyList.stream().map(DriverActivityHistory::getDriverId).collect(Collectors.toSet()).size();
			for(DriverActivityHistory history:historyList){
			totalMOney+=history.getMoney();
			money+=history.getMoney();
			number+=1;
			}
			map.put("money6",money);
			map.put("number6",number);
			@@ -241,14 +237,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 +257,8 @@
			, num8
			, num9
			, num10
			, num11);
			, num11
			, num12);
			return SUCCESS_TIP;
			}

			@@ -280,14 +279,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 +298,8 @@
			, num8
			, num9
			, num10
			, num11);
			, num11
			,num12);
			return SUCCESS_TIP;
			}
			@RequestMapping(value = "/updateStatus")