Ver Fonte

班级考核移动端调整

dzx há 11 meses atrás
pai
commit
8dddd63200

+ 10 - 0
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.enums.EnabledMark;
@@ -157,9 +158,18 @@ public class BaseStudentAssessmentInspectionController {
         relation.setModifyDate(new Date());
         boolean update = studentRelationService.updateById(relation);
 
+        long count = studentRelationService.count(
+                new QueryWrapper<BaseStudentAssessmentStudentRelation>().lambda()
+                        .eq(BaseStudentAssessmentStudentRelation::getBaseStudentAssessmentInspectionId, relation.getBaseStudentAssessmentInspectionId())
+                        .eq(BaseStudentAssessmentStudentRelation::getEnabledMark, EnabledMark.ENABLED.getCode())
+        );
+
         BaseStudentAssessmentInspection inspection = inspectionService.getById(relation.getBaseStudentAssessmentInspectionId());
         inspection.setModifyDate(new Date());
         inspection.setModifyUserId(StpUtil.getLoginIdAsLong());
+        if(count == 0){
+            inspection.setEnabledMark(EnabledMark.DISABLED.getCode());
+        }
         inspectionService.updateById(inspection);
         return RT.ok(update);
     }

+ 9 - 0
src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -91,6 +91,15 @@
         <if test="dto.endDate != null and dto.endDate != ''">
             and t1.assessment_date &lt;= #{dto.endDate}
         </if>
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and (
+            t2.name like concat('%', #{dto.keyword}, '%')
+            or t3.name like concat('%', #{dto.keyword}, '%')
+            or t5.name like concat('%', #{dto.keyword}, '%')
+            or t6.name like concat('%', #{dto.keyword}, '%')
+            or t1.reason like concat('%', #{dto.keyword}, '%')
+            )
+        </if>
         order by t1.id desc
     </select>