From 6236b20da2e7f99f7d604bbe9c656c9f565fd379 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 七月 2024 09:23:46 +0800
Subject: [PATCH] 考试成绩排序

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
index 39896a1..0cadd77 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
@@ -2,17 +2,15 @@
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.enums.CellExtraTypeEnum;
-import com.alibaba.excel.metadata.CellExtra;
 import com.alibaba.excel.read.listener.ReadListener;
-import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.platform.domain.entity.CalculateRule;
 import com.ycl.platform.domain.entity.TContract;
+import com.ycl.platform.domain.vo.CalculateRuleCascaderVO;
 import com.ycl.platform.mapper.CalculateRuleMapper;
+import com.ycl.platform.mapper.TContractMapper;
 import com.ycl.platform.service.ICalculateRuleService;
-import com.ycl.system.domain.TreeNode;
 import com.ycl.system.domain.TreeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +31,8 @@
 public class CalculateRuleServiceImpl extends ServiceImpl<CalculateRuleMapper, CalculateRule> implements ICalculateRuleService {
     @Autowired
     private CalculateRuleMapper calculateRuleMapper;
+    @Autowired
+    private TContractMapper contractMapper;
 
     /**
      * 鏌ヨ杩濈害瑙勫垯
@@ -42,7 +42,7 @@
      */
     @Override
     public CalculateRule selectDefaultRuleById(Long id) {
-        return calculateRuleMapper.selectDefaultRuleById(id);
+        return calculateRuleMapper.selectById(id);
     }
 
     /**
@@ -141,4 +141,9 @@
                 .list();
         return TreeUtils.build(list, 0L);
     }
+
+    @Override
+    public List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId) {
+        return TreeUtils.build(calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate()), 0L);
+    }
 }

--
Gitblit v1.8.0