修改信息发布、公众号学生积分详情

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentLedgerServiceImpl.java

@@ -127,6 +127,9 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
             String userName = sysUserMapper.selectUserById(schoolEquipmentLedger.getUseId()).getUserName();
             schoolEquipmentLedger.setUseName(userName);
         }
+        if (schoolEquipmentLedger.getClassificationCode().length() < 4){
+            throw new ServiceException("分类编码至少选择至二级分类！");
+        }
         //生成自编码
         String code = getCode(schoolEquipmentLedger.getClassificationCode());
         schoolEquipmentLedger.setEncode(code);

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolXxfb/SchoolXxfbServiceImpl.java

@@ -26,6 +26,7 @@ import yangtz.cs.liu.wechat.vo.schoolXxfb.SchoolXxfbVo;
 
 import java.lang.reflect.Field;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
 import static yangtz.cs.liu.campus.constant.XxfbConstant.SAVE;
@@ -74,6 +75,12 @@ public class SchoolXxfbServiceImpl extends ServiceImpl<SchoolXxfbMapper, SchoolX
         if (!("姓名".equals(titles.get(1)))) {
             throw new ServiceException("第2列表头应为姓名");
         }
+        //判断表头是否有重复
+        //去重表头集合   去重之后如果新的表头集合和原表头集合长度一致，则表头没有重复值
+        List<String> titlesX = titles.stream().distinct().collect(Collectors.toList());
+        if (titlesX.size() != titles.size()){
+            throw new ServiceException("列名不能重复，请检查！");
+        }
 
         //获取表内容
         //拿第一个sheet表

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/student/WxSchoolStudentIntegralController.java

@@ -37,7 +37,7 @@ public class WxSchoolStudentIntegralController extends BaseController {
     @GetMapping("/list/{studentId}")
     public AjaxResult list(@PathVariable Long studentId, SchoolStudentIntegral schoolStudentIntegral)
     {
-
+        // TODO 获取当前学年，所在学期（未改）
         //获取当前学年，所在学期
         int term = isNewTerm();
         int schoolYear = getNewYear();
@@ -46,7 +46,11 @@ public class WxSchoolStudentIntegralController extends BaseController {
         schoolStudentIntegral.setSchoolYear(schoolYear);
         //该学生本学年当前学期积分列表
         List<SchoolStudentIntegral> list = integralService.selectSchoolStudentIntegralList(schoolStudentIntegral);
-        AjaxResult ajax = AjaxResult.success(list);
+        // TODO 修改公众号查询学生积分明细 获取该学生所有学期积分列表
+        SchoolStudentIntegral studentIntegral = new SchoolStudentIntegral();
+        studentIntegral.setStudentId(studentId);
+        List<SchoolStudentIntegral> studentIntegralList = integralService.selectSchoolStudentIntegralList(studentIntegral);
+        AjaxResult ajax = AjaxResult.success(studentIntegralList);
 
         //班级得分 classScore
         // ，级部得分，gradeScore