Merge remote-tracking branch 'origin/dev' into dev

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

@@ -6,6 +6,7 @@ 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
@@ -22,6 +23,7 @@ import com.xjrsoft.module.student.service.IQuotaFormulaRuleAttributeService;
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributePageVo;
 
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributeVo;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -51,11 +53,7 @@ public class QuotaFormulaRuleAttributeController {
     @SaCheckPermission("quotaformularuleattribute:detail")
     public RT<PageOutput<QuotaFormulaRuleAttributePageVo>> page(@Valid QuotaFormulaRuleAttributePageDto dto){
 
-        LambdaQueryWrapper<QuotaFormulaRuleAttribute> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(QuotaFormulaRuleAttribute::getId)
-                .select(QuotaFormulaRuleAttribute.class,x -> VoToColumnUtil.fieldsToColumns(QuotaFormulaRuleAttributePageVo.class).contains(x.getProperty()));
-        IPage<QuotaFormulaRuleAttribute> page = quotaFormulaRuleAttributeService.page(ConventPage.getPage(dto), queryWrapper);
+        Page<QuotaFormulaRuleAttributePageVo> page = quotaFormulaRuleAttributeService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<QuotaFormulaRuleAttributePageVo> pageOutput = ConventPage.getPageOutput(page, QuotaFormulaRuleAttributePageVo.class);
         return RT.ok(pageOutput);
     }

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

@@ -6,12 +6,14 @@ 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.personnel.vo.BasePersonnelLabourCapitalYearPageVo;
 import com.xjrsoft.module.student.dto.AddQuotaFormulaRuleConstantDto;
 import com.xjrsoft.module.student.dto.UpdateQuotaFormulaRuleConstantDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -50,12 +52,7 @@ public class QuotaFormulaRuleConstantController {
     @ApiOperation(value="考核基数列表(分页)")
     @SaCheckPermission("quotaformularuleconstant:detail")
     public RT<PageOutput<QuotaFormulaRuleConstantPageVo>> page(@Valid QuotaFormulaRuleConstantPageDto dto){
-
-        LambdaQueryWrapper<QuotaFormulaRuleConstant> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(QuotaFormulaRuleConstant::getId)
-                .select(QuotaFormulaRuleConstant.class,x -> VoToColumnUtil.fieldsToColumns(QuotaFormulaRuleConstantPageVo.class).contains(x.getProperty()));
-        IPage<QuotaFormulaRuleConstant> page = quotaFormulaRuleConstantService.page(ConventPage.getPage(dto), queryWrapper);
+        Page<QuotaFormulaRuleConstantPageVo> page = quotaFormulaRuleConstantService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<QuotaFormulaRuleConstantPageVo> pageOutput = ConventPage.getPageOutput(page, QuotaFormulaRuleConstantPageVo.class);
         return RT.ok(pageOutput);
     }

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

@@ -6,6 +6,7 @@ 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
@@ -19,6 +20,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRule;
 import com.xjrsoft.module.student.service.IQuotaFormulaRuleService;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo;
 
 import com.xjrsoft.module.student.vo.QuotaFormulaRuleVo;
@@ -51,11 +53,17 @@ public class QuotaFormulaRuleController {
     @SaCheckPermission("quotaformularule:detail")
     public RT<PageOutput<QuotaFormulaRulePageVo>> page(@Valid QuotaFormulaRulePageDto dto){
 
-        LambdaQueryWrapper<QuotaFormulaRule> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(QuotaFormulaRule::getId)
-                .select(QuotaFormulaRule.class,x -> VoToColumnUtil.fieldsToColumns(QuotaFormulaRulePageVo.class).contains(x.getProperty()));
-        IPage<QuotaFormulaRule> page = quotaFormulaRuleService.page(ConventPage.getPage(dto), queryWrapper);
+        Page<QuotaFormulaRulePageVo> page = quotaFormulaRuleService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<QuotaFormulaRulePageVo> pageOutput = ConventPage.getPageOutput(page, QuotaFormulaRulePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/quotaPage")
+    @ApiOperation(value="绑定指标列表")
+    @SaCheckPermission("quotaformularule:detail")
+    public RT<PageOutput<QuotaFormulaRulePageVo>> quotaPage(@Valid QuotaFormulaRulePageDto dto){
+
+        Page<QuotaFormulaRulePageVo> page = quotaFormulaRuleService.getQuota(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<QuotaFormulaRulePageVo> pageOutput = ConventPage.getPageOutput(page, QuotaFormulaRulePageVo.class);
         return RT.ok(pageOutput);
     }

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

@@ -1,8 +1,13 @@
 package com.xjrsoft.module.student.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleAttributePageDto;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleAttribute;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributePageVo;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,5 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface QuotaFormulaRuleAttributeMapper extends MPJBaseMapper<QuotaFormulaRuleAttribute> {
-
+    Page<QuotaFormulaRuleAttributePageVo> getPage(Page<QuotaFormulaRuleAttributePageDto> page, QuotaFormulaRuleAttributePageDto dto);
 }

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

@@ -1,8 +1,13 @@
 package com.xjrsoft.module.student.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.personnel.dto.BasePersonnelLabourCapitalMonthPageDto;
+import com.xjrsoft.module.personnel.vo.BasePersonnelLabourCapitalMonthPageVo;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleConstant;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,5 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface QuotaFormulaRuleConstantMapper extends MPJBaseMapper<QuotaFormulaRuleConstant> {
-
+    Page<QuotaFormulaRuleConstantPageVo> getPage(Page<QuotaFormulaRuleConstantPageDto> page, QuotaFormulaRuleConstantPageDto dto);
 }

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

@@ -1,8 +1,13 @@
 package com.xjrsoft.module.student.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
+import com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRule;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
+import com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,5 +18,7 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface QuotaFormulaRuleMapper extends MPJBaseMapper<QuotaFormulaRule> {
+    Page<QuotaFormulaRulePageVo> getPage(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto);
+    Page<QuotaFormulaRulePageVo> getQuota(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto);
 
 }

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

@@ -1,8 +1,13 @@
 package com.xjrsoft.module.student.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleAttributePageDto;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleAttribute;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributePageVo;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import lombok.Data;
 import java.util.List;
 
@@ -14,4 +19,5 @@ import java.util.List;
 */
 
 public interface IQuotaFormulaRuleAttributeService extends MPJBaseService<QuotaFormulaRuleAttribute> {
+    Page<QuotaFormulaRuleAttributePageVo> getPage(Page<QuotaFormulaRuleAttributePageDto> page, QuotaFormulaRuleAttributePageDto dto);
 }

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

@@ -1,8 +1,13 @@
 package com.xjrsoft.module.student.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.personnel.dto.LaborManagementPageDto;
+import com.xjrsoft.module.personnel.vo.LaborManagementPageVo;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleConstant;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import lombok.Data;
 import java.util.List;
 
@@ -14,4 +19,5 @@ import java.util.List;
 */
 
 public interface IQuotaFormulaRuleConstantService extends MPJBaseService<QuotaFormulaRuleConstant> {
+    Page<QuotaFormulaRuleConstantPageVo> getPage(Page<QuotaFormulaRuleConstantPageDto> page, QuotaFormulaRuleConstantPageDto dto);
 }

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

@@ -1,8 +1,13 @@
 package com.xjrsoft.module.student.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
+import com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRule;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
+import com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo;
 import lombok.Data;
 import java.util.List;
 
@@ -14,4 +19,6 @@ import java.util.List;
 */
 
 public interface IQuotaFormulaRuleService extends MPJBaseService<QuotaFormulaRule> {
+    Page<QuotaFormulaRulePageVo> getPage(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto);
+    Page<QuotaFormulaRulePageVo> getQuota(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto);
 }

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

@@ -1,10 +1,13 @@
 package com.xjrsoft.module.student.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleAttributePageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleAttribute;
 import com.xjrsoft.module.student.mapper.QuotaFormulaRuleAttributeMapper;
 import com.xjrsoft.module.student.service.IQuotaFormulaRuleAttributeService;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributePageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,4 +25,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class QuotaFormulaRuleAttributeServiceImpl extends MPJBaseServiceImpl<QuotaFormulaRuleAttributeMapper, QuotaFormulaRuleAttribute> implements IQuotaFormulaRuleAttributeService {
+    private final QuotaFormulaRuleAttributeMapper quotaFormulaRuleAttributeMapper;
+    @Override
+    public Page<QuotaFormulaRuleAttributePageVo> getPage(Page<QuotaFormulaRuleAttributePageDto> page, QuotaFormulaRuleAttributePageDto dto) {
+        return quotaFormulaRuleAttributeMapper.getPage(page,dto);
+    }
 }

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

@@ -1,10 +1,13 @@
 package com.xjrsoft.module.student.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRuleConstant;
 import com.xjrsoft.module.student.mapper.QuotaFormulaRuleConstantMapper;
 import com.xjrsoft.module.student.service.IQuotaFormulaRuleConstantService;
+import com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,4 +25,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class QuotaFormulaRuleConstantServiceImpl extends MPJBaseServiceImpl<QuotaFormulaRuleConstantMapper, QuotaFormulaRuleConstant> implements IQuotaFormulaRuleConstantService {
+    private final QuotaFormulaRuleConstantMapper quotaFormulaRuleConstantMapper;
+    @Override
+    public Page<QuotaFormulaRuleConstantPageVo> getPage(Page<QuotaFormulaRuleConstantPageDto> page, QuotaFormulaRuleConstantPageDto dto) {
+        return quotaFormulaRuleConstantMapper.getPage(page,dto);
+    }
 }

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

@@ -1,10 +1,13 @@
 package com.xjrsoft.module.student.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto;
 import com.xjrsoft.module.student.entity.QuotaFormulaRule;
 import com.xjrsoft.module.student.mapper.QuotaFormulaRuleMapper;
 import com.xjrsoft.module.student.service.IQuotaFormulaRuleService;
+import com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,4 +25,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class QuotaFormulaRuleServiceImpl extends MPJBaseServiceImpl<QuotaFormulaRuleMapper, QuotaFormulaRule> implements IQuotaFormulaRuleService {
+    private final QuotaFormulaRuleMapper quotaFormulaRuleMapper;
+    @Override
+    public Page<QuotaFormulaRulePageVo> getPage(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto) {
+        return quotaFormulaRuleMapper.getPage(page, dto);
+    }
+
+    @Override
+    public Page<QuotaFormulaRulePageVo> getQuota(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto) {
+        return quotaFormulaRuleMapper.getQuota(page, dto);
+    }
 }

src/main/java/com/xjrsoft/module/system/controller/DatabaselinkController.java

@@ -97,7 +97,7 @@ public class DatabaselinkController {
                     .select(Databaselink.class,x -> VoToColumnUtil.fieldsToColumns(DatabaselinkPageVo.class).contains(x.getProperty()));
         List<Databaselink> databaseLinkList = databaselinkService.list(queryWrapper);
         List<DatabaseLinkListVo> resultList = new ArrayList<>();
-//        resultList.add(BeanUtil.toBean(masterInfo().getData(), DatabaseLinkListVo.class));
+        resultList.add(BeanUtil.toBean(masterInfo().getData(), DatabaseLinkListVo.class));
         resultList.addAll(BeanUtil.copyToList(databaseLinkList, DatabaseLinkListVo.class));
         return R.ok(resultList);
     }

src/main/resources/mapper/student/QuotaFormulaRuleAttributeMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.student.mapper.QuotaFormulaRuleAttributeMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.student.dto.QuotaFormulaRuleAttributePageDto" resultType="com.xjrsoft.module.student.vo.QuotaFormulaRuleAttributePageVo">
+        select  t.id, t.name, t.formula
+        from quota_formula_rule_attribute t
+        where t.delete_mark = 0
+        order by t.create_date
+    </select>
+</mapper>

src/main/resources/mapper/student/QuotaFormulaRuleConstantMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.student.mapper.QuotaFormulaRuleConstantMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.student.dto.QuotaFormulaRuleConstantPageDto" resultType="com.xjrsoft.module.student.vo.QuotaFormulaRuleConstantPageVo">
+        select t.id, t.name, t.formula, t.bind_quota
+        from quota_formula_rule_constant t
+        where t.delete_mark = 0
+        order by t.create_date
+    </select>
+</mapper>

src/main/resources/mapper/student/QuotaFormulaRuleMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.student.mapper.QuotaFormulaRuleMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto" resultType="com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo">
+        select t.id, t.name, t.formula
+        from quota_formula_rule t
+        where t.delete_mark = 0
+        order by t.create_date
+    </select>
+
+    <select id="getQuota" parameterType="com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto" resultType="com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo">
+        SELECT
+            t.id,
+            GROUP_CONCAT(t1.name SEPARATOR ',') AS bind_quota
+        FROM
+            quota_formula_rule t
+                LEFT JOIN
+            xjr_dictionary_detail t1
+            ON
+                t1.item_id = 1752246376061272065
+        WHERE
+            t.delete_mark = 0
+          AND FIND_IN_SET(t1.code, t.bind_quota)
+        GROUP BY
+            t.id
+        ORDER BY
+            MAX(t.create_date);
+    </select>
+</mapper>
+
+