fixed(newbook): 新书管理

com.zrqx.core/src/main/java/com/zrqx/core/vo/newbook/print/BookStorageVo.java

@@ -29,5 +29,8 @@ public class BookStorageVo extends BaseModel {
     @ApiModelProperty(value = "库房备注")
     private String storeroomRemark;
 
+    @ApiModelProperty(value = "创建人姓名")
+    private String creatorName;
+
 }
 

com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/service/subject/SubjectServiceImpl.java

@@ -27,6 +27,7 @@ import com.zrqx.core.vo.newbook.newbook.ExportNewBookVo;
 import com.zrqx.core.vo.newbook.newbook.NewBookVo;
 import com.zrqx.core.vo.newbook.newbook.StaVo;
 import com.zrqx.core.vo.newbook.print.AuditLogListVo;
+import com.zrqx.core.vo.newbook.print.BookStorageVo;
 import com.zrqx.core.vo.newbook.subject.SubjectAuditVo;
 import com.zrqx.core.vo.newbook.thriceaudit.ThriceAuditLogVo;
 import com.zrqx.core.vo.newbook.typographic.TypographicAuditLogVo;
@@ -918,9 +919,26 @@ public class SubjectServiceImpl extends BaseServiceImpl<BookSubject, Integer> im
     public AuditLogVo<AuditLogListVo> queryBookPrintAuditLog(String subjectNum) {
         AuditLogVo result = new AuditLogVo();
         BookPrint bookPrint = bookPrintManage.queryOneBySubjectNumAndBookType(subjectNum, BookTypeEnum.NEW_BOOK.getCode());
-
+        List<AuditLogListVo> logs = bookPrintService.listLogs(bookPrint.getId(), BookTypeEnum.NEW_BOOK.getCode());
         result.setStage(bookPrint.getStage());
-        result.setItems(bookPrintService.listLogs(bookPrint.getId(), BookTypeEnum.NEW_BOOK.getCode()));
+        if (BookPrintEnum.WAREHOUSING.getCode().equals(bookPrint.getStage())) {
+            result.setItems(logs);
+            return result;
+        }
+
+        //图书入库需要补全入库操作人姓名作为展示
+        logs.parallelStream()
+                .map(arg -> {
+                    BookStorageVo storage = arg.getStorage();
+                    if (storage != null) {
+                        String createdBy = arg.getStorage().getCreatedBy();
+                        UserVO userDetails = getUserDetails(createdBy);
+                        storage.setCreatorName(userDetails.getUserName());
+                    }
+                    return arg;
+                })
+                .collect(Collectors.toList());
+        result.setItems(logs);
 
         return result;
     }

com.zrqx.newbook/src/main/java/com/zrqx/newbook/commons/httpclient/NewBook.http

@@ -35,7 +35,7 @@ Accept: application/json
 
 ###新书管理-导出
 
-GET http://localhost:8216/bg/newbook/list/logs?id=160&stages=4-1,4-2,5-1,6-1
+GET http://localhost:8216/bg/newbook/list/logs?id=163&stages=7-4
 Accept: application/json
 
 ###新书管理-详情日志列表

com.zrqx.newbook/src/main/java/com/zrqx/newbook/commons/httpclient/ThriceAudit.http

+POST http://localhost:8216/bg/audit/check
+Content-Type: application/json
+
+[
+  {
+    "id": 72,
+    "subjectNum": "ZYGJ202006123"
+  }
+]
+
+### 图书再版 验证图书是否印刷
+
 POST http://localhost:8216/bg/cip/update/details
 Content-Type: application/json