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 0000000..fac762c Binary files /dev/null and b/shoot-hand/ics-admin/src/main/resources/excel/按维修类型汇总模版.xls differ 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