/student/basestudentbehaviorproject/page 学生操行分考核项目列表(分页) 返回数据添加scoreTypeCN字段

src/main/java/com/xjrsoft/module/student/controller/BaseStudentBehaviorProjectController.java

@@ -6,6 +6,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
@@ -26,6 +28,7 @@ import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectPageVo;
 
 import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectTreeVo;
 import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -82,12 +85,14 @@ public class BaseStudentBehaviorProjectController {
     @SaCheckPermission("basestudentbehaviorproject:detail")
     public RT<PageOutput<BaseStudentBehaviorProjectPageVo>> page(@Valid BaseStudentBehaviorProjectPageDto dto) {
 
-        LambdaQueryWrapper<BaseStudentBehaviorProject> queryWrapper = new LambdaQueryWrapper<>();
+        MPJLambdaWrapper<BaseStudentBehaviorProject> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
+                .select(BaseStudentBehaviorProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorProjectPageVo.class).contains(x.getProperty()))
+                .selectAs(DictionaryDetail::getName,BaseStudentBehaviorProjectPageVo::getScoreTypeCN)
                 .orderByDesc(BaseStudentBehaviorProject::getId)
                 .eq(ObjectUtil.isNotNull(dto.getBaseStudentBehaviorCategoryId()), BaseStudentBehaviorProject::getBaseStudentBehaviorCategoryId, dto.getBaseStudentBehaviorCategoryId())
-                .select(BaseStudentBehaviorProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorProjectPageVo.class).contains(x.getProperty()));
-        IPage<BaseStudentBehaviorProject> page = baseStudentBehaviorProjectService.page(ConventPage.getPage(dto), queryWrapper);
+                .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseStudentBehaviorProject::getScoreType);
+        IPage<BaseStudentBehaviorProjectPageVo> page = baseStudentBehaviorProjectService.selectJoinListPage(ConventPage.getPage(dto),BaseStudentBehaviorProjectPageVo.class, queryWrapper);
         PageOutput<BaseStudentBehaviorProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBehaviorProjectPageVo.class);
         return RT.ok(pageOutput);
     }

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBehaviorProjectMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface BaseStudentBehaviorProjectMapper extends BaseMapper<BaseStudentBehaviorProject> {
+public interface BaseStudentBehaviorProjectMapper extends MPJBaseMapper<BaseStudentBehaviorProject> {
 
 }

src/main/java/com/xjrsoft/module/student/service/IBaseStudentBehaviorProjectService.java

@@ -13,5 +13,5 @@ import java.util.List;
 * @Version 1.0
 */
 
-public interface IBaseStudentBehaviorProjectService extends IService<BaseStudentBehaviorProject> {
+public interface IBaseStudentBehaviorProjectService extends MPJBaseService<BaseStudentBehaviorProject> {
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentBehaviorProjectServiceImpl.java

@@ -21,5 +21,5 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 */
 @Service
 @AllArgsConstructor
-public class BaseStudentBehaviorProjectServiceImpl extends ServiceImpl<BaseStudentBehaviorProjectMapper, BaseStudentBehaviorProject> implements IBaseStudentBehaviorProjectService {
+public class BaseStudentBehaviorProjectServiceImpl extends MPJBaseServiceImpl<BaseStudentBehaviorProjectMapper, BaseStudentBehaviorProject> implements IBaseStudentBehaviorProjectService {
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentBehaviorProjectPageVo.java

@@ -80,6 +80,13 @@ public class BaseStudentBehaviorProjectPageVo {
     */
     @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
     private String scoreType;
+
+    /**
+     * 考核类型中文名(xjr_dictionary_item[score_type])
+     */
+    @ApiModelProperty("考核类型中文名(xjr_dictionary_item[score_type])")
+    private String scoreTypeCN;
+
     /**
     * 分值
     */