xwgd/back-end
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加字段

Browse Source
This commit is contained in:
zhangyanan 2025-10-17 16:05:13 +08:00
parent 063c13e47d
commit 5d05277e3c
6 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/entity/ScrHideData.java
View File

@ -71,4 +71,9 @@ public class ScrHideData extends BaseEntity {
@Excel(name = "未整改")
private Integer wzg;
/**
* 施工地点
*/
@Excel(name = "施工地点")
private String workPlace;
}

7
snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/param/ScrHideDataParam.java
View File

@ -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;
}

7
snowy-main/src/main/java/vip/xiaonuo/modular/scrhidedata/service/impl/ScrHideDataServiceImpl.java
View File

@ -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<ScrHideDataMapper, ScrHi
queryWrapper.apply("YEAR(happen_time) = {0}", happenTime.getYear());
queryWrapper.apply("MONTH(happen_time) = {0}", happenTime.getMonthValue());
}
if (ObjectUtil.isNotEmpty(scrHideDataParam.getWorkPlace())) {
queryWrapper.lambda().eq(ScrHideData::getWorkPlace, scrHideDataParam.getWorkPlace());
}
}
return new PageResult<>(this.page(PageFactory.defaultPage(), queryWrapper));
}
@ -102,6 +106,7 @@ public class ScrHideDataServiceImpl extends ServiceImpl<ScrHideDataMapper, ScrHi
LambdaQueryWrapper<ScrHideData> 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<ScrHideDataMapper, ScrHi
@Override
public void export(ScrHideDataParam scrHideDataParam) {
List<ScrHideData> list = this.list(scrHideDataParam);
PoiUtil.exportExcelWithStream("SnowyScrHideData.xls", ScrHideData.class, list);
PoiUtil.exportExcelWithStream("隐患排查治理.xls", ScrHideData.class, list);
}
}

15
snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/entity/ScrWorkTask.java
View File

@ -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;
}

19
snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/param/ScrWorkTaskParam.java
View File

@ -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;
}

16
snowy-main/src/main/java/vip/xiaonuo/modular/scrworktask/service/impl/ScrWorkTaskServiceImpl.java
View File

@ -74,6 +74,12 @@ public class ScrWorkTaskServiceImpl extends ServiceImpl<ScrWorkTaskMapper, ScrWo
queryWrapper.apply("YEAR(happen_time) = {0}", happenTime.getYear());
queryWrapper.apply("MONTH(happen_time) = {0}", happenTime.getMonthValue());
}
if (ObjectUtil.isNotEmpty(scrWorkTaskParam.getWorkPlace())) {
queryWrapper.lambda().eq(ScrWorkTask::getWorkPlace, scrWorkTaskParam.getWorkPlace());
}
if (ObjectUtil.isNotEmpty(scrWorkTaskParam.getLevel())) {
queryWrapper.lambda().eq(ScrWorkTask::getLevel, scrWorkTaskParam.getLevel());
}
}
return new PageResult<>(this.page(PageFactory.defaultPage(), queryWrapper));
}
@ -93,6 +99,12 @@ public class ScrWorkTaskServiceImpl extends ServiceImpl<ScrWorkTaskMapper, ScrWo
} else if (ObjectUtil.isNotEmpty(scrWorkTaskParam.getYear())) {
queryWrapper.apply("YEAR(happen_time) = {0}", scrWorkTaskParam.getYear());
}
if (ObjectUtil.isNotEmpty(scrWorkTaskParam.getWorkPlace())) {
queryWrapper.lambda().eq(ScrWorkTask::getWorkPlace, scrWorkTaskParam.getWorkPlace());
}
if (ObjectUtil.isNotEmpty(scrWorkTaskParam.getLevel())) {
queryWrapper.lambda().eq(ScrWorkTask::getLevel, scrWorkTaskParam.getLevel());
}
}
return this.list(queryWrapper);
}
@ -112,6 +124,8 @@ public class ScrWorkTaskServiceImpl extends ServiceImpl<ScrWorkTaskMapper, ScrWo
queryWrapper.eq(ScrWorkTask::getName, name);
queryWrapper.apply("YEAR(happen_time) = {0}", happenTime.getYear());
queryWrapper.apply("MONTH(happen_time) = {0}", happenTime.getMonthValue());
queryWrapper.eq(ScrWorkTask::getWorkPlace, scrWorkTaskParam.getWorkPlace());
queryWrapper.eq(ScrWorkTask::getLevel, scrWorkTaskParam.getLevel());
//是否排除自己，如果是则查询条件排除自己id
if (isExcludeSelf) {
queryWrapper.ne(ScrWorkTask::getId, id);
@ -161,7 +175,7 @@ public class ScrWorkTaskServiceImpl extends ServiceImpl<ScrWorkTaskMapper, ScrWo
@Override
public void export(ScrWorkTaskParam scrWorkTaskParam) {
List<ScrWorkTask> list = this.list(scrWorkTaskParam);
PoiUtil.exportExcelWithStream("SnowyScrWorkTask.xls", ScrWorkTask.class, list);
PoiUtil.exportExcelWithStream("作业票.xls", ScrWorkTask.class, list);
}
}