From 9d9574011d46b0888dedb9b5a87f461584730538 Mon Sep 17 00:00:00 2001 From: lujiang Date: Tue, 15 Oct 2024 20:21:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=BB=B4=E4=BF=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/RepairIOController.java | 31 ++++++++++++++++-- .../ics/admin/mapper/RepairCheckMapper.java | 7 ++++ .../ics/admin/service/IRepairIOSerice.java | 6 ++++ .../service/impl/RepairIOSericeImpl.java | 6 ++++ .../com/ics/admin/vo/RepairTypeExportVo.java | 27 +++++++++++++++ .../resources/excel/按维修类型汇总模版.xls | Bin 0 -> 24064 bytes .../mapper/admin/RepairCheckMapper.xml | 12 +++++++ 7 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairTypeExportVo.java create mode 100644 shoot-hand/ics-admin/src/main/resources/excel/按维修类型汇总模版.xls diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairIOController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairIOController.java index 5dd0f42..7b69edb 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairIOController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairIOController.java @@ -10,6 +10,7 @@ import com.ics.admin.service.IRepairService; import com.ics.admin.utils.EasyPoiUtils; import com.ics.admin.utils.ExcelView; import com.ics.admin.vo.RepairExportVo; +import com.ics.admin.vo.RepairTypeExportVo; import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.R; import com.ics.common.utils.DateUtils; @@ -317,15 +318,41 @@ public class RepairIOController extends BaseController { repair.getParams().put("beginTime", start); repair.getParams().put("endTime", end); List list = repairIOSerice.exportRepair(repair); - SimpleDateFormat dateFormat = new SimpleDateFormat("MM月dd日 HH:mm"); + //SimpleDateFormat dateFormat = new SimpleDateFormat("MM月dd日 HH:mm"); Context context = new Context(); context.putVar("startDate", repair.getBeginTime()); context.putVar("endDate", repair.getEndTime()); context.putVar("list", list); - context.putVar("dateFormat", dateFormat); + //context.putVar("dateFormat", dateFormat); new ExcelView("excel/工单导出模版.xls", "零星维修进度情况跟踪表.xls", context); } catch (Exception e) { e.printStackTrace(); } } + + /** + * 按维修类型汇总 导出 + * 【查询条件】 + * beginTime : 工单创建日期范围；开始时间;格式示例 2024-08-22；成对出现 + * endTime : 工单创建日期范围；结束时间;格式示例 2024-08-25；成对出现 + */ + @RequiresPermissions(value = {"repair:manage:operator"}) + @RequestMapping("/exportCategory") + public void exportCategory(Repair repair) { + Date start, end; + try { + start = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, repair.getBeginTime() + " 00:00:00"); + end = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, repair.getEndTime() + " 23:59:59"); + repair.getParams().put("beginTime", start); + repair.getParams().put("endTime", end); + List list = repairIOSerice.categoryExport(repair); + Context context = new Context(); + context.putVar("startDate", repair.getBeginTime()); + context.putVar("endDate", repair.getEndTime()); + context.putVar("list", list); + new ExcelView("excel/按维修类型汇总模版.xls", "按维修类型汇总.xls", context); + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairCheckMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairCheckMapper.java index 04e4180..72e5017 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairCheckMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairCheckMapper.java @@ -3,6 +3,7 @@ package com.ics.admin.mapper; import com.ics.admin.domain.Repair; import com.ics.admin.vo.RepairCheckVo; import com.ics.admin.vo.RepairExportVo; +import com.ics.admin.vo.RepairTypeExportVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -42,4 +43,10 @@ public interface RepairCheckMapper { * @return */ List exportList(Repair repair); + + /** + * 故障类型分类统计 导出 + * @return + */ + List categoryExport(Repair repair); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairIOSerice.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairIOSerice.java index ed1f420..4906534 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairIOSerice.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairIOSerice.java @@ -6,6 +6,7 @@ import com.ics.admin.domain.RepairAddressFloor; import com.ics.admin.domain.RepairDevice; import com.ics.admin.domain.RepairDeviceType; import com.ics.admin.vo.RepairExportVo; +import com.ics.admin.vo.RepairTypeExportVo; import java.util.Date; import java.util.List; @@ -35,4 +36,9 @@ public interface IRepairIOSerice { * @return */ List exportRepair(Repair repair); + + /** + * 故障类型分类统计 + */ + List categoryExport(Repair repair); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java index dbd70da..683c396 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java @@ -13,6 +13,7 @@ import com.ics.admin.mapper.RepairDeviceTypeMapper; import com.ics.admin.service.IRepairIOSerice; import com.ics.admin.vo.RepairCheckVo; import com.ics.admin.vo.RepairExportVo; +import com.ics.admin.vo.RepairTypeExportVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -90,4 +91,9 @@ public class RepairIOSericeImpl implements IRepairIOSerice { } return list; } + + @Override + public List categoryExport(Repair repair) { + return repairCheckMapper.categoryExport(repair); + } } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairTypeExportVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairTypeExportVo.java new file mode 100644 index 0000000..9e3c36e --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairTypeExportVo.java @@ -0,0 +1,27 @@ +package com.ics.admin.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * created at 2024-10-15 19:39 + * + * @author lujiang + * @version 1.0.0 + * @since 1.0.0 + */ +@Data +public class RepairTypeExportVo implements Serializable { + private static final long serialVersionUID = -202410151940L; + + private String name;//类型名称 + + private Integer zs;//总数 + private Integer sh;//待审核 + private Integer wait;//待派单 + private Integer process;//维修中 + private Integer end;//已经结单 + private Integer evaled;//已评价 + +} diff --git a/shoot-hand/ics-admin/src/main/resources/excel/按维修类型汇总模版.xls b/shoot-hand/ics-admin/src/main/resources/excel/按维修类型汇总模版.xls new file mode 100644 index 0000000000000000000000000000000000000000..fac762cefa80ded4665ac12b81526678d46e2ad3 GIT binary patch literal 24064 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 bYyN*xwsM&N=KN!zEqKdI@^|3>n+5&{qmpFG literal 0 HcmV?d00001 diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairCheckMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairCheckMapper.xml index 5645891..0269dfa 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairCheckMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairCheckMapper.xml @@ -69,4 +69,16 @@ order by rep.create_time + + \ No newline at end of file