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

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

@@ -86,7 +86,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询详情信息")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("basestudentpost:detail")
     @XjrLog(value = "根据id查询详情信息", saveResponseData = true)
     public RT<BaseStudentInfoDetailVo> info(@RequestParam Long id) {
         BaseStudentInfoDetailDto dto = new BaseStudentInfoDetailDto();
@@ -103,7 +103,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/studentinfoByKeyWord")
     @ApiOperation(value = "根据姓名或者身份证号查询详情信息")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("basestudentpost:detail")
     @XjrLog(value = "根据姓名或者身份证号查询详情信息")
     public RT<List<BaseStudentSompleInfoVo>> info(@Valid BaseStudentSimpleInfoDto dto) {
         dto.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
@@ -111,9 +111,20 @@ public class BaseStudentInfoController {
         return RT.ok(infos);
     }
 
+    @GetMapping(value = "/studentinfoByKeyWordNotReading")
+    @ApiOperation(value = "根据姓名或者身份证号查询不在读学生详情信息")
+    @SaCheckPermission("basestudentpost:detail")
+    @XjrLog(value = "根据姓名或者身份证号查询不在读学生详情信息")
+    public RT<List<BaseStudentSompleInfoVo>> studentinfoByKeyWordNotReading(@Valid BaseStudentSimpleInfoDto dto) {
+        dto.setFindNewStudent(0);
+        dto.setIsNotReading(1);
+        List<BaseStudentSompleInfoVo> infos = baseStudentSchoolRollService.getInfosByParam(dto);
+        return RT.ok(infos);
+    }
+
     @GetMapping(value = "/getWhitelistInfo")
     @ApiOperation(value = "根据userId查询白名单信息（不传默认查询登录者）")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("basestudentpost:detail")
     @XjrLog(value = "根据userId查询白名单信息（不传默认查询登录者）", saveResponseData = true)
     public RT<WhitelistInfoVo> getWhitelistInfo(Long userId) {
         if (userId == null) {

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

@@ -31,4 +31,8 @@ public class BaseStudentSimpleInfoDto {
 
     @JsonIgnore
     private Integer findNewStudent = 1;
+
+    @JsonIgnore
+    @ApiModelProperty("是否在读学生（1：是 0：否）")
+    private Integer isNotReading;
 }

src/main/java/com/xjrsoft/module/textbook/entity/TextbookDiscountAlterRecord.java

@@ -77,14 +77,14 @@ public class TextbookDiscountAlterRecord implements Serializable {
     @ApiModelProperty("入库编号")
     private Long textbookWarehouseRecordId;
     /**
-     * 旧的价格
+     * 旧的定价
      */
-    @ApiModelProperty("旧的价格")
+    @ApiModelProperty("旧的定价")
     private BigDecimal oldPrice;
     /**
-     * 新的价格
+     * 新的定价
      */
-    @ApiModelProperty("新的价格")
+    @ApiModelProperty("新的定价")
     private BigDecimal newPrice;
     /**
      * 旧的折扣

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

@@ -137,28 +137,41 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
         MPJLambdaWrapper<TextbookSubscriptionItem> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .disableSubLogicDel()
-                .select(Textbook.class, x -> VoToColumnUtil.fieldsToColumns(TextbookInstockroomListVo.class).contains(x.getProperty()))
-                .select(TextbookSubscriptionItem.class, x -> VoToColumnUtil.fieldsToColumns(TextbookInstockroomListVo.class).contains(x.getProperty()))
-                .selectAs(TextbookSubscriptionItem::getPrice, TextbookInstockroomListVo::getActualPrice)
+//                .select(Textbook.class, x -> VoToColumnUtil.fieldsToColumns(TextbookInstockroomListVo.class).contains(x.getProperty()))
+//                .select(TextbookSubscriptionItem.class, x -> VoToColumnUtil.fieldsToColumns(TextbookInstockroomListVo.class).contains(x.getProperty()))
+                .selectAs(TextbookSubscriptionItem::getTextbookSubscriptionId, TextbookInstockroomListVo::getTextbookSubscriptionId)
+                .selectAs(TextbookSubscriptionItem::getId, TextbookInstockroomListVo::getTextbookSubscriptionItemId)
+                .selectAs(TextbookSubscriptionItem::getTextbookId, TextbookInstockroomListVo::getTextbookId)
                 .selectAs(TextbookSubscriptionItem::getSourcePrice, TextbookInstockroomListVo::getPrice)
+                .selectAs(TextbookSubscriptionItem::getDiscount, TextbookInstockroomListVo::getDiscount)
+                .selectAs(TextbookSubscriptionItem::getPrice, TextbookInstockroomListVo::getActualPrice)
                 .selectAs(TextbookSubscriptionItem::getStudentNum, TextbookInstockroomListVo::getStudentSubscriptionNumber)
                 .selectAs(TextbookSubscriptionItem::getTeacherNum, TextbookInstockroomListVo::getTeacherSubscriptionNumber)
-                .selectAs(TextbookSubscriptionItem::getId, TextbookInstockroomListVo::getTextbookSubscriptionItemId)
-                .leftJoin(Textbook.class, Textbook::getId, TextbookSubscriptionItem::getTextbookId)
-                .leftJoin(TextbookWarehouseRecord.class, TextbookWarehouseRecord::getDataItemId, TextbookSubscriptionItem::getId)
-                .leftJoin(BaseCourseSubject.class, BaseCourseSubject::getId, Textbook::getCourseSubjectId,
-                        wrapper -> wrapper
-                                .selectAs(BaseCourseSubject::getName, TextbookInstockroomListVo::getCourseName)
-                                .like(StringUtils.isNotEmpty(dto.getCourseName()), BaseCourseSubject::getName, dto.getCourseName())
-                )
-                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Textbook::getTextbookType,
+                .selectAs(TextbookSubscriptionItem::getInStockNum, TextbookInstockroomListVo::getInStockNum)
+                .leftJoin(Textbook.class, Textbook::getId, TextbookSubscriptionItem::getTextbookId,
                         wrapper -> wrapper
-                                .selectAs(DictionaryDetail::getName, TextbookInstockroomListVo::getTextbookTypeCn)
+                                .selectAs(Textbook::getCourseSubjectId, TextbookInstockroomListVo::getCourseSubjectId)
+                                .selectAs(Textbook::getBookName, TextbookInstockroomListVo::getBookName)
+                                .selectAs(Textbook::getIssn, TextbookInstockroomListVo::getIssn)
+                                .selectAs(Textbook::getPublishingHouse, TextbookInstockroomListVo::getPublishingHouse)
+                                .selectAs(Textbook::getEditorInChief, TextbookInstockroomListVo::getEditorInChief)
+                                .selectAs(Textbook::getTextbookType, TextbookInstockroomListVo::getTextbookType)
+                                .selectAs(Textbook::getUseType, TextbookInstockroomListVo::getUseType)
+                                .selectAs(Textbook::getVersion, TextbookInstockroomListVo::getVersion)
+                                .leftJoin(BaseCourseSubject.class, BaseCourseSubject::getId, Textbook::getCourseSubjectId,
+                                        wra -> wra
+                                                .selectAs(BaseCourseSubject::getName, TextbookInstockroomListVo::getCourseName)
+                                                .like(StringUtils.isNotEmpty(dto.getCourseName()), BaseCourseSubject::getName, dto.getCourseName())
+                                )
+                                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Textbook::getTextbookType,
+                                        wra -> wra
+                                                .selectAs(DictionaryDetail::getName, TextbookInstockroomListVo::getTextbookTypeCn)
+                                )
+                                .like(StringUtils.isNotEmpty(dto.getBookName()), Textbook::getBookName, dto.getBookName())
+                                .like(StringUtils.isNotEmpty(dto.getIssn()), Textbook::getIssn, dto.getIssn())
                 )
-
+//                .leftJoin(TextbookWarehouseRecord.class, TextbookWarehouseRecord::getDataItemId, TextbookSubscriptionItem::getId)
                 .eq(TextbookSubscriptionItem::getTextbookSubscriptionId, dto.getTextbookSubscriptionId())
-                .like(StringUtils.isNotEmpty(dto.getBookName()), Textbook::getBookName, dto.getBookName())
-                .like(StringUtils.isNotEmpty(dto.getIssn()), Textbook::getIssn, dto.getIssn())
                 .orderByAsc(TextbookSubscriptionItem::getInStockNum)
         ;
 
@@ -519,12 +532,12 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
         ;
         List<TextbookWarehouseRecord> textbookWarehouseRecords = textbookWarehouseRecordMapper.selectList(textbookWarehouseRecordLambdaQueryWrapper);
 
-        // 因为入库的时候可以修改定价，不同定价应该对应不同的入库记录
-        Map<Long, Map<BigDecimal, TextbookWarehouseRecord>> textbookWarehouseRecordByItemIdByPriceMap = textbookWarehouseRecords.stream()
+        // 因为入库的时候可以修改定价和折扣，不同定价和折扣应该对应不同的入库记录
+        Map<Long, Map<String, TextbookWarehouseRecord>> textbookWarehouseRecordByItemIdByPriceMap = textbookWarehouseRecords.stream()
                 .collect(Collectors.groupingBy(
                         TextbookWarehouseRecord::getDataItemId, // 第一层分组：按征订项 ID 分组
                         Collectors.toMap(
-                                TextbookWarehouseRecord::getPrice, // 第二层映射：按入库定价作为键
+                                p -> p.getPrice().stripTrailingZeros().toPlainString() + "-" + String.format("%.2f", p.getDiscount()), // 第二层映射：按入库定价作为键
                                 wr -> wr,                      // 值为 TextbookStudentClaim 对象本身
                                 (existing, replacement) -> existing   // 如果有重复键，保留现有的值
                         )
@@ -563,20 +576,30 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
         TextbookSubscriptionItem old = null;
         TextbookSubscriptionItem updateItem;
         TextbookWarehouseRecord textbookWarehouseRecord;
-        Map<BigDecimal, TextbookWarehouseRecord> oldTextbookWarehouseRecordByPrice = null;
+        Map<String, TextbookWarehouseRecord> oldTextbookWarehouseRecordByPrice = null;
         TextbookWarehouseRecord oldTextbookWarehouseRecord = null;
         TextbookWarehouseRecordDetail textbookWarehouseRecordDetail;
-        for (TextbookInstockroomDto dto : dtos) {
+        for (int i = 0; i < dtos.size(); i++) {
+            TextbookInstockroomDto dto = dtos.get(i);
             if (ObjectUtils.isNotEmpty(dto.getTextbookSubscriptionItemId())) {
                 old = itemByIdMap.get(dto.getTextbookSubscriptionItemId());
                 oldTextbookWarehouseRecordByPrice = textbookWarehouseRecordByItemIdByPriceMap.get(dto.getTextbookSubscriptionItemId());
+
+                if(ObjectUtils.isEmpty(dto.getPrice())){
+                    throw new MyException("第" + (i+1) + "本教材价格为空，请填写。");
+                }
+
+                if(ObjectUtils.isEmpty(dto.getDiscount())){
+                    throw new MyException("第" + (i+1) + "本教材折扣为空，请填写。");
+                }
+
                 if(MapUtils.isNotEmpty(oldTextbookWarehouseRecordByPrice)){
-                    oldTextbookWarehouseRecord = oldTextbookWarehouseRecordByPrice.get(dto.getPrice());
+                    oldTextbookWarehouseRecord = oldTextbookWarehouseRecordByPrice.get(dto.getPrice().stripTrailingZeros().toPlainString() + "-" + String.format("%.2f", dto.getDiscount()));
                 }
             }
 
-            if (ObjectUtils.isEmpty(old)) {
-                continue;
+            if(ObjectUtils.isEmpty(old)){
+                throw new MyException("第" + (i+1) + "本教材征订信息被修改，请刷新重试");
             }
 
             // 现在入库价格改动不影响征订项的价格相关属性
@@ -681,11 +704,11 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
 //        Map<Long, TextbookWarehouseRecord> textbookWarehouseRecordByItemIdMap = textbookWarehouseRecords.stream()
 //                .collect(Collectors.toMap(TextbookWarehouseRecord::getDataItemId, t -> t, (t1, t2) -> t2));
         // 因为入库的时候可以修改定价，不同定价应该对应不同的入库记录
-        Map<Long, Map<BigDecimal, TextbookWarehouseRecord>> textbookWarehouseRecordByItemIdByPriceMap = textbookWarehouseRecords.stream()
+        Map<Long, Map<String, TextbookWarehouseRecord>> textbookWarehouseRecordByItemIdByPriceMap = textbookWarehouseRecords.stream()
                 .collect(Collectors.groupingBy(
                         TextbookWarehouseRecord::getDataItemId, // 第一层分组：按征订项 ID 分组
                         Collectors.toMap(
-                                TextbookWarehouseRecord::getPrice, // 第二层映射：按入库定价作为键
+                                p -> p.getPrice().stripTrailingZeros().toPlainString() + "-" + String.format("%.2f", p.getDiscount()), // 第二层映射：按入库定价作为键
                                 wr -> wr,                      // 值为 TextbookStudentClaim 对象本身
                                 (existing, replacement) -> existing   // 如果有重复键，保留现有的值
                         )
@@ -720,7 +743,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
         // 处理入库细节
         TextbookSubscriptionItem oldItem;
         TextbookSubscriptionItem updateItem;
-        Map<BigDecimal, TextbookWarehouseRecord> oldTextbookWarehouseRecordByPrice;
+        Map<String, TextbookWarehouseRecord> oldTextbookWarehouseRecordByPrice;
         TextbookWarehouseRecord oldTextbookWarehouseRecord = null;
         TextbookWarehouseRecord textbookWarehouseRecord;
         TextbookWarehouseRecordDetail textbookWarehouseRecordDetail;
@@ -746,9 +769,17 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
                 throw new MyException("第" + (i + 4) + "行数据主键被修改，请重新下载模板");
             }
 
+            if (ObjectUtils.isEmpty(vo.getPrice())) {
+                throw new MyException("第" + (i + 4) + "行数据定价为空，请填写");
+            }
+
+            if (ObjectUtils.isEmpty(vo.getDiscount())) {
+                throw new MyException("第" + (i + 4) + "行数据折扣为空，请填写");
+            }
+
             oldTextbookWarehouseRecordByPrice = textbookWarehouseRecordByItemIdByPriceMap.get(Long.parseLong(vo.getTextbookSubscriptionItemId()));
             if(MapUtils.isNotEmpty(oldTextbookWarehouseRecordByPrice)){
-                oldTextbookWarehouseRecord = oldTextbookWarehouseRecordByPrice.get(vo.getPrice());
+                oldTextbookWarehouseRecord = oldTextbookWarehouseRecordByPrice.get(vo.getPrice().stripTrailingZeros().toPlainString() + "-" + String.format("%.2f", vo.getDiscount()));
             }
 
             updateItem = new TextbookSubscriptionItem();

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

@@ -226,7 +226,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
         updateTextbookWarehouseRecord.setId(textbookWarehouseRecord.getId());
         updateTextbookWarehouseRecord.setPrice(ObjectUtils.isNotEmpty(dto.getPrice()) ? dto.getPrice() : BigDecimal.ZERO);
         updateTextbookWarehouseRecord.setDiscount(ObjectUtils.isNotEmpty(dto.getDiscount()) ? dto.getDiscount() : 10);
-        updateTextbookWarehouseRecord.setSubtotal(textbookWarehouseRecord.getPrice().multiply(BigDecimal.valueOf(dto.getDiscount() / 10)));
+        updateTextbookWarehouseRecord.setSubtotal(updateTextbookWarehouseRecord.getPrice().multiply(BigDecimal.valueOf(dto.getDiscount() / 10)));
         updateTextbookWarehouseRecord.setTotalPrice(updateTextbookWarehouseRecord.getSubtotal().multiply(BigDecimal.valueOf(textbookWarehouseRecord.getWarehouseNumber())));
         updateTextbookWarehouseRecord.setActualTotalPrice(updateTextbookWarehouseRecord.getSubtotal().multiply(BigDecimal.valueOf(textbookWarehouseRecord.getActualWarehouseNumber())));
         updateTextbookWarehouseRecord.setModifyDate(new Date());

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

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -52,6 +53,16 @@ public class TextbookDiscountAlterRecordListVo {
     @ExcelProperty("入库编号")
     @ApiModelProperty("入库编号")
     private Long textbookWarehouseRecordId;
+    /**
+     * 旧的定价
+     */
+    @ApiModelProperty("旧的定价")
+    private BigDecimal oldPrice;
+    /**
+     * 新的定价
+     */
+    @ApiModelProperty("新的定价")
+    private BigDecimal newPrice;
     /**
      * 旧的折扣
      */

src/main/resources/application-dev.yml

@@ -117,6 +117,7 @@ xjrsoft:
       - /system/imgcaptcha-answer
       - /student/basestudentinfo/studentinfoByKeyWord
       - /student/pbCseFeeobjupdate/enrollment-statistics-start
+      - /student/basestudentinfo/studentinfoByKeyWordNotReading
     approval-time: 300 # 审核超时时间 目前设为5分钟
   email:
     host:  #邮件服务器的SMTP地址，可选，默认为smtp.<发件人邮箱后缀>

src/main/resources/application-pre.yml

@@ -100,6 +100,7 @@ xjrsoft:
       - /student/basestudentinfo/studentinfoByKeyWord
       - /student/pbCseFeeobjupdate/enrollment-statistics-start
       - /student/baseNewStudent/basenewstudent-task-start
+      - /student/basestudentinfo/studentinfoByKeyWordNotReading
     approval-time: 300 # 审核超时时间 目前设为5分钟
   email:
     host:  #邮件服务器的SMTP地址，可选，默认为smtp.<发件人邮箱后缀>

src/main/resources/application-prod.yml

@@ -97,6 +97,7 @@ xjrsoft:
       - /system/xjrTipsMessage/infoByCode
       - /student/pbCseFeeobjupdate/enrollment-statistics-start
       - /student/baseNewStudent/basenewstudent-task-start
+      - /student/basestudentinfo/studentinfoByKeyWordNotReading
     approval-time: 300 # 审核超时时间 目前设为5分钟
   email:
     host:  #邮件服务器的SMTP地址，可选，默认为smtp.<发件人邮箱后缀>

src/main/resources/mapper/banding/BandingTaskMapper.xml

@@ -9,11 +9,20 @@
         INNER JOIN enrollment_plan a2 ON a1.enrollment_plan_id = a2.id
         WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
         AND a2.grade_id = t.grade_id AND a2.enroll_type = t.enroll_type
-        and a1.is_can_banding = 1
+        AND a1.is_can_banding = 1
         ) AS admissions_count,
-        (SELECT COUNT(*) FROM banding_task_class_student a1
+        IF(t.status = 1,
+        (
+        SELECT COUNT(*) FROM banding_task_class_student_sure a1
         INNER JOIN banding_task_class a2 ON a1.banding_task_class_id = a2.id
-        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_id = t.id) AS divided_count
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_id = t.id
+        ),
+        (
+        SELECT COUNT(*) FROM banding_task_class_student a1
+        INNER JOIN banding_task_class a2 ON a1.banding_task_class_id = a2.id
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0 AND a2.banding_task_id = t.id
+        )
+        ) AS divided_count
         FROM banding_task t
         LEFT JOIN base_grade t1 ON (t1.id = t.grade_id)
         LEFT JOIN xjr_dictionary_detail t2 ON (t2.code = t.enroll_type)

src/main/resources/mapper/organization/UserMapper.xml

@@ -54,6 +54,9 @@
         <if test="dto.archivesStatus != null and dto.archivesStatus != ''">
             AND t3.archives_status = #{dto.archivesStatus}
         </if>
+        <if test="dto.isNotReading != null and dto.isNotReading == 1">
+            AND t3.archives_status != 'FB2901'
+        </if>
         <if test="dto.idNumberList != null">
             and t1.credential_number in
             <foreach item="idNumber" index="index" collection="dto.idNumberList" open="(" close=")"