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

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskAssignServiceImpl.java

@@ -67,11 +67,14 @@ public class MaterialTaskAssignServiceImpl   extends MPJBaseServiceImpl<Material
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delete(List<Long> ids) {
-        MaterialTaskAssign materialTaskAssign = materialTaskAssignMapper.selectOne(Wrappers.lambdaQuery(MaterialTaskAssign.class).in(MaterialTaskAssign::getId, ids));
-        MaterialTask materialTask = materialTaskMapper.selectByIdDeep(materialTaskAssign.getMaterialTaskId());
-        int count = materialTaskAssignMapper.deleteBatchIds(ids);
-        materialTask.setAssignPerson(materialTask.getAssignPerson() - count);
-        materialTaskMapper.updateById(materialTask);
+        List<MaterialTaskAssign> materialTaskAssignList = materialTaskAssignMapper.selectList(Wrappers.lambdaQuery(MaterialTaskAssign.class).in(MaterialTaskAssign::getId, ids));
+        for (MaterialTaskAssign materialTaskAssign : materialTaskAssignList) {
+            MaterialTask materialTask = materialTaskMapper.selectByIdDeep(materialTaskAssign.getMaterialTaskId());
+            int count = materialTaskAssignMapper.deleteBatchIds(ids);
+            materialTask.setAssignPerson(materialTask.getAssignPerson() - count);
+            materialTaskMapper.updateById(materialTask);
+        }
+
         return true;
     }
 

src/main/java/com/xjrsoft/module/student/controller/BaseStudentPostController.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.github.yulichang.toolkit.MPJWrappers;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -24,8 +25,10 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.vo.BaseStudentPostListVo;
 import com.xjrsoft.module.student.vo.BaseStudentPostTreeVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import org.springframework.http.ResponseEntity;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
@@ -81,11 +84,13 @@ public class BaseStudentPostController {
     @SaCheckPermission("basestudentpost:detail")
     public RT<PageOutput<BaseStudentPostPageVo>> page(@Valid BaseStudentPostPageDto dto){
 
-        LambdaQueryWrapper<BaseStudentPost> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(BaseStudentPost::getId)
-                .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostPageVo.class).contains(x.getProperty()));
-        IPage<BaseStudentPost> page = baseStudentPostService.page(ConventPage.getPage(dto), queryWrapper);
+        IPage<BaseStudentPostPageVo> page = baseStudentPostService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentPostPageVo.class,
+                MPJWrappers.<BaseStudentPost>lambdaJoin()
+                .orderByDesc(BaseStudentPost::getSortCode)
+                .selectAs(DictionaryDetail::getName, BaseStudentPostPageVo::getLevelCn)
+                .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostPageVo.class).contains(x.getProperty()))
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentPost::getLevel)
+        );
         PageOutput<BaseStudentPostPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentPostPageVo.class);
         return RT.ok(pageOutput);
     }

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

@@ -52,6 +52,7 @@ public class StudentManagerController {
                         .like(StrUtil.isNotBlank(dto.getMobile()), BaseStudentUser::getMobile, dto.getMobile())
                         .like(StrUtil.isNotBlank(dto.getName()), BaseStudentUser::getName, dto.getName())
                         .like(StrUtil.isNotBlank(dto.getEmail()), BaseStudentUser::getEmail, dto.getEmail())
+                        .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudent::getId, dto.getClassId())
                         .in((ObjectUtil.isNotNull(dto.getTokenType()) && dto.getTokenType() == 1), BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
                         .orderByDesc(BaseStudentUser::getId)
                         .select(BaseStudentUser::getId)

src/main/java/com/xjrsoft/module/student/dto/BaseStudentUserPageDto.java

@@ -35,4 +35,10 @@ public class BaseStudentUserPageDto extends PageInput {
     @ApiModelProperty("权限标识")
     private Integer tokenType;
 
+    /**
+     * 班级id
+     */
+    @ApiModelProperty("班级id")
+    private Long classId;
+
 }

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

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface BaseStudentPostMapper extends BaseMapper<BaseStudentPost> {
+public interface BaseStudentPostMapper extends MPJBaseMapper<BaseStudentPost> {
 
 }

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

@@ -13,5 +13,5 @@ import java.util.List;
 * @Version 1.0
 */
 
-public interface IBaseStudentPostService extends IService<BaseStudentPost> {
+public interface IBaseStudentPostService extends MPJBaseService<BaseStudentPost> {
 }

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

@@ -21,5 +21,5 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 */
 @Service
 @AllArgsConstructor
-public class BaseStudentPostServiceImpl extends ServiceImpl<BaseStudentPostMapper, BaseStudentPost> implements IBaseStudentPostService {
+public class BaseStudentPostServiceImpl extends MPJBaseServiceImpl<BaseStudentPostMapper, BaseStudentPost> implements IBaseStudentPostService {
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPostPageVo.java

@@ -93,6 +93,15 @@ public class BaseStudentPostPageVo {
     @ExcelProperty("职务级别")
     @ApiModelProperty("职务级别")
     private String level;
+
+    /**
+     * 职务级别
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职务级别中文")
+    @ApiModelProperty("职务级别中文")
+    private String levelCn;
+
     /**
     * 是否允许德育检查(1:是 0:否)
     */

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

@@ -35,7 +35,7 @@
         <if test="dto.endDate != null and dto.endDate != ''">
             and t.assessment_date &lt;= #{dto.endDate}
         </if>
-        <if test="dto.assessmentUserIds != null and dto.assessmentUserIds != ''">
+        <if test="dto.assessmentUserIds != null and dto.assessmentUserIds.size() > 0">
             AND t.assessment_user_id in
             <foreach item="userId" index="index" collection="dto.assessmentUserIds" open="(" close=")" separator=",">
                 #{userId}
@@ -77,19 +77,19 @@
         AND t5.class_id IN (
         SELECT id FROM base_class WHERE teacher_id = #{dto.teacherId}
         )
-        <if test="dto.gradeIds != null and dto.gradeIds != ''">
+        <if test="dto.gradeIds != null and dto.gradeIds.size() > 0">
             AND t5.grade_id in
             <foreach item="gradeId" index="index" collection="dto.gradeIds" open="(" close=")" separator=",">
                 #{gradeId}
             </foreach>
         </if>
-        <if test="dto.classIds != null and dto.classIds != ''">
+        <if test="dto.classIds != null and dto.classIds.size() > 0">
             AND t5.class_id in
             <foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
                 #{classId}
             </foreach>
         </if>
-        <if test="dto.assessmentUserIds != null and dto.assessmentUserIds != ''">
+        <if test="dto.assessmentUserIds != null and dto.assessmentUserIds.size() > 0">
             AND t.assessment_user_id in
             <foreach item="assessmentUserId" index="index" collection="dto.assessmentUserIds" open="(" close=")" separator=",">
                 #{assessmentUserId}

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

@@ -44,7 +44,7 @@
         LEFT JOIN base_class t5 ON t2.class_id = t5.id
         WHERE t1.status = 1 AND t1.delete_mark = 0 AND t3.delete_mark = 0 AND t2.delete_mark = 0
         AND t5.id IN (SELECT id  FROM base_class WHERE teacher_id  = #{dto.teacherId})
-        <if test="dto.punishmentTypeIds != null and dto.punishmentTypeIds != ''">
+        <if test="dto.punishmentTypeIds != null and dto.punishmentTypeIds.size() > 0">
             AND t4.id in
             <foreach item="punishmentTypeId" index="index" collection="dto.punishmentTypeIds" open="(" close=")" separator=",">
                 #{punishmentTypeId}
@@ -64,7 +64,7 @@
         </if>
     </select>
     <select id="getMobileInfo" parameterType="com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoMobileDetailDto" resultType="com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoMobileDetailVo">
-        SELECT t.id,t3.name,t3.gender,t3.credential_number,t4.punishment_type,t1.reason,t1.start_time,t5.student_id,
+        SELECT t.id,t3.name as student_name,t3.gender,t3.credential_number,t4.punishment_type,t1.reason,t1.start_time,t5.student_id,
         t.adjust_date,t.adjust_type,t.adjust_reason,t.modify_date,t1.create_date,t1.is_publicity,t1.end_time,t.class_name,t.major FROM base_punishment_student_relation t
         INNER JOIN base_student_punishment_info t1 ON t.punishment_info_id = t1.id
         INNER JOIN base_student_school_roll t2 ON t.user_id = t2.user_id