Parcourir la source

分班接口调整

dzx il y a 1 an
Parent
commit
3fdc31176d

+ 3 - 2
src/main/java/com/xjrsoft/module/banding/controller/BandingTaskMajorConditionController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.banding.dto.BandingTaskPageDto;
+import com.xjrsoft.module.banding.dto.BandingTaskMajorConditionListDto;
 import com.xjrsoft.module.banding.dto.SaveMajorConditionDto;
 import com.xjrsoft.module.banding.entity.BandingTaskMajorCondition;
 import com.xjrsoft.module.banding.service.IBandingTaskMajorConditionService;
@@ -42,10 +42,11 @@ public class BandingTaskMajorConditionController {
     @GetMapping(value = "/list")
     @ApiOperation(value="专业限制条件列表")
     @SaCheckPermission("bandingtaskmajorcondition:detail")
-    public RT<List<BandingTaskMajorConditionListVo>> page(@Valid BandingTaskPageDto dto){
+    public RT<List<BandingTaskMajorConditionListVo>> page(@Valid BandingTaskMajorConditionListDto dto){
 
         List<BandingTaskMajorConditionListVo> page = majorSetService.selectJoinList(BandingTaskMajorConditionListVo.class,
                 new MPJLambdaWrapper<BaseMajorSet>().disableSubLogicDel()
+                        .eq(BandingTaskMajorCondition::getBandingTaskId, dto.getBandingTaskId())
                         .select(BandingTaskMajorCondition::getId)
                         .select(BaseMajorSet.class, x -> VoToColumnUtil.fieldsToColumns(BaseMajorSet.class).contains(x.getProperty()))
                         .selectAs(BaseMajorSet::getId, BandingTaskMajorConditionListVo::getMajorSetId)

+ 23 - 0
src/main/java/com/xjrsoft/module/banding/dto/BandingTaskMajorConditionListDto.java

@@ -0,0 +1,23 @@
+package com.xjrsoft.module.banding.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+
+/**
+* @title: 新生分班任务分页查询入参
+* @Author dzx
+* @Date: 2024-07-01
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BandingTaskMajorConditionListDto {
+
+    @ApiModelProperty("任务id")
+    private Long bandingTaskId;
+
+}