Merge branch 'pre'

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -308,9 +308,9 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
             return "该评价已失效！";
         }
 
-        if(mobileResultPageVo.getEvaluateStatus() == 2){
-            return "已经评价，请勿重复评价";
-        }
+//        if(mobileResultPageVo.getEvaluateStatus() == 2){
+//            return "已经评价，请勿重复评价";
+//        }
 
         if(dto.getSubmitType() != null && dto.getSubmitType() == 2){
             //评价结果保存

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

@@ -577,7 +577,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                     for (Long id : evaluateCategoryMap.keySet()) {
                         List<TeaEvaluateClassListVo> resultList = evaluateCategoryMap.get(id);
                         int allSorce = resultList.stream().mapToInt(TeaEvaluateClassListVo::getScore).sum();
-                        double avgScore = BigDecimal.valueOf(allSorce).divide(BigDecimal.valueOf(resultList.size())).setScale(2, RoundingMode.HALF_UP).doubleValue();
+                        double avgScore = BigDecimal.valueOf(allSorce).divide(BigDecimal.valueOf(resultList.size()), 2, RoundingMode.HALF_UP).doubleValue();
                         evaluateSocreList.add(avgScore);
                     }
                     double sum = evaluateSocreList.stream().mapToDouble(Double::doubleValue).sum();
@@ -1005,7 +1005,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
         columnNumber ++;
 
         cell = row.createCell(columnNumber);
-        cell.setCellValue("扣分");
+        cell.setCellValue("汇总");
         cell.setCellStyle(cellStyle);
         columnNumber ++;
 
@@ -1015,7 +1015,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
         columnNumber ++;
 
         cell = row.createCell(columnNumber);
-        cell.setCellValue("扣分");
+        cell.setCellValue("指数");
         cell.setCellStyle(cellStyle);
         columnNumber ++;
 
@@ -1025,7 +1025,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
         columnNumber ++;
 
         cell = row.createCell(columnNumber);
-        cell.setCellValue("扣分");
+        cell.setCellValue("指数");
         cell.setCellStyle(cellStyle);
         columnNumber ++;
 

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

@@ -4,10 +4,12 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.organization.entity.Role;
 import com.xjrsoft.module.system.dto.AddXjrMenuGroupDto;
 import com.xjrsoft.module.system.dto.AddXjrMenuGroupSetDto;
 import com.xjrsoft.module.system.dto.UpdateXjrMenuGroupSetDto;
@@ -53,11 +55,15 @@ public class XjrMenuGroupSetController {
     @SaCheckPermission("xjrmenugroupset:detail")
     public RT<PageOutput<XjrMenuGroupSetPageVo>> page(@Valid XjrMenuGroupSetPageDto dto){
 
-        LambdaQueryWrapper<XjrMenuGroupSet> queryWrapper = new LambdaQueryWrapper<>();
+        MPJLambdaWrapper<XjrMenuGroupSet> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
-                    .orderByDesc(XjrMenuGroupSet::getId)
-                .select(XjrMenuGroupSet.class,x -> VoToColumnUtil.fieldsToColumns(XjrMenuGroupSetPageVo.class).contains(x.getProperty()));
-        IPage<XjrMenuGroupSet> page = xjrMenuGroupSetService.page(ConventPage.getPage(dto), queryWrapper);
+                .leftJoin(Role.class, Role::getId, XjrMenuGroupSet::getRoleId)
+                .select(XjrMenuGroupSet::getId)
+                .selectAs(Role::getName, XjrMenuGroupSetPageVo::getRoleName)
+                .select(XjrMenuGroupSet.class,x -> VoToColumnUtil.fieldsToColumns(XjrMenuGroupSetPageVo.class).contains(x.getProperty()))
+                .orderByDesc(XjrMenuGroupSet::getCreateDate)
+                .disableSubLogicDel();
+        IPage<XjrMenuGroupSetPageVo> page = xjrMenuGroupSetService.selectJoinListPage(ConventPage.getPage(dto), XjrMenuGroupSetPageVo.class, queryWrapper);
         PageOutput<XjrMenuGroupSetPageVo> pageOutput = ConventPage.getPageOutput(page, XjrMenuGroupSetPageVo.class);
         return RT.ok(pageOutput);
     }
@@ -102,6 +108,8 @@ public class XjrMenuGroupSetController {
     @ApiOperation(value = "查询学生菜单")
     @SaCheckPermission("xjrmenugroupset:detail")
     public RT<List<XjrMenuGroupMenuListVo>> menuList(@Valid XjrMenuGroupMenuListDto dto){
+        XjrMenuGroupSet groupSet = xjrMenuGroupSetService.getById(dto.getXjrMenuGroupSetId());
+        dto.setRoleId(groupSet.getRoleId());
         return RT.ok(xjrMenuGroupSetService.getMenuList(dto));
     }
 

src/main/java/com/xjrsoft/module/system/dto/AddXjrMenuGroupSetDto.java

@@ -35,12 +35,6 @@ public class AddXjrMenuGroupSetDto implements Serializable {
     @ApiModelProperty("使用范围(1:全部学生 2:白名单学生)")
     private Integer useRange;
 
-    /**
-    * xjrMenuGroup
-    */
-    @ApiModelProperty("xjrMenuGroup子表")
-    private List<AddXjrMenuGroupDto> xjrMenuGroupList;
-
     @ApiModelProperty("角色id")
     private Long roleId;
 }

src/main/java/com/xjrsoft/module/system/dto/MenuTreeDto.java

@@ -36,4 +36,7 @@ public class MenuTreeDto {
 
     @ApiModelProperty("是否显示在服务中心（0：否 1：是）")
     private Integer isShowServce;
+
+    @ApiModelProperty("学生userId")
+    private Long studentUserId;
 }

src/main/java/com/xjrsoft/module/system/dto/XjrMenuGroupMenuListDto.java

@@ -18,4 +18,7 @@ public class XjrMenuGroupMenuListDto extends PageInput {
 
     @ApiModelProperty("功能分类设置id")
     private Long xjrMenuGroupSetId;
+
+    @ApiModelProperty("角色id")
+    private Long roleId;
 }

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -250,7 +250,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
         List<MenuVo> result = new ArrayList<>();
         Map<Long, Long> menuGroupMap = new HashMap<>();
         Map<Long, Integer> menuDisabledMap = new HashMap<>();
-        if(roleIds.contains(RoleEnum.STUDENT.getCode())){
+        if(roleIds.contains(RoleEnum.STUDENT.getCode()) || roleIds.contains(RoleEnum.PARENT.getCode())){
             LambdaQueryWrapper<XjrMenuGroupSet> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper
                     .orderByAsc(XjrMenuGroupSet::getId)
@@ -270,9 +270,13 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
             List<XjrMenuGroup> xjrMenuGroupMenu = xjrMenuGroupSetService.getXjrMenuGroupMenu();
             Set<Long> menuIds = xjrMenuGroupMenu.stream().map(XjrMenuGroup::getXjrMenuId).collect(Collectors.toSet());
             menuGroupMap.putAll(xjrMenuGroupMenu.stream().collect(Collectors.toMap(XjrMenuGroup::getXjrMenuId, XjrMenuGroup::getXjrMenuGroupSetId)));
+            Long userId = StpUtil.getLoginIdAsLong();
+            if(dto.getStudentUserId() != null && roleIds.contains(RoleEnum.PARENT.getCode())){
+                userId = dto.getStudentUserId();
+            }
             List<WhitelistManagement> managementList = whitelistManagementService.list(
                     new QueryWrapper<WhitelistManagement>().lambda()
-                            .eq(WhitelistManagement::getUserId, StpUtil.getLoginIdAsLong())
+                            .eq(WhitelistManagement::getUserId, userId)
             );
             for (XjrMenuGroup menuGroupMenu : xjrMenuGroupMenu) {
                 menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 0);

src/main/java/com/xjrsoft/module/system/service/impl/XjrMenuGroupSetServiceImpl.java

@@ -38,11 +38,6 @@ public class XjrMenuGroupSetServiceImpl extends MPJBaseServiceImpl<XjrMenuGroupS
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(XjrMenuGroupSet xjrMenuGroupSet) {
         setMapper.insert(xjrMenuGroupSet);
-        for (XjrMenuGroup xjrMenuGroup : xjrMenuGroupSet.getXjrMenuGroupList()) {
-            xjrMenuGroup.setXjrMenuGroupSetId(xjrMenuGroupSet.getId());
-            groupMapper.insert(xjrMenuGroup);
-        }
-
         return true;
     }
 
@@ -50,35 +45,6 @@ public class XjrMenuGroupSetServiceImpl extends MPJBaseServiceImpl<XjrMenuGroupS
     @Transactional(rollbackFor = Exception.class)
     public Boolean update(XjrMenuGroupSet xjrMenuGroupSet) {
         setMapper.updateById(xjrMenuGroupSet);
-        //********************************* XjrMenuGroup  增删改  开始 *******************************************/
-        {
-            // 查出所有子级的id
-            List<XjrMenuGroup> xjrMenuGroupList = groupMapper.selectList(Wrappers.lambdaQuery(XjrMenuGroup.class).eq(XjrMenuGroup::getXjrMenuGroupSetId, xjrMenuGroupSet.getId()).select(XjrMenuGroup::getId));
-            List<Long> xjrMenuGroupIds = xjrMenuGroupList.stream().map(XjrMenuGroup::getId).collect(Collectors.toList());
-            //原有子表单 没有被删除的主键
-            List<Long> xjrMenuGroupOldIds = xjrMenuGroupSet.getXjrMenuGroupList().stream().map(XjrMenuGroup::getId).filter(Objects::nonNull).collect(Collectors.toList());
-            //找到需要删除的id
-            List<Long> xjrMenuGroupRemoveIds = xjrMenuGroupIds.stream().filter(item -> !xjrMenuGroupOldIds.contains(item)).collect(Collectors.toList());
-
-            for (XjrMenuGroup xjrMenuGroup : xjrMenuGroupSet.getXjrMenuGroupList()) {
-                //如果不等于空则修改
-                if (xjrMenuGroup.getId() != null) {
-                    groupMapper.updateById(xjrMenuGroup);
-                }
-                //如果等于空 则新增
-                else {
-                    //已经不存在的id 删除
-                    xjrMenuGroup.setXjrMenuGroupSetId(xjrMenuGroupSet.getId());
-                    groupMapper.insert(xjrMenuGroup);
-                }
-            }
-            //已经不存在的id 删除
-            if(xjrMenuGroupRemoveIds.size() > 0){
-                groupMapper.deleteBatchIds(xjrMenuGroupRemoveIds);
-            }
-        }
-        //********************************* XjrMenuGroup  增删改  结束 *******************************************/
-
         return true;
     }
 

src/main/java/com/xjrsoft/module/system/vo/XjrMenuGroupSetPageVo.java

@@ -68,4 +68,7 @@ public class XjrMenuGroupSetPageVo {
     @ApiModelProperty("角色id")
     private Long roleId;
 
+    @ApiModelProperty("配置对象")
+    private String roleName;
+
 }

src/main/resources/mapper/system/XjrMenuGroupMapper.xml

@@ -4,13 +4,24 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.system.mapper.XjrMenuGroupMapper">
     <select id="getMenuList" parameterType="com.xjrsoft.module.system.dto.XjrMenuGroupMenuListDto" resultType="com.xjrsoft.module.system.vo.XjrMenuGroupMenuListVo">
-        SELECT id, name,(
-            SELECT COUNT(*) FROM xjr_menu_group WHERE delete_mark = 0 AND xjr_menu_group_set_id = #{dto.xjrMenuGroupSetId}
-            AND xjr_menu_id = xjr_menu.id
+        SELECT t1.id, t1.name,(
+        SELECT COUNT(*) FROM xjr_menu_group WHERE delete_mark = 0 AND xjr_menu_group_set_id =  #{dto.xjrMenuGroupSetId}
+        AND xjr_menu_id = t1.id
         ) AS is_selected,
-            (SELECT COUNT(*) FROM xjr_menu_group WHERE delete_mark = 0 AND xjr_menu_group_set_id != #{dto.xjrMenuGroupSetId}
-                                                                AND xjr_menu_id = xjr_menu.id) as is_used FROM xjr_menu WHERE system_id = 1726806691140907010
-        AND delete_mark = 0 AND enabled_mark = 1
-        and system_type = 'system_app'
+        (SELECT COUNT(*) FROM xjr_menu_group a1
+        INNER JOIN xjr_menu_group_set a2 ON a1.xjr_menu_group_set_id = a2.id
+        WHERE a1.delete_mark = 0 AND a2.id !=  #{dto.xjrMenuGroupSetId} AND a2.role_id = #{dto.roleId}
+        AND a2.delete_mark = 0
+        AND a1.xjr_menu_id = t1.id) AS is_used FROM xjr_menu t1
+        LEFT JOIN xjr_subsystem t2 ON t1.system_id = t2.id
+        WHERE 1 = 1
+        AND t1.delete_mark = 0 AND t1.enabled_mark = 1
+        AND t1.system_type = 'system_app'
+        <if test="dto.roleId != null and dto.roleId == 3">
+            and t2.code = 'student_app'
+        </if>
+        <if test="dto.roleId != null and dto.roleId == 4">
+            and t2.code = 'parents_app'
+        </if>
     </select>
 </mapper>