diff --git a/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java b/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java index df6b63e25..1c89b771e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java +++ b/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java @@ -23,7 +23,7 @@ public class ContractTaskFinishHandler implements TaskListener { public void notify(DelegateTask delegateTask) { Long businessId = (Long)delegateTask.getVariable("businessId"); List> variables = (List)delegateTask.getVariable("variables"); - Integer flowType = (Integer)delegateTask.getVariable("businessType"); + Integer flowType = (Integer)delegateTask.getVariable("flowType"); Integer contractType = 0; String str = WxFlowServiceImpl.getVariableByKey(variables,"contractType"); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index b85f7c48f..eb39141f4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -3,8 +3,6 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCarCmdLog; import com.iformall.domain.vo.MarkingSceneDataVo; -import org.apache.ibatis.annotations.Param; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,6 +18,8 @@ public interface WxCarCmdLogMapper extends CommonMapper { List> queryTodayCar(HashMap params); + List> queryWeekCarPay(HashMap params); + List queryForSceneRepotyHistoryCar(HashMap params); List> queryPlateNumberList(Map carParams); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index ff3523ed8..cae19b0b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -505,27 +505,40 @@ public class DataTowerServiceImpl implements DataTowerService { historymap.put(date.substring(5).replace("-", "/"), o); } } + Map datamap = new HashMap<>(); + datamap.put("history", historymap); // 查询近一周的缴费车辆----start------ + HashMap weekParams = new HashMap<>(); + weekParams.put("tenantId", tenantId); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List days = DateUtils.dateToWeek(new Date()); String oneWeekStartdate = sdf.format(days.get(0)); String oneWeekEndDate = sdf.format(days.get(days.size()-1)); - params.put("startdate", oneWeekStartdate + " 00:00:00"); - params.put("enddate", oneWeekEndDate + " 23:59:59"); + weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); + weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); + weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); - List> oneWeekHistorylist = wxCarCmdLogMapper.queryHistory(params); + List> oneWeekHistorylist = wxCarCmdLogMapper.queryHistory(weekParams); Map oneWeekCollect = oneWeekHistorylist.stream().collect(Collectors.toMap(m -> { return m.get("create_date"); }, m -> { return m.get("carcount"); })); - historymap.put("oneWeekCarCount",oneWeekCollect.get("carcount")); - historymap.put("oneWeekCarCount",oneWeekCollect.get("carcount")); - // 查询近一周的缴费车辆----end------ + datamap.put("oneWeekCarPayCount",oneWeekCollect.get("carcount")==null?0:oneWeekCollect.get("carcount")); - Map datamap = new HashMap<>(); - datamap.put("history", historymap); + // 近一周缴费金额 + weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); + List> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(weekParams); + Map weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> { + return m.get("create_time"); + }, m -> { + return m.get("carcount"); + })); + TreeMap weekMap = new TreeMap<>(); + weekMap.putAll(weekCollect); + datamap.put("oneWeekCarPayFeeCount",weekMap); + // 查询近一周的缴费车辆----end------ //今日车流量 long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd")); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index c20873096..3ab9e884e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -108,13 +108,6 @@ public class WxFlowServiceImpl implements WxFlowService { List> taskAssignee = (List)params.get("taskAssignee"); List> variables = (List)params.get("variables"); - // 查询合同信息 - // todo 去掉 -// WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(businessId); -// if (wxRentContract == null) { -// return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); -// } - // 设置节点处理人 HashMap map = new HashMap<>(); for (Map taskAssigneeMap : taskAssignee) { @@ -175,7 +168,7 @@ public class WxFlowServiceImpl implements WxFlowService { String flowKey = getFlowKeyByType(flowType); List tasks = taskService.createTaskQuery().processDefinitionKey(flowKey) - .taskCandidateUser(userId.toString()).orderByTaskCreateTime().desc().listPage((pageNum -1) * pageSize,pageSize); + .taskCandidateUser(userId.toString()).orderByTaskCreateTime().desc().listPage((pageNum -1) * pageSize,pageSize); List> result = new ArrayList<>(); for (Task task : tasks) { diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index c6a675023..4268fd0b7 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -85,6 +85,14 @@ ) c group by c.create_time order by c.create_time + +