Просмотр исходного кода

优化审批流&开发车辆显示

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
9baecc8b14
5 измененных файлов: 33 добавлений и 19 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java
  3. +21
    -8
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  4. +1
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  5. +8
    -0
      mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml

+ 1
- 1
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<Map<String,String>> 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");


+ 2
- 2
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<WxCarCmdLog, Long> {

List<Map<String, Object>> queryTodayCar(HashMap<Object,Object> params);

List<Map<String, Object>> queryWeekCarPay(HashMap<Object,Object> params);

List<MarkingSceneDataVo> queryForSceneRepotyHistoryCar(HashMap<String,Object> params);

List<Map<String,Object>> queryPlateNumberList(Map<String,Object> carParams);


+ 21
- 8
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<String, Object> datamap = new HashMap<>();
datamap.put("history", historymap);

// 查询近一周的缴费车辆----start------
HashMap<Object, Object> weekParams = new HashMap<>();
weekParams.put("tenantId", tenantId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
List<Date> 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<Map<String, Object>> oneWeekHistorylist = wxCarCmdLogMapper.queryHistory(params);
List<Map<String, Object>> oneWeekHistorylist = wxCarCmdLogMapper.queryHistory(weekParams);
Map<Object, Object> 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<String, Object> datamap = new HashMap<>();
datamap.put("history", historymap);
// 近一周缴费金额
weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode());
List<Map<String, Object>> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(weekParams);
Map<Object, Object> weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> {
return m.get("create_time");
}, m -> {
return m.get("carcount");
}));
TreeMap<Object, Object> weekMap = new TreeMap<>();
weekMap.putAll(weekCollect);
datamap.put("oneWeekCarPayFeeCount",weekMap);
// 查询近一周的缴费车辆----end------

//今日车流量
long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd"));


+ 1
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -108,13 +108,6 @@ public class WxFlowServiceImpl implements WxFlowService {
List<Map<String,String>> taskAssignee = (List)params.get("taskAssignee");
List<Map<String,String>> variables = (List)params.get("variables");

// 查询合同信息
// todo 去掉
// WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(businessId);
// if (wxRentContract == null) {
// return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND);
// }

// 设置节点处理人
HashMap<String, Object> map = new HashMap<>();
for (Map<String,String> taskAssigneeMap : taskAssignee) {
@@ -175,7 +168,7 @@ public class WxFlowServiceImpl implements WxFlowService {
String flowKey = getFlowKeyByType(flowType);

List<Task> 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<Map<String,Object>> result = new ArrayList<>();

for (Task task : tasks) {


+ 8
- 0
mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml Просмотреть файл

@@ -85,6 +85,14 @@
) c group by c.create_time order by c.create_time
</select>

<select id="queryWeekCarPay" resultType="hashmap" parameterType="hashmap">
select count(c.id) carcount,c.create_time from (
select id,DATE_FORMAT(create_date,'%m/%d') create_time
from wx_car_cmd_log where tenant_id = #{tenantId} and cmd_type=#{cmdType}
and create_date BETWEEN #{startdate} and #{enddate}
) c group by c.create_time order by c.create_time
</select>

<select id="queryForSceneRepotyHistoryCar" resultType="com.iformall.domain.vo.MarkingSceneDataVo" parameterType="hashmap">
select DATE_FORMAT(create_date,'%Y-%m-%d') xTime, count(c.id) triggerCount
from wx_car_cmd_log c where tenant_id = #{tenantId} and cmd_type=#{cmdType}


Загрузка…
Отмена
Сохранить