From d32699ff57ffd603b784189f18076e9fafa0eeef Mon Sep 17 00:00:00 2001 From: pengwei Date: Mon, 26 May 2025 11:10:52 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=89=80=E6=9C=89=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E3=80=81=E5=8F=8A=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAyyyy-mm-dd=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E6=97=B6=E9=97=B4=20(=E5=AE=8C?= =?UTF-8?q?=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/ConfinementController.java | 20 ++-- .../supervision/mapper/ConfinementMapper.java | 2 + .../pojo/vo/ConfinementExcelVo.java | 97 +++++++++++++++++++ .../pojo/vo/ExPortConfinement.java | 4 +- .../service/ConfinementService.java | 12 ++- .../resources/mapper/ConfinementMapper.xml | 18 ++++ 6 files changed, 139 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/pojo/vo/ConfinementExcelVo.java diff --git a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java index bd567de..28eedb8 100644 --- a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java +++ b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java @@ -14,10 +14,7 @@ import com.biutag.supervision.pojo.model.PoliceModel; import com.biutag.supervision.pojo.param.ConfinementFile; import com.biutag.supervision.pojo.param.ConfinementQueryParam; import com.biutag.supervision.pojo.param.PoliceQueryParam; -import com.biutag.supervision.pojo.vo.ConfinementVo; -import com.biutag.supervision.pojo.vo.ExPortConfinement; -import com.biutag.supervision.pojo.vo.ExportGabxfVo; -import com.biutag.supervision.pojo.vo.FileVo; +import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.service.ConfinementFileService; import com.biutag.supervision.service.ConfinementService; import com.biutag.supervision.util.CommonUtil; @@ -30,6 +27,7 @@ import org.springframework.web.bind.annotation.*; import java.beans.Transient; import java.io.IOException; import java.net.URLEncoder; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -61,7 +59,7 @@ public class ConfinementController { * 无用户权限判断的分页查询 * */ @GetMapping("listAll") - public Result> listAll(ConfinementQueryParam param){ + public Result> listAll(ConfinementQueryParam param){ return Result.success(confinementService.GetExportData(param)); } @@ -130,10 +128,10 @@ public class ConfinementController { public void export(ConfinementQueryParam param, HttpServletResponse response) throws IOException{ param.setCurrent(1); param.setSize(100000); - Page page =confinementService.GetExportData(param); - List records = page.getRecords(); + Page page =confinementService.GetExportData(param); + List records = page.getRecords(); AtomicInteger i = new AtomicInteger(1); - + SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd"); List list = records.stream().map(s->{ ExPortConfinement exPortConfinement =new ExPortConfinement(); BeanUtil.copyProperties(s,exPortConfinement); @@ -145,6 +143,12 @@ public class ConfinementController { if(StrUtil.isNotEmpty(s.getIsVisit())){ exPortConfinement.setIsVisit(s.getIsVisit().equals("0")?"是":"否"); } + if(s.getStartTime() != null){ + exPortConfinement.setStartTime(s.getStartTime().toLocalDate().toString()); + } + if(s.getEndTime() != null){ + exPortConfinement.setStartTime(s.getEndTime().toLocalDate().toString()); + } return exPortConfinement; diff --git a/src/main/java/com/biutag/supervision/mapper/ConfinementMapper.java b/src/main/java/com/biutag/supervision/mapper/ConfinementMapper.java index 0c7eba5..8d28837 100644 --- a/src/main/java/com/biutag/supervision/mapper/ConfinementMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/ConfinementMapper.java @@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.pojo.entity.Confinement; +import com.biutag.supervision.pojo.vo.ConfinementExcelVo; import com.biutag.supervision.pojo.vo.ConfinementVo; import org.apache.ibatis.annotations.Param; public interface ConfinementMapper extends BaseMapper { Page queryPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + Page queryExcelPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ConfinementExcelVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ConfinementExcelVo.java new file mode 100644 index 0000000..97aef25 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/vo/ConfinementExcelVo.java @@ -0,0 +1,97 @@ +package com.biutag.supervision.pojo.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + + +@Data +public class ConfinementExcelVo { + private String id; + + // 姓名 + private String name; + //警员id + private String policeId; + // 组织机构id + @NotBlank + private String orgId; + // 部门名称 + private String departName; + //简单部门名称 + private String departShortName; + //父级部门名称 + private String parentDepartShortName; + // 警号 + private String empNo; + // 职位类型 + private String job; + + // 职位类型 + private String jobType; + + // 电话 + private String phone; + //出生日期 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") + private LocalDateTime birthTime; +// +// // 手机号 +// private String mobile; + + // 身份证 + @NotBlank + private String idCode; + //看护单位 + private String nursingOrgId; + + // 看护单位名称 + private String nursingName; + //简单部门名称 + private String nursingShortName; + //父级部门名称 + private String parentDepartNursingName; + //事由 + private String matter; + + //开始时间 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") + private LocalDateTime startTime; + + //结束时间 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") + private LocalDateTime endTime; + + //禁闭时间 + private String confinementTime; + + //入党时间 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") + private LocalDateTime joinPartyTime; + + //参加工作开始时间 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") + private LocalDateTime joinWorkTime; + //参加公安工作时间 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") + private LocalDateTime joinPoliceTime; + //文化程度 + private String education; + //是否回访 + private String isVisit; + //查处单位 + private String investigateUnit; + + private String remark; + + private String role; + + private String roleId; + + private String userId; +} diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java b/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java index 9cd6885..679a2c3 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java @@ -36,11 +36,11 @@ public class ExPortConfinement { @ExcelProperty({"开始日期"}) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") - private LocalDateTime startTime; + private String startTime; @ExcelProperty({"结束时间"}) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") - private LocalDateTime endTime; + private String endTime; @ExcelProperty({"看护单位"}) private String nursingShortName; diff --git a/src/main/java/com/biutag/supervision/service/ConfinementService.java b/src/main/java/com/biutag/supervision/service/ConfinementService.java index 85df639..812763c 100644 --- a/src/main/java/com/biutag/supervision/service/ConfinementService.java +++ b/src/main/java/com/biutag/supervision/service/ConfinementService.java @@ -18,6 +18,7 @@ import com.biutag.supervision.pojo.model.PoliceModel; import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.param.ConfinementQueryParam; import com.biutag.supervision.pojo.param.PoliceQueryParam; +import com.biutag.supervision.pojo.vo.ConfinementExcelVo; import com.biutag.supervision.pojo.vo.ConfinementVo; import com.biutag.supervision.pojo.vo.TaskInspectionVo; import dm.jdbc.util.StringUtil; @@ -70,11 +71,14 @@ public class ConfinementService extends ServiceImpl GetExportData(ConfinementQueryParam param){ + public Page GetExportData(ConfinementQueryParam param){ QueryWrapper queryWrapper = new QueryWrapper<>(); //查询条件:id、姓名、部门、事由、禁闭时间（大于或者等于开始时间，小于或者等于结束时间） - queryWrapper.like(StrUtil.isNotBlank(param.getId()),"c1.id",StrUtil.trim(param.getId())) - .or().like(StrUtil.isNotBlank(param.getName()), "c1.name", StrUtil.trim(param.getName())); + queryWrapper.like(StrUtil.isNotBlank(param.getId()),"c1.id",StrUtil.trim(param.getId())); + if(StrUtil.isNotEmpty(param.getName())){ + queryWrapper.or().like(StrUtil.isNotBlank(param.getName()), "c1.name", StrUtil.trim(param.getName())); + } + if(StrUtil.isNotEmpty(param.getMatter())){ queryWrapper.or().like(StrUtil.isBlank(param.getMatter()), "c1.matter", StrUtil.trim(param.getMatter())); } @@ -94,7 +98,7 @@ public class ConfinementService extends ServiceImpl +