教材征订项变更历史记录

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

@@ -71,6 +71,10 @@ public class TextbookSubscriptionItemHistoryController {
 
                 .leftJoin(Textbook.class, Textbook::getId, TextbookSubscriptionItemHistory::getOldTextbookId,
                         wrapper -> wrapper
+                                .selectAs(Textbook::getIssn, TextbookSubscriptionItemHistoryPageVo::getOldIssn)
+                                .selectAs(Textbook::getBookName, TextbookSubscriptionItemHistoryPageVo::getOldBookName)
+                                .selectAs(Textbook::getPublishingHouse, TextbookSubscriptionItemHistoryPageVo::getOldPublishingHouse)
+                                .selectAs(Textbook::getEditorInChief, TextbookSubscriptionItemHistoryPageVo::getOldEditorInChief)
                                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Textbook::getTextbookType,
                                         ext -> ext.selectAs(DictionaryDetail::getName, TextbookSubscriptionItemHistoryPageVo::getOldTextbookTypeCn))
                                 .leftJoin(BaseCourseSubject.class, BaseCourseSubject::getId, Textbook::getCourseSubjectId,
@@ -79,6 +83,10 @@ public class TextbookSubscriptionItemHistoryController {
 
                 .leftJoin(Textbook.class, Textbook::getId, TextbookSubscriptionItemHistory::getNewTextbookId,
                         wrapper -> wrapper
+                                .selectAs(Textbook::getIssn, TextbookSubscriptionItemHistoryPageVo::getNewIssn)
+                                .selectAs(Textbook::getBookName, TextbookSubscriptionItemHistoryPageVo::getNewBookName)
+                                .selectAs(Textbook::getPublishingHouse, TextbookSubscriptionItemHistoryPageVo::getNewPublishingHouse)
+                                .selectAs(Textbook::getEditorInChief, TextbookSubscriptionItemHistoryPageVo::getNewEditorInChief)
                                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Textbook::getTextbookType,
                                         ext -> ext.selectAs(DictionaryDetail::getName, TextbookSubscriptionItemHistoryPageVo::getNewTextbookTypeCn))
                                 .leftJoin(BaseCourseSubject.class, BaseCourseSubject::getId, Textbook::getCourseSubjectId,

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

@@ -387,7 +387,7 @@ public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfText
         for (TextbookInstockroomImportDto item : dataList){
             textbookInstockroomDtoList.add(new TextbookInstockroomDto(){{
                 setTextbookSubscriptionId(wfTextbookSubscriptionId);
-                setIssn(item.getIssn());
+//                setIssn(item.getIssn());
                 setInNum(item.getInNum());
             }});
         }
@@ -430,34 +430,34 @@ public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfText
 
         Date now = new Date();
         Long loginId = StpUtil.getLoginIdAsLong();
-        for (TextbookInstockroomDto dto : dtos) {
-            WfTextbookSubscriptionItem old;
-            if(dto.getTextbookSubscriptionItemId() != null && dto.getTextbookSubscriptionItemId() > 0){
-                old = itemByIdMap.get(dto.getTextbookSubscriptionItemId());
-            } else {
-                old = itemByIssnMap.get(dto.getIssn());
-            }
-
-            if(old == null){
-                continue;
-            }
-
-            WfTextbookSubscriptionItem updateItem = new WfTextbookSubscriptionItem();
-            updateItem.setId(old.getId());
-            updateItem.setInStockroomNum(old.getInStockroomNum() + dto.getInNum());
-            updateItem.setModifyDate(now);
-            updateItem.setModifyUserId(loginId);
-            wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.updateById(updateItem);
-
-            //新增入库记录
-//            textbookService.deliverWarehouse(new AddTextbookWarehouseRecordDto() {{
-//                setTextbookId(old.getTextbookId());
-//                setWarehouseNumber(dto.getInNum());
-//                setSource("wm_manual");
-//            }});
-//            successNum++;
-            instockroomNum += dto.getInNum();
-        }
+//        for (TextbookInstockroomDto dto : dtos) {
+//            WfTextbookSubscriptionItem old;
+//            if(dto.getTextbookSubscriptionItemId() != null && dto.getTextbookSubscriptionItemId() > 0){
+//                old = itemByIdMap.get(dto.getTextbookSubscriptionItemId());
+//            } else {
+//                old = itemByIssnMap.get(dto.getIssn());
+//            }
+//
+//            if(old == null){
+//                continue;
+//            }
+//
+//            WfTextbookSubscriptionItem updateItem = new WfTextbookSubscriptionItem();
+//            updateItem.setId(old.getId());
+//            updateItem.setInStockroomNum(old.getInStockroomNum() + dto.getInNum());
+//            updateItem.setModifyDate(now);
+//            updateItem.setModifyUserId(loginId);
+//            wfTextbookSubscriptionWfTextbookSubscriptionItemMapper.updateById(updateItem);
+//
+//            //新增入库记录
+////            textbookService.deliverWarehouse(new AddTextbookWarehouseRecordDto() {{
+////                setTextbookId(old.getTextbookId());
+////                setWarehouseNumber(dto.getInNum());
+////                setSource("wm_manual");
+////            }});
+////            successNum++;
+//            instockroomNum += dto.getInNum();
+//        }
         result.put("allNum", dtos.size());
         result.put("successNum", successNum);
         result.put("instockroomNum", instockroomNum);

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

@@ -73,7 +73,19 @@ public class TextbookSubscriptionItemHistoryPageVo {
     @ApiModelProperty("教材表主键(textbook)")
     private Long oldTextbookId;
 
-    @ApiModelProperty("教材名称")
+    @ApiModelProperty("国际标准刊号")
+    private String oldIssn;
+
+    @ApiModelProperty("书名")
+    private String oldBookName;
+
+    @ApiModelProperty("出版社")
+    private String oldPublishingHouse;
+
+    @ApiModelProperty("主编")
+    private String oldEditorInChief;
+
+    @ApiModelProperty("课程名称")
     private String oldCourseName;
 
     @ApiModelProperty("教材类型")
@@ -129,7 +141,19 @@ public class TextbookSubscriptionItemHistoryPageVo {
     @ApiModelProperty("教材表主键(textbook)")
     private Long newTextbookId;
 
-    @ApiModelProperty("教材名称")
+    @ApiModelProperty("国际标准刊号")
+    private String newIssn;
+
+    @ApiModelProperty("书名")
+    private String newBookName;
+
+    @ApiModelProperty("出版社")
+    private String newPublishingHouse;
+
+    @ApiModelProperty("主编")
+    private String newEditorInChief;
+
+    @ApiModelProperty("课程名称")
     private String newCourseName;
 
     @ApiModelProperty("教材类型")