From 5d05277e3c9bcf95accbfa08583723c1eb528030 Mon Sep 17 00:00:00 2001 From: zhangyanan Date: Fri, 17 Oct 2025 16:05:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrhidedata/entity/ScrHideData.java | 5 +++++ .../scrhidedata/param/ScrHideDataParam.java | 7 +++++++ .../service/impl/ScrHideDataServiceImpl.java | 7 ++++++- .../scrworktask/entity/ScrWorkTask.java | 15 +++++++++++++-- .../scrworktask/param/ScrWorkTaskParam.java | 19 +++++++++++++++++-- .../service/impl/ScrWorkTaskServiceImpl.java | 16 +++++++++++++++- 6 files changed, 63 insertions(+), 6 deletions(-) diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/entity/ScrHideData.java b/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/entity/ScrHideData.java index 2c594a3..3f888e3 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/entity/ScrHideData.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/entity/ScrHideData.java @@ -71,4 +71,9 @@ public class ScrHideData extends BaseEntity { @Excel(name = "未整改") private Integer wzg; + /** + * 施工地点 + */ + @Excel(name = "施工地点") + private String workPlace; } diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/param/ScrHideDataParam.java b/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/param/ScrHideDataParam.java index 928bc58..c12fc0c 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/param/ScrHideDataParam.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/param/ScrHideDataParam.java @@ -68,6 +68,13 @@ public class ScrHideDataParam extends BaseParam { */ @NotNull(message = "未整改不能为空，请检查wzg参数", groups = {add.class, edit.class}) private Integer wzg; + + /** + * 施工地点 + */ + @NotBlank(message = "施工地点不能为空，请检查workPlace参数", groups = {add.class, edit.class}) + private String workPlace; + private Integer year; private Integer month; } diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/service/impl/ScrHideDataServiceImpl.java b/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/service/impl/ScrHideDataServiceImpl.java index fa660cc..0b4ef0e 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/service/impl/ScrHideDataServiceImpl.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/service/impl/ScrHideDataServiceImpl.java @@ -44,6 +44,7 @@ import vip.xiaonuo.modular.scrhidedata.service.ScrHideDataService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.modular.scrproduction.entity.ScrProduction; +import vip.xiaonuo.modular.scrworktask.entity.ScrWorkTask; import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.enums.SysUserExceptionEnum; @@ -70,6 +71,9 @@ public class ScrHideDataServiceImpl extends ServiceImpl(this.page(PageFactory.defaultPage(), queryWrapper)); } @@ -102,6 +106,7 @@ public class ScrHideDataServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.apply("YEAR(happen_time) = {0}", happenTime.getYear()); queryWrapper.apply("MONTH(happen_time) = {0}", happenTime.getMonthValue()); + queryWrapper.eq(ScrHideData::getWorkPlace, scrHideDataParam.getWorkPlace()); //是否排除自己，如果是则查询条件排除自己id if (isExcludeSelf) { queryWrapper.ne(ScrHideData::getId, id); @@ -152,7 +157,7 @@ public class ScrHideDataServiceImpl extends ServiceImpl list = this.list(scrHideDataParam); - PoiUtil.exportExcelWithStream("SnowyScrHideData.xls", ScrHideData.class, list); + PoiUtil.exportExcelWithStream("隐患排查治理.xls", ScrHideData.class, list); } } diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/entity/ScrWorkTask.java b/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/entity/ScrWorkTask.java index 7135938..ed4bdf1 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/entity/ScrWorkTask.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/entity/ScrWorkTask.java @@ -49,9 +49,9 @@ public class ScrWorkTask extends BaseEntity { private Long id; /** - * 8大作业票 + * 作业票 */ - @Excel(name = "8大作业票") + @Excel(name = "作业票") private String name; /** @@ -66,4 +66,15 @@ public class ScrWorkTask extends BaseEntity { @Excel(name = "数量") private Integer totalNum; + /** + * 施工地点 + */ + @Excel(name = "施工地点") + private String workPlace; + + /** + * 级别 + */ + @Excel(name = "级别") + private String level; } diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/param/ScrWorkTaskParam.java b/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/param/ScrWorkTaskParam.java index 89c4810..3428f4a 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/param/ScrWorkTaskParam.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/param/ScrWorkTaskParam.java @@ -24,6 +24,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.modular.scrworktask.param; +import cn.afterturn.easypoi.excel.annotation.Excel; import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import javax.validation.constraints.NotNull; @@ -46,9 +47,9 @@ public class ScrWorkTaskParam extends BaseParam { private Long id; /** - * 8大作业票 + * 作业票 */ - @NotBlank(message = "8大作业票不能为空，请检查name参数", groups = {add.class, edit.class}) + @NotBlank(message = "作业票不能为空，请检查name参数", groups = {add.class, edit.class}) private String name; /** @@ -62,6 +63,20 @@ public class ScrWorkTaskParam extends BaseParam { */ @NotNull(message = "数量不能为空，请检查totalNum参数", groups = {add.class, edit.class}) private Integer totalNum; + + /** + * 施工地点 + */ + @NotBlank(message = "施工地点不能为空，请检查workPlace参数", groups = {add.class, edit.class}) + private String workPlace; + + /** + * 级别 + */ + @NotBlank(message = "级别不能为空，请检查level参数", groups = {add.class, edit.class}) + @Excel(name = "级别") + private String level; + private Integer year; private Integer month; } diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/service/impl/ScrWorkTaskServiceImpl.java b/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/service/impl/ScrWorkTaskServiceImpl.java index 202e725..2b38838 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/service/impl/ScrWorkTaskServiceImpl.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/service/impl/ScrWorkTaskServiceImpl.java @@ -74,6 +74,12 @@ public class ScrWorkTaskServiceImpl extends ServiceImpl(this.page(PageFactory.defaultPage(), queryWrapper)); } @@ -93,6 +99,12 @@ public class ScrWorkTaskServiceImpl extends ServiceImpl list = this.list(scrWorkTaskParam); - PoiUtil.exportExcelWithStream("SnowyScrWorkTask.xls", ScrWorkTask.class, list); + PoiUtil.exportExcelWithStream("作业票.xls", ScrWorkTask.class, list); } }