修改bug

src/main/java/com/xjrsoft/module/textbook/controller/TextbookWarehouseRecordController.java

@@ -68,7 +68,7 @@ public class TextbookWarehouseRecordController {
         return RT.ok(BeanUtil.toBean(textbookWarehouseRecord, TextbookWarehouseRecordVo.class));
     }
 
-    @PostMapping("textbook-warehouse")
+    @PostMapping("/textbook-warehouse")
     @ApiOperation(value = "教材入库页面教材入库")
     @SaCheckPermission("textbookclasswarehouse:add")
     public RT<Boolean> textbookWarehouse(@Valid @RequestBody AddTextbookWarehouseRecordDto dto){

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

@@ -222,7 +222,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                 .like(StringUtils.isNotBlank(dto.getEditorInChief()), Textbook::getEditorInChief, dto.getEditorInChief())
                 .eq(StringUtils.isNotBlank(dto.getVersion()), Textbook::getVersion, dto.getVersion())
                 .eq(ObjectUtils.isNotEmpty(dto.getCourseSubjectId()), Textbook::getCourseSubjectId, dto.getCourseSubjectId())
-                .eq(ObjectUtils.isNotEmpty(dto.getSubjectGroupId()), Textbook::getCourseSubjectId, dto.getCourseSubjectId())
+                .eq(ObjectUtils.isNotEmpty(dto.getSubjectGroupId()), Textbook::getCourseSubjectId, dto.getSubjectGroupId())
                 .eq(ObjectUtils.isNotEmpty(dto.getIsTextbookPlan()), Textbook::getIsTextbookPlan, dto.getIsTextbookPlan())
                 .eq(StringUtils.isNotBlank(dto.getTextbookType()), Textbook::getTextbookType, dto.getTextbookType())
                 .eq(StringUtils.isNotBlank(dto.getSpecificationsModels()), Textbook::getSpecificationsModels, dto.getSpecificationsModels())

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

@@ -540,7 +540,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
 
             updateItem = new TextbookSubscriptionItem();
             updateItem.setId(old.getId());
-            updateItem.setDiscount(dto.getDiscount());
+            updateItem.setDiscount(ObjectUtils.isNotEmpty(dto.getDiscount()) ? dto.getDiscount() : 10);
             updateItem.setPrice(dto.getPrice().multiply(BigDecimal.valueOf(dto.getDiscount() / 10)));
             updateItem.setInStockNum(old.getInStockNum() + dto.getInNum());
             updateItem.setModifyDate(new Date());
@@ -698,7 +698,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
             updateItem = new TextbookSubscriptionItem();
             updateItem.setId(oldItem.getId());
             if(ObjectUtils.isEmpty(oldItem.getInStockNum()) || oldItem.getInStockNum() <= 0){
-                updateItem.setDiscount(vo.getDiscount());
+                updateItem.setDiscount(ObjectUtils.isNotEmpty(vo.getDiscount()) ? vo.getDiscount() : 10);
                 updateItem.setPrice(vo.getPrice().multiply(BigDecimal.valueOf(vo.getDiscount() / 10)));
             }
             updateItem.setInStockNum(oldItem.getInStockNum() + vo.getInNum());
@@ -885,20 +885,22 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
                 || !old.getTeacherNum().equals(dto.getTeacherNum())
         ){
             alterationType = 1;
-            if(ObjectUtils.isNotEmpty(textbookSubscription)){
-                updateTotalNum.setId(textbookSubscription.getId());
-                updateTotalNum.setSum(textbookSubscription.getSum() + (dto.getStudentNum() - old.getStudentNum()) + (dto.getTeacherNum() - old.getTeacherNum()));
-                this.updateById(updateTotalNum);
-            }
         }
 
         if(!old.getTextbookId().equals(dto.getTextbookId())){
             alterationType = 2;
-            if(ObjectUtils.isNotEmpty(textbookSubscription)){
-                updateTotalNum.setId(textbookSubscription.getId());
-                updateTotalNum.setSum(textbookSubscription.getSum() - (old.getTeacherNum() + old.getStudentNum()) + (dto.getTeacherNum() + dto.getStudentNum()));
-                this.updateById(updateTotalNum);
-            }
+        }
+
+        // 变更征订总数量
+        if(ObjectUtils.isNotEmpty(textbookSubscription)){
+            updateTotalNum.setId(textbookSubscription.getId());
+            updateTotalNum.setSum((ObjectUtils.isNotEmpty(textbookSubscription.getSum()) ? textbookSubscription.getSum() : 0)
+                    + ((ObjectUtils.isNotEmpty(dto.getStudentNum()) ? dto.getStudentNum() : 0)
+                    - (ObjectUtils.isNotEmpty(old.getStudentNum()) ? old.getStudentNum() : 0))
+                    + ((ObjectUtils.isNotEmpty(dto.getTeacherNum()) ? dto.getTeacherNum() : 0)
+                    - (ObjectUtils.isNotEmpty(old.getTeacherNum()) ? old.getTeacherNum() : 0))
+            );
+            this.updateById(updateTotalNum);
         }
 
         // 将历史记录保存到历史变更记录表
@@ -943,9 +945,6 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
         textbookSubscriptionItemHistory.setAlterationType(alterationType);
         textbookSubscriptionItemHistoryMapper.insert(textbookSubscriptionItemHistory);
 
-        // 变更征订总数量
-
-
         //变更当前记录
         TextbookSubscriptionItem updateItem = new TextbookSubscriptionItem();
         BeanUtils.copyProperties(dto, updateItem);

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

@@ -69,7 +69,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
                 .select(TextbookWarehouseRecord::getId)
                 .selectAs(TextbookWarehouseRecord::getPrice, TextbookWarehouseRecordPageVo::getPrice)
                 .selectAs(TextbookWarehouseRecord::getDiscount, TextbookWarehouseRecordPageVo::getDiscount)
-                .selectAs(TextbookWarehouseRecord::getCreateDate, TextbookWarehouseRecordPageVo::getCreateDate)
+                .selectAs(TextbookWarehouseRecord::getCreateDate, TextbookWarehouseRecordPageVo::getCreateDateStr)
                 .selectAs(TextbookWarehouseRecord::getSubtotal, TextbookWarehouseRecordPageVo::getSubtotal)
                 .select(Textbook.class,x -> VoToColumnUtil.fieldsToColumns(TextbookWarehouseRecordPageVo.class).contains(x.getProperty()))
                 .select(TextbookWarehouseRecord.class,x -> VoToColumnUtil.fieldsToColumns(TextbookWarehouseRecordPageVo.class).contains(x.getProperty()))
@@ -107,10 +107,11 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
                 .eq(StringUtils.isNotEmpty(dto.getIssn()), Textbook::getIssn, dto.getIssn())
                 .like(StringUtils.isNotEmpty(dto.getGroupName()), SubjectGroup::getGroupName, dto.getGroupName())
                 .eq(ObjectUtils.isNotEmpty(dto.getUseType()), Textbook::getUseType, dto.getUseType())
-                .between(ObjectUtils.isNotEmpty(dto.getStartCreateDate()) && ObjectUtils.isNotEmpty(dto.getEndCreateDate()), TextbookWarehouseRecord::getCreateDate, dto.getStartCreateDate(), dto.getEndCreateDate())
+                .ge(ObjectUtils.isNotEmpty(dto.getStartCreateDate()), TextbookWarehouseRecord::getCreateDate, dto.getStartCreateDate())
+                .le(ObjectUtils.isNotEmpty(dto.getEndCreateDate()), TextbookWarehouseRecord::getCreateDate, dto.getEndCreateDate())
                 .gt(ObjectUtils.isNotEmpty(dto.getReturnBookstore()) && dto.getReturnBookstore() == 1, TextbookWarehouseRecord::getReturnBookstoreNumber, 0)
                 .gt(ObjectUtils.isNotEmpty(dto.getReturnState()) && dto.getReturnState() == 1, TextbookWarehouseRecord::getRecedeNumber, 0)
-                .orderByDesc(TextbookWarehouseRecord::getCreateDate)
+//                .orderByDesc(TextbookWarehouseRecord::getCreateDate)
                 ;
         return this.selectJoinListPage(ConventPage.getPage(dto), TextbookWarehouseRecordPageVo.class, textbookWarehouseRecordMPJLambdaWrapper);
 //        return textbookWarehouseRecordMapper.getPage(page, dto);
@@ -148,6 +149,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
 
         TextbookWarehouseRecord textbookWarehouseRecord;
         TextbookWarehouseRecordDetail textbookWarehouseRecordDetail;
+        Date nowDate = new Date();
         for (TextbookWarehouseTextbooksDto td : dto.getTextbookWarehouseTextbooksDtos()){
             //新增入库记录
             long textbookWarehouseRecordId = IdUtil.getSnowflakeNextId();
@@ -157,7 +159,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
             textbookWarehouseRecord.setBaseSemesterId(dto.getBaseSemesterId());
             textbookWarehouseRecord.setWarehouseNumber(td.getWarehouseNumber());
             textbookWarehouseRecord.setPrice(td.getPrice());
-            textbookWarehouseRecord.setDiscount(td.getDiscount());
+            textbookWarehouseRecord.setDiscount(ObjectUtils.isNotEmpty(td.getDiscount()) ? td.getDiscount() : 10);
             textbookWarehouseRecord.setSubtotal(td.getPrice().multiply(BigDecimal.valueOf(td.getDiscount() / 10)));
             textbookWarehouseRecord.setTotalPrice(textbookWarehouseRecord.getSubtotal().multiply(BigDecimal.valueOf(td.getWarehouseNumber())));
             oldOrderInteger += 1;
@@ -170,7 +172,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
             textbookWarehouseRecord.setRecedeNumber(0);
             textbookWarehouseRecord.setRemainNumber(textbookWarehouseRecord.getActualWarehouseNumber());
             textbookWarehouseRecord.setWarehouseMode(WarehouseModeEnum.WmManual.getCode());
-            textbookWarehouseRecord.setCreateDate(new Date());
+            textbookWarehouseRecord.setCreateDate(nowDate);
             textbookWarehouseRecord.setCreateUserId(StpUtil.getLoginIdAsLong());
             textbookWarehouseRecordMapper.insert(textbookWarehouseRecord);
 
@@ -179,7 +181,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
             textbookWarehouseRecordDetail.setTextbookWarehouseRecordId(textbookWarehouseRecordId);
             textbookWarehouseRecordDetail.setWarehouseMode(WarehouseModeEnum.WmManual.getCode());
             textbookWarehouseRecordDetail.setWarehouseNumber(td.getWarehouseNumber());
-            textbookWarehouseRecordDetail.setCreateDate(new Date());
+            textbookWarehouseRecordDetail.setCreateDate(nowDate);
             textbookWarehouseRecordDetailMapper.insert(textbookWarehouseRecordDetail);
         }
         return true;
@@ -217,7 +219,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
         if(ObjectUtils.isNotEmpty(textbookSubscriptionItem)){
             TextbookSubscriptionItem updateTextbookSubscriptionItem = new TextbookSubscriptionItem();
             updateTextbookSubscriptionItem.setId(textbookSubscriptionItem.getId());
-            updateTextbookSubscriptionItem.setDiscount(dto.getDiscount());
+            updateTextbookSubscriptionItem.setDiscount(ObjectUtils.isNotEmpty(dto.getDiscount()) ? dto.getDiscount() : 10);
             updateTextbookSubscriptionItem.setPrice(textbookWarehouseRecord.getPrice().multiply(BigDecimal.valueOf(dto.getDiscount() / 10)));
             updateTextbookSubscriptionItem.setModifyDate(new Date());
             textbookSubscriptionItemMapper.updateById(updateTextbookSubscriptionItem);
@@ -225,7 +227,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
 
         TextbookWarehouseRecord updateTextbookWarehouseRecord = new TextbookWarehouseRecord();
         updateTextbookWarehouseRecord.setId(textbookWarehouseRecord.getId());
-        updateTextbookWarehouseRecord.setDiscount(dto.getDiscount());
+        updateTextbookWarehouseRecord.setDiscount(ObjectUtils.isNotEmpty(dto.getDiscount()) ? dto.getDiscount() : 10);
         updateTextbookWarehouseRecord.setSubtotal(textbookWarehouseRecord.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())));

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -66,7 +67,7 @@ public class TextbookWarehouseRecordPageVo {
     private BigDecimal subtotal;
 
     @ApiModelProperty("入库时间")
-    private Date createDate;
+    private String createDateStr;
 
     @ApiModelProperty("入库人员")
     private String warehouseUser;