From 784a24a80896f2a31cba72887b75d30bf0f645da Mon Sep 17 00:00:00 2001 From: xyh <18782104331@139.com> Date: 星期一, 28 六月 2021 10:12:45 +0800 Subject: [PATCH] 合并代码 --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java index 24f82c6..b01bcf4 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java @@ -1,5 +1,7 @@ package com.panzhihua.service_grid.service.impl; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,10 +10,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.enums.EventTasksStatusEnum; import com.panzhihua.common.enums.PopulPoliticalOutlookEnum; -import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO; -import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO; -import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO; -import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO; +import com.panzhihua.common.model.dtos.EventResourceDTO; +import com.panzhihua.common.model.dtos.grid.*; +import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO; import com.panzhihua.common.model.helper.AESUtil; import com.panzhihua.common.model.query.visit.EventTasksQuery; import com.panzhihua.common.model.query.visit.EventVisitListQuery; -- Gitblit v1.7.1