指标公式规则修改

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

@@ -58,6 +58,16 @@ public class QuotaFormulaRuleController {
         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);
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询指标公式规则管理信息")
     @SaCheckPermission("quotaformularule:detail")

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

@@ -19,4 +19,6 @@ 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/IQuotaFormulaRuleService.java

@@ -20,4 +20,5 @@ 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/QuotaFormulaRuleServiceImpl.java

@@ -30,4 +30,9 @@ public class QuotaFormulaRuleServiceImpl extends MPJBaseServiceImpl<QuotaFormula
     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/resources/mapper/student/QuotaFormulaRuleMapper.xml

@@ -4,9 +4,30 @@
         "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, t.bind_quota
+        select t.id, t.name, t.formula
         from quota_formula_rule t
         where t.delete_mark = 0
         order by t.create_date
     </select>
-</mapper>
+
+    <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>
+
+