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

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -13,6 +13,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.ArchivesStatusEnum;
 import com.xjrsoft.common.enums.AssessQuestionTypeEnum;
 import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.common.utils.WeChatUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
@@ -307,6 +308,15 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
 
     @Override
     public AssessmentTemplatePlanQuestionVo getQuestionsById(Long id) {
+        List<AssessmentPlanAnswerStudent> studentList = studentMapper.selectList(
+                new QueryWrapper<AssessmentPlanAnswerStudent>().lambda()
+                        .eq(AssessmentPlanAnswerStudent::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(AssessmentPlanAnswerStudent::getAssessmentTemplatePlanId, id)
+                        .eq(AssessmentPlanAnswerStudent::getStudentUserId, StpUtil.getLoginIdAsLong())
+        );
+        if(studentList.isEmpty()){
+            throw new MyException("当前登录账号与消息接收账号不匹配，请重新登录账号！");
+        }
         AssessmentTemplatePlan templatePlan = templatePlanMapper.selectById(id);
         AssessmentTemplatePlanQuestionVo vo = BeanUtil.toBean(templatePlan, AssessmentTemplatePlanQuestionVo.class);
         List<AssessmentPlanQuestion> questionList = planQuestionMapper.selectList(

src/main/java/com/xjrsoft/module/base/controller/BaseClassCourseController.java

@@ -100,7 +100,6 @@ public class BaseClassCourseController {
         MPJLambdaWrapper<BaseClassCourse> baseClassCourseMPJLambdaWrapper = new MPJLambdaWrapper<>();
         baseClassCourseMPJLambdaWrapper
                 .disableSubLogicDel()
-                .select(BaseClassCourse::getCourseId)
                 .select(BaseClassCourse::getId)
                 .selectAs(BaseClass::getName, BaseClassCourseListVo::getClassIdCn)
                 .selectAs(BaseCourseSubject::getName, BaseClassCourseListVo::getCourseIdCn)
@@ -206,7 +205,6 @@ public class BaseClassCourseController {
     @SaCheckPermission("baseclasscourse:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(baseClassCourseService.removeBatchByIds(ids));
-
     }
 
     @PostMapping("/import")
@@ -303,12 +301,12 @@ public class BaseClassCourseController {
         return RT.ok(result);
     }
 
-    @PostMapping("/class-course-textbook-export-query")
-    @ApiOperation(value = "班级课程教材详情条件导出")
-    public ResponseEntity<byte[]> classCourseTextbookExportQuery(@Valid @RequestBody ClassCourseTextbookExportQueryDto dto) throws IOException {
-//    @GetMapping("/class-course-textbook-export-query")
+//    @PostMapping("/class-course-textbook-export-query")
 //    @ApiOperation(value = "班级课程教材详情条件导出")
-//    public ResponseEntity<byte[]> classCourseTextbookExportQuery(@Valid ClassCourseTextbookExportQueryDto dto) throws IOException {
+//    public ResponseEntity<byte[]> classCourseTextbookExportQuery(@Valid @RequestBody ClassCourseTextbookExportQueryDto dto) throws IOException {
+    @GetMapping("/class-course-textbook-export-query")
+    @ApiOperation(value = "班级课程教材详情条件导出")
+    public ResponseEntity<byte[]> classCourseTextbookExportQuery(@Valid ClassCourseTextbookExportQueryDto dto) throws IOException {
         ByteArrayOutputStream bot = baseClassCourseService.classCourseTextbookExportQuery(dto);
         return RT.fileStream(bot.toByteArray(), "BaseClassCourse" + ExcelTypeEnum.XLSX.getValue());
     }

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassCourseServiceImpl.java

@@ -513,26 +513,26 @@ public class BaseClassCourseServiceImpl extends MPJBaseServiceImpl<BaseClassCour
         cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
         cellStyle.setAlignment(HorizontalAlignment.CENTER);
 
+        List<List<String>> inList = new ArrayList<>();
+        List<Integer> mergeStepList = new ArrayList<>();
         for (Map.Entry<Long, List<ClassCourseTextbookExportQueryVo>> entry : dataMapByClassId.entrySet()){
             Long key = entry.getKey();
             List<ClassCourseTextbookExportQueryVo> value = entry.getValue();
-            List<List<String>> inList = new ArrayList<>();
 
             // 小计合计
             BigDecimal totalDiscountPrice = BigDecimal.ZERO;
             for (ClassCourseTextbookExportQueryVo c : value){
                 totalDiscountPrice = totalDiscountPrice.add(ObjectUtils.isNotEmpty(c.getDiscountPrice()) ? c.getDiscountPrice() : BigDecimal.ZERO);
             }
-            for (ClassCourseTextbookExportQueryVo c : value){
-                c.setTotalDiscountPrice(totalDiscountPrice);
-            }
 
             // 总价合计
             BigDecimal totalPriceTotal = BigDecimal.ZERO;
             for (ClassCourseTextbookExportQueryVo c : value){
                 totalPriceTotal = totalPriceTotal.add(ObjectUtils.isNotEmpty(c.getTotalPrices()) ? c.getTotalPrices() : BigDecimal.ZERO);
             }
+
             for (ClassCourseTextbookExportQueryVo c : value){
+                c.setTotalDiscountPrice(totalDiscountPrice);
                 c.setTotalPriceTotal(totalPriceTotal);
             }
 
@@ -554,24 +554,41 @@ public class BaseClassCourseServiceImpl extends MPJBaseServiceImpl<BaseClassCour
                 date.add(ObjectUtils.isNotEmpty(c.getTotalPriceTotal()) ? c.getTotalPriceTotal().toString() : "0");
                 inList.add(date);
             }
+            mergeStepList.add(value.size());
+        }
 
-            for (List<String> rowData : inList) {
-                Row dataRow = sheet.createRow(dataRowNumber);
-                for (int i = 0; i < rowData.size(); i++) {
-                    sheet.autoSizeColumn(i);
-                    Cell cell = dataRow.createCell(i);
-                    cell.setCellValue(rowData.get(i));
-                    cell.setCellStyle(cellStyle);
-                }
+        Cell cell;
+        for (List<String> rowData : inList) {
+            Row dataRow = sheet.createRow(dataRowNumber);
+            int size = rowData.size();
+            for (int i = 0; i < size; i++) {
+                cell = dataRow.createCell(i);
+                cell.setCellValue(rowData.get(i));
+                cell.setCellStyle(cellStyle);
+            }
+            dataRowNumber++;
+        }
+
+        // 合并
+        dataRowNumber = 1;
+
+        for (Integer step : mergeStepList){
+            if(step == 1){
                 dataRowNumber++;
             }
-            if(inList.size() > 1){
-                sheet.addMergedRegion(new CellRangeAddress(dataRowNumber - inList.size(), dataRowNumber - 1, 9, 9));
-                sheet.addMergedRegion(new CellRangeAddress(dataRowNumber - inList.size(), dataRowNumber - 1, 10, 10));
-                sheet.addMergedRegion(new CellRangeAddress(dataRowNumber - inList.size(), dataRowNumber - 1, 12, 12));
+
+            if(step > 1){
+                sheet.addMergedRegion(new CellRangeAddress(dataRowNumber, dataRowNumber + step - 1, 9, 9));
+                sheet.addMergedRegion(new CellRangeAddress(dataRowNumber, dataRowNumber + step - 1, 10, 10));
+                sheet.addMergedRegion(new CellRangeAddress(dataRowNumber, dataRowNumber + step - 1, 12, 12));
+                dataRowNumber = dataRowNumber + step;
             }
         }
 
+        for (int i = 0; i < importConfigs.size(); i++) {
+            sheet.autoSizeColumn(i);
+        }
+
         //写入文件
         ByteArrayOutputStream bot = new ByteArrayOutputStream();
         workbook.write(bot);

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -274,7 +274,7 @@ public class DataboardController {
                 .innerJoin(BaseTeacher.class,BaseTeacher::getUserId,XjrUser::getId)
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseTeacher::getJobState, ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getJobState))
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,XjrUser::getCredentialType,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getCredentialType))
-                .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseTeacher::getEmployWay,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getEmployWay))
+                .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseTeacher::getEmployType,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getEmployWay))
 
                 .selectAsClass(BaseTeacher.class, XjrUserPageVo.class);
 
@@ -296,21 +296,13 @@ public class DataboardController {
                 .map(XjrUserPageVo::getId).collect(Collectors.toSet());
         result.setTeacherCount1(teacherSet1.size());
         Set<String> teacherSet2 = teacherList.stream()
-                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1602")))
+                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1605")))
                 .map(XjrUserPageVo::getId).collect(Collectors.toSet());
         result.setTeacherCount2(teacherSet2.size());
-        Set<String> teacherSet3 = teacherList.stream()
-                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1606")))
-                .map(XjrUserPageVo::getId).collect(Collectors.toSet());
-        result.setTeacherCount3(teacherSet3.size());
         Set<String> teacherSet4 = teacherList.stream()
                 .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1609")))
                 .map(XjrUserPageVo::getId).collect(Collectors.toSet());
         result.setTeacherCount4(teacherSet4.size());
-        Set<String> teacherSet5 = teacherList.stream()
-                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1608")))
-                .map(XjrUserPageVo::getId).collect(Collectors.toSet());
-        result.setTeacherCount5(teacherSet5.size());
         return RT.ok(result);
     }
 
@@ -429,9 +421,9 @@ public class DataboardController {
         }
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         RepairStatisticsVo result = new RepairStatisticsVo();
-        String sql = "SELECT t1.* FROM wf_repair_declaration t1" +
+        String sql = "SELECT t1.is_artificial,t2.current_state FROM wf_repair_declaration t1" +
                 " INNER JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value" +
-                " WHERE t2.current_state = 'COMPLETED'";
+                " WHERE 1 = 1 ";
         if(startTime != null && endTime != null){
             sql += " and t1.application_time between '" + startTime.format(formatter) + "' and '" + endTime.format(formatter) + "'";
         }
@@ -442,13 +434,13 @@ public class DataboardController {
         int personCount = 0;
 
         for (Map<String, Object> objectMap : list) {
-            Object statusObj = objectMap.get("maintenance_feedback");
-            if(statusObj != null && !statusObj.toString().isEmpty()){
+            Object statusObj = objectMap.get("current_state");
+            if(HistoricProcessInstance.STATE_COMPLETED.equals(statusObj.toString())){
                 completeCount ++;
             }else{
                 uncompleteCount ++;
             }
-            if(objectMap.get("status") != null && "是".equals(objectMap.get("status").toString())){
+            if(objectMap.get("is_artificial") != null && "是".equals(objectMap.get("is_artificial").toString())){
                 personCount ++;
             }
 

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

@@ -6,6 +6,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -13,9 +14,12 @@ import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentInspectionDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
 import com.xjrsoft.module.student.dto.CalssQuantitativeAssessmentPageDto;
+import com.xjrsoft.module.student.dto.CancelStudentDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentInspectionDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentStudentRelation;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentStudentRelationService;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
@@ -39,6 +43,8 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
+import static com.alibaba.fastjson.JSONPatch.OperationType.remove;
+
 /**
  * @title: 学生班级巡查考核
  * @Author dzx
@@ -53,6 +59,8 @@ public class BaseStudentAssessmentInspectionController {
 
     private final IBaseStudentAssessmentInspectionService inspectionService;
 
+    private final IBaseStudentAssessmentStudentRelationService studentRelationService;
+
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生班级巡查考核列表(分页)")
     @SaCheckPermission("basestudentassessmentinspection:detail")
@@ -140,4 +148,14 @@ public class BaseStudentAssessmentInspectionController {
         String fileName = "recordExport" + ExcelTypeEnum.XLSX.getValue();
         return RT.fileStream(bytes, fileName);
     }
+
+
+    @PostMapping("/cancel-student")
+    @ApiOperation(value = "作废学生")
+    public RT<Boolean>  cancelStudent(@RequestBody CancelStudentDto dto){
+        BaseStudentAssessmentStudentRelation relation = studentRelationService.getById(dto.getId());
+        relation.setEnabledMark(EnabledMark.DISABLED.getCode());
+        boolean update = studentRelationService.updateById(relation);
+        return RT.ok(update);
+    }
 }

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

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 班级考核删除学生
+* @Author dzx
+* @Date: 2024年12月26日
+* @Version 1.0
+*/
+@Data
+public class CancelStudentDto implements Serializable {
+
+    @ApiModelProperty("主键")
+    private Long id;
+
+}

src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentStudentRelation.java

@@ -1,6 +1,9 @@
 package com.xjrsoft.module.student.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -82,4 +85,15 @@ public class BaseStudentAssessmentStudentRelation implements Serializable {
 
     @ApiModelProperty("被扣分数")
     private Double score;
+
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+     * 有效标志
+     */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
 }

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

@@ -146,11 +146,6 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
     @Override
     public BaseStudentAssessmentInspectionVo getInfo(Long id) {
         BaseStudentAssessmentInspectionVo result = assessmentInspectionMapper.getInfo(id);
-        // 处理加减分
-        if (result.getScoreType() != null && result.getScoreType().equals(ScoreTypeEnum.ScoreMinus.getCode())) {
-            result.setScore(result.getScore() * -1);
-        }
-
         // 获取班级信息
         List<BaseStudentAssessmentClassListVo> baseStudentAssessmentClassListVos = assessmentClassRelationMapper.selectJoinList(BaseStudentAssessmentClassListVo.class,
                 MPJWrappers.<BaseStudentAssessmentClassRelation>lambdaJoin()

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

@@ -46,4 +46,7 @@ public class BaseStudentAssessmentInspectionMobilePageVo {
 
     @ApiModelProperty("类型")
     private  String assessmentType;
+
+    @ApiModelProperty("考核项目")
+    private  String assessmentItemName;
 }

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

@@ -113,4 +113,7 @@ public class BaseStudentAssessmentInspectionMobileVo {
 
     @ApiModelProperty("类型")
     private  String assessmentType;
+
+    @ApiModelProperty("考核项目")
+    private  String assessmentItemName;
 }

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -58,6 +58,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -123,8 +124,6 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
         LambdaQueryWrapper<Textbook> textbookLambdaQueryWrapper = new LambdaQueryWrapper<>();
         textbookLambdaQueryWrapper
                 .eq(Textbook::getIssn, textbook.getIssn())
-                .eq(Textbook::getSubjectGroupId, textbook.getSubjectGroupId())
-                .eq(Textbook::getCourseSubjectId, textbook.getCourseSubjectId())
                 .eq(Textbook::getDeleteMark, DeleteMark.NODELETE.getCode())
         ;
 
@@ -143,6 +142,28 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateRubAndHand(Textbook textbook) {
+        Textbook old = textbookTextbookMapper.selectById(textbook.getId());
+        if(ObjectUtils.isEmpty(old)){
+            throw new MyException("教材信息已经被修改，请刷新重试。");
+        }
+
+        // 折扣修改，定价未修改
+        if(ObjectUtils.isNotEmpty(textbook.getDiscount()) && ObjectUtils.isEmpty(textbook.getPrice())){
+            BigDecimal discount =  BigDecimal.valueOf(textbook.getDiscount()).divide(BigDecimal.valueOf(10), 2, RoundingMode.DOWN);
+            textbook.setDiscountPrice(old.getPrice().multiply(discount));
+        }
+
+        // 折扣未修改，定价修改
+        if(ObjectUtils.isEmpty(textbook.getDiscount()) && ObjectUtils.isNotEmpty(textbook.getPrice())){
+            BigDecimal discount =  BigDecimal.valueOf(old.getDiscount()).divide(BigDecimal.valueOf(10), 2, RoundingMode.DOWN);
+            textbook.setDiscountPrice(textbook.getPrice().multiply(discount));
+        }
+
+        // 折扣修改，定价修改
+        if(ObjectUtils.isNotEmpty(textbook.getDiscount()) && ObjectUtils.isNotEmpty(textbook.getPrice())){
+            BigDecimal discount =  BigDecimal.valueOf(textbook.getDiscount()).divide(BigDecimal.valueOf(10), 2, RoundingMode.DOWN);
+            textbook.setDiscountPrice(textbook.getPrice().multiply(discount));
+        }
         int num = textbookTextbookMapper.updateById(textbook);
         return num > 0;
     }

src/main/java/com/xjrsoft/module/textbook/vo/TextbookPageVo.java

@@ -143,4 +143,9 @@ public class TextbookPageVo {
      */
     @ApiModelProperty("预估折扣")
     private Double discount;
+    /**
+     * 预估折扣
+     */
+    @ApiModelProperty("预估折扣后的价格")
+    private BigDecimal discountPrice;
 }

src/main/resources/mapper/base/BaseClassCourse.xml

@@ -5,69 +5,45 @@
 <mapper namespace="com.xjrsoft.module.base.mapper.BaseClassCourseMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.base.dto.BaseClassCoursePageDto" resultType="com.xjrsoft.module.base.vo.BaseClassCoursePageVo">
         SELECT
-        t.id                                          AS class_id,
-        t.name                                        AS class_name,
-        t1.name                                       AS teacher_name,
-        t3.name                                       AS major_name,
-        t4.name                                       AS dept_name,
-        (SELECT GROUP_CONCAT(DISTINCT t6.name SEPARATOR '、')
-        FROM base_class_course t5
-        LEFT JOIN base_course_subject t6 ON t6.id = t5.course_id
-        WHERE t5.class_id = t.id
-        AND t5.delete_mark = 0
-        <if test="dto.semester != null">
-        AND t5.base_semester_id = #{dto.semester}
-        </if>
-        ) AS course_name,
-        (SELECT GROUP_CONCAT(DISTINCT t7.book_name SEPARATOR '、')
-        FROM base_class_course t5
-        LEFT JOIN textbook t7 ON t7.id = t5.textbook_id
-        WHERE t5.class_id = t.id
-        AND t5.delete_mark = 0
-        <if test="dto.semester != null">
-        AND t5.base_semester_id = #{dto.semester}
-        </if>
-        ) AS textbook_name,
-        (SELECT sum(t8.price)
-        FROM base_class_course t5
-        LEFT JOIN textbook t8 ON t8.id = t5.textbook_id
-        WHERE t5.class_id = t.id
-        AND t5.delete_mark = 0
-        <if test="dto.semester != null">
-            AND t5.base_semester_id = #{dto.semester}
-        </if>
-        ) AS amount,
-        (SELECT sum(t8.discount_price)
-        FROM base_class_course t5
-        LEFT JOIN textbook t8 ON t8.id = t5.textbook_id
-        WHERE t5.class_id = t.id
-        AND t5.delete_mark = 0
-        <if test="dto.semester != null">
-            AND t5.base_semester_id = #{dto.semester}
-        </if>
-        ) AS count
+        t.id AS class_id,
+        t.name AS class_name,
+        t1.name AS teacher_name,
+        t3.name AS major_name,
+        t4.name AS dept_name,
+        GROUP_CONCAT(DISTINCT t6.name SEPARATOR '、') AS course_name,
+        GROUP_CONCAT(DISTINCT t7.book_name SEPARATOR '、') AS textbook_name,
+        SUM(t8.price) AS amount,
+        SUM(t8.discount_price) AS count
         FROM base_class t
         LEFT JOIN xjr_user t1 ON t1.id = t.teacher_id
         LEFT JOIN base_class_major_set t2 ON t2.class_id = t.id
         LEFT JOIN base_major_set t3 ON t3.id = t2.major_set_id
         LEFT JOIN xjr_department t4 ON t4.id = t.org_id
+        LEFT JOIN base_class_course t5 ON t5.class_id = t.id AND t5.delete_mark = 0
+        LEFT JOIN base_course_subject t6 ON t6.id = t5.course_id AND t6.delete_mark = 0
+        LEFT JOIN textbook t7 ON t7.id = t5.textbook_id AND t7.delete_mark = 0
+        LEFT JOIN textbook t8 ON t8.id = t5.textbook_id AND t8.delete_mark = 0
         WHERE t.delete_mark = 0
+        <if test="dto.semester != null">
+            AND t5.base_semester_id = #{dto.semester}
+        </if>
         <if test="dto.className != null and dto.className != ''">
-            and t.name like concat('%', #{dto.className}, '%')
+            AND t.name LIKE CONCAT('%', #{dto.className}, '%')
         </if>
         <if test="dto.deptId != null">
-            and t4.id = #{dto.deptId}
+            AND t4.id = #{dto.deptId}
         </if>
         GROUP BY t.id, t.name, t1.name, t3.name, t4.name
-        <if test="dto.courseSet == 1">
-            HAVING LENGTH(course_name) > 0
-        </if>
-        <if test="dto.courseSet == 2">
-            HAVING COALESCE(LENGTH(course_name), 0) = 0
-        </if>
+        <choose>
+            <when test="dto.courseSet == 1">
+                HAVING LENGTH(course_name) > 0
+            </when>
+            <when test="dto.courseSet == 2">
+                HAVING LENGTH(course_name) = 0
+            </when>
+        </choose>
     </select>
 
-
     <select id="getAllCourseBook" resultType="com.xjrsoft.module.base.entity.CourseBookInfo">
         SELECT
             t.course_subject_id                    AS courseId,

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

@@ -59,23 +59,28 @@
         left join xjr_user t5 on t.assessment_user_id=t5.id
         left join xjr_dictionary_detail t6 on t6.code=t.score_type
         left join xjr_user t7 on t.create_user_id=t7.id
-        where t.id=#{id} and t.delete_mark=0 and t1.delete_mark=0  and t2.delete_mark=0;
+        where t.id = #{id} and t.delete_mark = 0 and t1.delete_mark = 0 and t2.delete_mark = 0
     </select>
 
     <select id="getMobilePage" parameterType="com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo">
-        select t.id,t1.assessment_date,t2.name as assessment_category_name,t3.name as assessment_project_name,t5.name as
-        assessment_class_name,t1.reason,t1.score,t1.score_type,t4.name as score_type_cn,
+        SELECT t.id,t1.assessment_date,t2.name AS assessment_category_name,t3.name AS assessment_project_name,t5.name AS
+        assessment_class_name,t1.reason,t1.score,t1.score_type,t4.name AS score_type_cn,
         (
-            SELECT count(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id =
-            t1.id and class_id=t.class_id
-        ) as student_count,t1.assessment_type
-        from base_student_assessment_class_relation t
-        left join base_student_assessment_inspection t1 on t1.id=t.base_student_assessment_inspection_id
-        left join base_student_assessment_category t2 on (t2.id = t1.base_student_assessment_category_id)
-        left join base_student_assessment_project t3 on (t3.id = t1.base_student_assessment_project_id)
-        left join xjr_dictionary_detail t4 on t4.code=t1.score_type
-        left join base_class t5 on t5.id=t.class_id
-        where t1.delete_mark = 0 and t.class_id in
+        SELECT COUNT(*) FROM base_student_assessment_student_relation WHERE
+        base_student_assessment_inspection_id = t1.id AND class_id = t.class_id AND delete_mark = 0 and enabled_mark = 1
+        ) AS student_count,t1.assessment_type,
+        (
+        SELECT COUNT(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id =
+        t1.id AND class_id = t.class_id AND delete_mark = 0 and enabled_mark = 1
+        ) AS student_count,t1.assessment_type,t6.name AS assessment_item_name
+        FROM base_student_assessment_class_relation t
+        LEFT JOIN base_student_assessment_inspection t1 ON t1.id=t.base_student_assessment_inspection_id
+        LEFT JOIN base_student_assessment_category t2 ON (t2.id = t1.base_student_assessment_category_id)
+        LEFT JOIN base_student_assessment_project t3 ON (t3.id = t1.base_student_assessment_project_id)
+        LEFT JOIN base_student_assessment_item t6 ON (t6.id = t1.base_student_assessment_item_id)
+        LEFT JOIN xjr_dictionary_detail t4 ON t4.code=t1.score_type
+        LEFT JOIN base_class t5 ON t5.id=t.class_id
+        WHERE t1.delete_mark = 0 and t.class_id in
         <foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
             #{classId}
         </foreach>
@@ -95,16 +100,17 @@
 
     <select id="getMobileInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo">
         select t.id,t.class_id,t.base_student_assessment_inspection_id,t1.score,t5.name as assessment_class_name,t2.name as assessment_category_name,t3.name as assessment_project_name,t1.assessment_date,t1.reason,
-        t6.name as assessment_user_name,t7.name as create_user_name,t1.create_date,t1.file_id,t1.score_type,t4.name as score_type_cn,t1.assessment_type
+        t6.name as assessment_user_name,t7.name as create_user_name,t1.create_date,t1.file_id,t1.score_type,t4.name as score_type_cn,t1.assessment_type,t8.name as assessment_item_name
         from base_student_assessment_class_relation t
         left join base_student_assessment_inspection t1 on t1.id=t.base_student_assessment_inspection_id
         left join base_student_assessment_category t2 on (t2.id = t1.base_student_assessment_category_id)
         left join base_student_assessment_project t3 on (t3.id = t1.base_student_assessment_project_id)
+        left join base_student_assessment_item t8 on (t8.id = t1.base_student_assessment_item_id)
         left join xjr_dictionary_detail t4 on t4.code=t1.score_type
         left join base_class t5 on t5.id=t.class_id
         left join xjr_user t6 on t1.assessment_user_id=t6.id
         left join xjr_user t7 on t1.create_user_id=t7.id
-        where t.id=#{id};
+        where t.id = #{id};
     </select>
 
     <select id="getStudentIndividualBehaviorExcelVoList" parameterType="com.xjrsoft.module.student.dto.QuantitativeAssessmentExcelDto" resultType="com.xjrsoft.module.student.vo.QuantitativeAssessmentSubTableExcelVo">
@@ -114,7 +120,7 @@
         sum(if(t1.score_type = 'score_add', t1.score, -1 * t1.score)) as finalScore
         from base_student_assessment_student_relation t
         left join base_student_assessment_inspection t1 on t1.id = t.base_student_assessment_inspection_id
-        where t1.delete_mark = 0
+        where t1.delete_mark = 0 and t.delete_mark = 0 and t.enabled_mark = 1
         <if test="dto.yearAndMonth != null and dto.yearAndMonth != ''">
             and date_format(t1.assessment_date, '%Y-%m') = #{dto.yearAndMonth}
         </if>
@@ -142,7 +148,7 @@
         left join xjr_user t4 on t4.id = t3.teacher_id
         left join base_student_assessment_base_score t5 on t5.base_semester_id = t1.base_semester_id
         left join total_score t6 on t6.studentUserId = t.user_id
-        where t1.delete_mark = 0
+        where t1.delete_mark = 0 and t.delete_mark = 0 and t.enabled_mark = 1
         <if test="dto.yearAndMonth != null and dto.yearAndMonth != ''">
             and date_format(t1.assessment_date, '%Y-%m') = #{dto.yearAndMonth}
         </if>
@@ -155,7 +161,7 @@
         from base_student_assessment_student_relation t
         left join base_student_assessment_inspection t1
         on t1.id = t.base_student_assessment_inspection_id
-        where t1.delete_mark = 0
+        where t1.delete_mark = 0 and t.delete_mark = 0 and t.enabled_mark = 1
         and t1.base_student_assessment_category_id = #{dto.baseStudentAssessmentCategoryId}
         <if test="dto.classIdList != null and !dto.classIdList.isEmpty()">
             and t1.class_ids in
@@ -197,7 +203,7 @@
         left join xjr_user t4 on t4.id = t3.teacher_id
         left join base_student_assessment_base_score t5 on t5.base_semester_id = t1.base_semester_id
         left join total_score t6 on t6.studentUserId = t.user_id
-        where t1.delete_mark = 0
+        where t1.delete_mark = 0 and t.delete_mark = 0 and t.enabled_mark = 1
         and t1.base_student_assessment_category_id = #{dto.baseStudentAssessmentCategoryId}
         <if test="dto.classIdList != null and !dto.classIdList.isEmpty()">
             and t1.class_ids in
@@ -225,6 +231,7 @@
         t.class_ids as class_id,
         SUM(t.score * (LENGTH(personal_student_user_ids) - LENGTH(REPLACE(personal_student_user_ids, ',', '')) + 1)) AS sumScore
         from base_student_assessment_inspection t
+        inner join base_student_assessment_category t1 on t1.id = t.base_student_assessment_category_id
         where t.delete_mark = 0
         <if test="dto.classIdList != null and !dto.classIdList.isEmpty()">
             and t.class_ids in
@@ -236,7 +243,7 @@
             and t.base_student_assessment_category_id = #{dto.baseStudentAssessmentCategoryId}
         </if>
         <if test="dto.categoryCode != null and dto.categoryCode != ''">
-            and t.code = #{dto.categoryCode}
+            and t1.code = #{dto.categoryCode}
         </if>
         <if test="dto.baseSemesterId != null and dto.baseSemesterId > 0">
             and t.base_semester_id &gt; #{dto.baseSemesterId}
@@ -257,7 +264,7 @@
         from base_student_assessment_class_relation t
                  left join base_student_assessment_inspection t1 on t1.id = t.base_student_assessment_inspection_id
                  left join base_student_assessment_category t2 on t2.id = t1.base_student_assessment_category_id
-        where t1.base_student_assessment_category_id = 1754411705233838080
+        where t2.code = 'convention_manage'
           and t.class_id in
         <foreach item="classId" index="index" collection="dto.classIdList" open="(" close=")" separator=",">
             #{classId}
@@ -278,7 +285,7 @@
         from base_student_assessment_student_relation t
                 left join base_student_assessment_inspection t1 on t1.id = t.base_student_assessment_inspection_id
                 left join base_student_assessment_category t2 on t2.id = t1.base_student_assessment_category_id
-        where t1.base_student_assessment_category_id = 1754412347985760256
+        where t2.code = 'awards_and_honors' and t.enabled_mark = 1
         and t.class_id in
         <foreach item="classId" index="index" collection="dto.classIdList" open="(" close=")" separator=",">
             #{classId}
@@ -299,7 +306,7 @@
         from base_student_assessment_student_relation t
         left join base_student_assessment_inspection t1 on t1.id = t.base_student_assessment_inspection_id
         left join base_student_assessment_category t2 on t2.id = t1.base_student_assessment_category_id
-        where t1.base_student_assessment_category_id = 1754412347985760256
+        where t2.code = 'militarize_manage' and t.delete_mark = 0 and t.enabled_mark = 1
         and t.class_id in
         <foreach item="classId" index="index" collection="dto.classIdList" open="(" close=")" separator=",">
             #{classId}
@@ -315,7 +322,7 @@
     <select id="getStudentListByInspectionId"
             resultType="com.xjrsoft.module.student.entity.BaseStudentAssessmentStudentRelation">
         SELECT t1.id,t1.user_id,t1.class_id,t3.student_id,t2.name,t6.name AS nation,t4.name AS class_name,
-               t5.name AS major_name,t7.name as gender,t1.score
+               t5.name AS major_name,t7.name as gender,t1.score,t1.enabled_mark
         FROM base_student_assessment_student_relation t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         INNER JOIN base_student t3 ON t2.id = t3.user_id

src/main/resources/mapper/textbook/TextbookMapper.xml

@@ -5,11 +5,11 @@
 <mapper namespace="com.xjrsoft.module.textbook.mapper.TextbookMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.textbook.dto.TextbookPageDto"
             resultType="com.xjrsoft.module.textbook.vo.TextbookPageVo">
-        SELECT t1.id,t1.id AS textbookId,t1.sort_code,t1.issn,t1.book_name,t1.publishing_house,t1.editor_in_chief,
-        t1.subject_group_id,t2.group_name,t3.name AS semester_name,t4.name AS course_name,t7.name AS
-        is_textbook_plan_cn,
-        t5.name AS
-        textbook_type_cn,t1.specifications_models,t1.appraisal_price,t1.price,t1.discount,t1.subtotal,t1.stock,
+        SELECT
+            t1.id,t1.id AS textbookId,t1.sort_code,t1.issn,t1.book_name,t1.publishing_house,t1.editor_in_chief,
+        t1.subject_group_id,t2.group_name,t3.name AS semester_name,t4.name AS course_name,t7.name AS is_textbook_plan_cn,
+        t5.name AS textbook_type_cn,t1.specifications_models,t1.appraisal_price,t1.price,t1.discount,t1.subtotal,t1.stock,
+
         (SELECT GROUP_CONCAT(c2.name) FROM textbook_class_relation c1
         LEFT JOIN base_class c2 ON c1.class_id = c2.id
         WHERE c1.textbook_id = t1.id) AS use_class,

src/main/resources/sqlScript/update_sql.sql

@@ -0,0 +1,6 @@
+-- ----------------------------
+-- 2024-12-25 10:16
+-- 公告回复过长
+-- ----------------------------
+alter table xjr_oa_news_relation
+    modify reply_content varchar(256) null comment '回复内容';

src/main/resources/sqlScript/views_sql.sql

@@ -43,48 +43,49 @@
 -- ;
 
 create or replace definer = root@`%` view smart_campus.v_cse_feeobj1 as
-select 1001                                                                                                         AS `pk_corp`,
-       `t`.`id`                                                                                                     AS `pkfeeobj`,
-       `t`.`student_id`                                                                                             AS `Studentcode`,
-       `t1`.`name`                                                                                                  AS `feeobjname`,
+select 1001                                                    AS `pk_corp`,
+       `t`.`id`                                                AS `pkfeeobj`,
+       `t`.`student_id`                                        AS `Studentcode`,
+       `t1`.`name`                                             AS `feeobjname`,
        (case
             when (`t1`.`gender` = 'SB10001') then '男'
             when (`t1`.`gender` = 'SB10002') then '女'
-            else '其他' end)                                                                                        AS `sex`,
-       `t3`.`id`                                                                                                    AS `classcdoe`,
-       cast(substring_index(`t4`.`name`, '年', 1) as unsigned)                                                      AS `enteryear`,
-       `t6`.`id`                                                                                                    AS `deptcode`,
-       `t7`.`id`                                                                                                    AS `speccode`,
-       `t7`.`study_year`                                                                                            AS `ratetypecdoe`,
-    year(`t8`.`certificate_date`)                                                                                AS `leaveyear`,
-    `t1`.`credential_number`                                                                                     AS `personalid`,
-    NULL                                                                                                         AS `helpcode`,
-    NULL                                                                                                         AS `quartercode`,
-    NULL                                                                                                         AS `nationality`,
-    NULL                                                                                                         AS `address`,
-    (case
-    when (`t3`.`is_graduate` = 1) then '在读'
-    when (`t3`.`is_graduate` = 2) then '毕业'
-    else '其他' end)                                                                                        AS `state`,
-    NULL                                                                                                         AS `Userdef2`,
-    NULL                                                                                                         AS `Userdef1`,
-    NULL                                                                                                         AS `Resourcecode`,
-    NULL                                                                                                         AS `Birthday`,
-    NULL                                                                                                         AS `Account`,
-    NULL                                                                                                         AS `bank`,
-    NULL                                                                                                         AS `Remarks`,
-    NULL                                                                                                         AS `Property`,
-    NULL                                                                                                         AS `telephone`,
-    NULL                                                                                                         AS `E_mail`
+            else '其他' end)                                   AS `sex`,
+       `t3`.`id`                                               AS `classcdoe`,
+       cast(substring_index(`t4`.`name`, '年', 1) as unsigned) AS `enteryear`,
+       `t6`.`id`                                               AS `deptcode`,
+       `t7`.`id`                                               AS `speccode`,
+       `t7`.`study_year`                                       AS `ratetypecdoe`,
+       year(`t8`.`certificate_date`)                           AS `leaveyear`,
+       `t1`.`credential_number`                                AS `personalid`,
+       NULL                                                    AS `helpcode`,
+       t9.name                                                 AS `quartercode`,
+       NULL                                                    AS `nationality`,
+       NULL                                                    AS `address`,
+       (case
+            when (`t3`.`is_graduate` = 1) then '在读'
+            when (`t3`.`is_graduate` = 2) then '毕业'
+            else '其他' end)                                   AS `state`,
+       NULL                                                    AS `Userdef2`,
+       NULL                                                    AS `Userdef1`,
+       NULL                                                    AS `Resourcecode`,
+       NULL                                                    AS `Birthday`,
+       NULL                                                    AS `Account`,
+       NULL                                                    AS `bank`,
+       NULL                                                    AS `Remarks`,
+       NULL                                                    AS `Property`,
+       NULL                                                    AS `telephone`,
+       NULL                                                    AS `E_mail`
 from `smart_campus`.`base_student` `t`
-    left join `smart_campus`.`xjr_user` `t1`on `t1`.`id` = `t`.`user_id`
-    left join `smart_campus`.`base_student_school_roll` `t2` on `t1`.`id` = `t2`.`user_id`
-    left join `smart_campus`.`base_class` `t3` on `t2`.`class_id` = `t3`.`id`
-    left join `smart_campus`.`base_grade` `t4` on `t3`.`grade_id` = `t4`.`id`
-    left join `smart_campus`.`xjr_department` `t6` on `t6`.`id` = `t3`.`org_id`
-    left join `smart_campus`.`base_major_set` `t7` on `t7`.`id` = `t2`.`major_set_id`
-    left join `smart_campus`.`base_student_graduate` `t8` on `t8`.`user_id` = `t1`.`id`
+         left join `smart_campus`.`xjr_user` `t1` on `t1`.`id` = `t`.`user_id`
+         left join `smart_campus`.`base_student_school_roll` `t2` on `t1`.`id` = `t2`.`user_id`
+         left join `smart_campus`.`base_class` `t3` on `t2`.`class_id` = `t3`.`id`
+         left join `smart_campus`.`base_grade` `t4` on `t3`.`grade_id` = `t4`.`id`
+         left join `smart_campus`.`xjr_department` `t6` on `t6`.`id` = `t3`.`org_id`
+         left join `smart_campus`.`base_major_set` `t7` on `t7`.`id` = `t2`.`major_set_id`
+         left join `smart_campus`.`base_student_graduate` `t8` on `t8`.`user_id` = `t1`.`id`
+         left join `smart_campus`.`xjr_dictionary_detail` `t9` on `t9`.`code` = `t2`.`stduy_status`
 where t.delete_mark = 0
   and t1.delete_mark = 0
   and t2.delete_mark = 0
-and t2.archives_status = 'FB2901';
+  and t2.archives_status = 'FB2901';

src/test/java/com/xjrsoft/module/base/service/impl/BaseClassCourseServiceImplTest.java

@@ -0,0 +1,39 @@
+package com.xjrsoft.module.base.service.impl;
+
+import com.xjrsoft.XjrSoftApplication;
+import com.xjrsoft.module.base.entity.BaseClassCourse;
+import com.xjrsoft.module.base.service.IBaseClassCourseService;
+import com.xjrsoft.module.courseTable.service.ICourseTableService;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = XjrSoftApplication.class)
+class BaseClassCourseServiceImplTest {
+    @Autowired
+    private IBaseClassCourseService baseClassCourseService;
+
+    @Test
+    public void test(){
+        List<BaseClassCourse> baseClassCourseList = baseClassCourseService.list();
+        Map<Long, List<String>> tourseId_textbookIdMap = baseClassCourseList.stream()
+                .collect(Collectors.groupingBy(
+                        BaseClassCourse::getClassId,
+                        Collectors.mapping(
+                                course -> course.getClassId() + "_" + course.getCourseId() + "_" + course.getTextbookId(),
+                                Collectors.toList()
+                        )
+                ));
+
+        for (BaseClassCourse baseClassCourse : baseClassCourseList){
+
+        }
+    }
+}