yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'tsg' and 'tsg' of http://10.0.41.100:3000/SoftwareDevelopers/gunshi-project-xyt into tsg

master
wany 2024-11-15 17:05:00 +08:00
parent b3d7721c34 6c3af674f3
commit 06baa58f5f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java
View File

@ -120,8 +120,12 @@ public class PersonnelPlanController extends AbstractCommonFileController {
@Operation(summary = "列表") @Operation(summary = "列表")
@PostMapping("/list") @PostMapping("/list")
public R<List<PersonnelPlan>> list() { public R<List<PersonnelPlan>> list(@RequestBody @Validated PersonnelPlanPage dto) {
return R.ok(service.lambdaQuery() LambdaQueryChainWrapper<PersonnelPlan> query = service.lambdaQuery();
if (StringUtils.isNotBlank(dto.getName())){
query.like(PersonnelPlan::getName, dto.getName());
}
return R.ok(query
.eq(PersonnelPlan::getStatus, 1) .eq(PersonnelPlan::getStatus, 1)
.list()); .list());
} }

6
src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java
View File

@ -63,10 +63,10 @@ public class PersonnelPlan extends CommUpdate implements Serializable {
* 培训主题分类,0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他 * 培训主题分类,0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他
*/ */
@TableField(value="type") @TableField(value="type")
@Excel(name = "培训主题",sort = 2,readConverterExp = "0=水利,1=岗前培训,2=在岗培训,3=政治学习教育,4=其他") @Excel(name = "培训主题",sort = 2,readConverterExp = "1=水利,2=岗前培训,3=在岗培训,4=政治学习教育,5=其他")
@Schema(description="培训主题分类,0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他") @Schema(description="培训主题分类,1:水利,2:岗前培训,3:在岗培训,4:政治学习教育,5:其他")
@NotNull(message = "培训主题不能为空",groups = {Insert.class, Update.class}) @NotNull(message = "培训主题不能为空",groups = {Insert.class, Update.class})
@Pattern(regexp = "^[0-4]$", message = "培训主题分类应为：0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他") @Pattern(regexp = "^[0-4]$", message = "培训主题分类应为：1:水利,2:岗前培训,3:在岗培训,4:政治学习教育,5:其他")
private Integer type; private Integer type;
/** /**