From 253a101494162d52dbc8f7a246a49af10114add9 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 18 Oct 2021 10:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TripReportController.java | 11 +- .../modules/epidemic/dao/TripReportDao.java | 7 +- .../epidemic/excel/TripReportExcel.java | 126 +++++++++--------- .../epidemic/service/TripReportService.java | 7 +- .../service/impl/TripReportServiceImpl.java | 10 ++ .../mapper/epidemic/TripReportDao.xml | 33 ++++- 6 files changed, 115 insertions(+), 79 deletions(-) diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java index dc43efd..37b417e 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java @@ -25,10 +25,8 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.dto.GetTripInfoFormDTO; -import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; -import com.elink.esua.epdc.dto.TripReportDTO; -import com.elink.esua.epdc.dto.TripReportDetailDTO; +import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.modules.epidemic.dao.TripReportDao; import com.elink.esua.epdc.modules.epidemic.excel.TripReportExcel; import com.elink.esua.epdc.modules.epidemic.service.TripReportService; import org.springframework.beans.factory.annotation.Autowired; @@ -52,6 +50,9 @@ public class TripReportController { @Autowired private TripReportService tripReportService; + @Autowired + private TripReportDao tripReportDao; + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = tripReportService.getPageList(params); @@ -90,7 +91,7 @@ public class TripReportController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = tripReportService.list(params); + List list = tripReportService.exportPage(params); ExcelUtils.exportExcelToTarget(response, null, list, TripReportExcel.class); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java index 78e6563..a1aa30b 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java @@ -18,10 +18,7 @@ package com.elink.esua.epdc.modules.epidemic.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.GetTripInfoFormDTO; -import com.elink.esua.epdc.dto.TripListDTO; -import com.elink.esua.epdc.dto.TripReportDTO; -import com.elink.esua.epdc.dto.TripReportDetailDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -57,4 +54,6 @@ public interface TripReportDao extends BaseDao { * @return com.elink.esua.epdc.dto.TripReportDetailDTO */ TripReportDetailDTO selectDetailById(@Param("id") String id); + + List exportPage(Map params); } \ No newline at end of file diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java index 9ffa418..042a6d3 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java @@ -20,8 +20,6 @@ package com.elink.esua.epdc.modules.epidemic.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; -import java.util.Date; - /** * 行程上报信息 * @@ -31,8 +29,8 @@ import java.util.Date; @Data public class TripReportExcel { - @Excel(name = "ID") - private String id; +// @Excel(name = "ID") +// private String id; @Excel(name = "姓名") private String name; @@ -43,77 +41,77 @@ public class TripReportExcel { @Excel(name = "身份证") private String idCard; - @Excel(name = "现居住地编码") - private String nowAddressCode; +// @Excel(name = "现居住地编码") +// private String nowAddressCode; - @Excel(name = "现居住地名称") + @Excel(name = "现居住地") private String nowAddressName; @Excel(name = "现居住详细地址") private String nowAddressDetail; - @Excel(name = "来自地区编码") - private String comeAddressCode; +// @Excel(name = "来自地区编码") +// private String comeAddressCode; - @Excel(name = "来自地区名称") + @Excel(name = "来自地区") private String comeAddressName; - @Excel(name = "来到(本地)时间") - private Date comeDate; - - @Excel(name = "返回时间") - private Date backDate; - - @Excel(name = "备注") +// @Excel(name = "来到(本地)时间") +// private Date comeDate; +// +// @Excel(name = "返回时间") +// private Date backDate; +// +// @Excel(name = "备注") private String note; - @Excel(name = "用户id") - private String userId; - - @Excel(name = "手机号") - private String userMobile; - - @Excel(name = "真实姓名") - private String realName; - - @Excel(name = "头像") - private String faceImg; - - @Excel(name = "部门ID") - private String deptId; - - @Excel(name = "部门名称") - private String deptName; - - @Excel(name = "所有部门ID") - private String allDeptIds; - - @Excel(name = "所有部门名称") - private String allDeptNames; - - @Excel(name = "父所有部门") - private String parentDeptIds; - - @Excel(name = "父所有部门") - private String parentDeptNames; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - @Excel(name = "逻辑删除标识") - private String delFlag; +// @Excel(name = "用户id") +// private String userId; +// +// @Excel(name = "手机号") +// private String userMobile; +// +// @Excel(name = "真实姓名") +// private String realName; +// +// @Excel(name = "头像") +// private String faceImg; +// +// @Excel(name = "部门ID") +// private String deptId; +// +// @Excel(name = "部门名称") +// private String deptName; +// +// @Excel(name = "所有部门ID") +// private String allDeptIds; +// +// @Excel(name = "所有部门名称") +// private String allDeptNames; +// +// @Excel(name = "父所有部门") +// private String parentDeptIds; +// +// @Excel(name = "父所有部门") +// private String parentDeptNames; +// +// @Excel(name = "乐观锁") +// private Integer revision; +// +// @Excel(name = "创建人") +// private String createdBy; + + @Excel(name = "上报时间") + private String createdTime; + +// @Excel(name = "更新人") +// private String updatedBy; +// +// @Excel(name = "更新时间") +// private Date updatedTime; +// +// @Excel(name = "逻辑删除标识") +// private String delFlag; } \ No newline at end of file diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java index 51aa479..a546ea7 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java @@ -20,10 +20,7 @@ package com.elink.esua.epdc.modules.epidemic.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.GetTripInfoFormDTO; -import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; -import com.elink.esua.epdc.dto.TripReportDTO; -import com.elink.esua.epdc.dto.TripReportDetailDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity; import java.util.List; @@ -134,4 +131,6 @@ public interface TripReportService extends BaseService { Result deleteTripById(GetTripInfoFormDTO formDto); PageData getPageList(Map params); + + List exportPage(Map params); } \ No newline at end of file diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java index 4f290c3..a7cd5e0 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java @@ -24,6 +24,8 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; @@ -67,11 +69,19 @@ public class TripReportServiceImpl extends BaseServiceImpl getPageList(Map params) { + + UserDetail user = SecurityUser.getUser(); IPage page = getPage(params); + params.put("deptIdList", user.getDeptIdList()); List list = baseDao.getPageList(params); return new PageData<>(list, page.getTotal()); } + @Override + public List exportPage(Map params) { + return baseDao.exportPage(params); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml index 8d1017c..5fe1694 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml +++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml @@ -66,14 +66,43 @@ AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + + and dept_id in + + #{id} + + order by CREATED_TIME desc - - + \ No newline at end of file