Merge branch 'feat-1002619' into 'master'

1002619 优化需求-平台端书刊标签入库增加编辑信息和出版社信息字段

See merge request rays/pcloud-book!557

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookLabelBizImpl.java

@@ -6,14 +6,19 @@ import com.pcloud.book.book.dao.BookLabelDao;
 import com.pcloud.book.book.entity.BookLabel;
 import com.pcloud.book.book.enums.BookLabelAuditState;
 import com.pcloud.book.book.vo.BookLabelVO;
+import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
+import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.string.StringUtil;
+import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +30,8 @@ public class BookLabelBizImpl implements BookLabelBiz {
 
     @Autowired
     private BookLabelDao bookLabelDao;
+    @Autowired
+    private AdviserConsr adviserConsr;
 
     @Override
     public void applyBookLabel(BookLabel bookLabel, String systemCode) {
@@ -110,6 +117,24 @@ public class BookLabelBizImpl implements BookLabelBiz {
         map.put("filterApply", 1);
         map.put("auditState", auditState);
         PageBeanNew<BookLabelVO> pageBeanNew = bookLabelDao.listPageNew(new PageParam(currentPage,numPerPage), map,"listBookLabel");
+        if (null ==pageBeanNew || ListUtils.isEmpty(pageBeanNew.getRecordList())){
+            return new PageBeanNew<>(currentPage,numPerPage,0,new ArrayList<>());
+        }
+        List<BookLabelVO> list = pageBeanNew.getRecordList();
+        List<Long> adviserIds = list.stream().filter(s->s.getCreateUser()>0).map(BookLabelVO::getCreateUser).distinct().collect(Collectors.toList());
+        Map<Long, AdviserBaseInfoDto> adviserBaseInfoDtoMap = new HashMap<>();
+        if (!ListUtils.isEmpty(adviserIds)){
+            adviserBaseInfoDtoMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(adviserIds);
+        }
+        for (BookLabelVO bookLabelVO:list){
+            if (!MapUtils.isEmpty(adviserBaseInfoDtoMap) && adviserBaseInfoDtoMap.containsKey(bookLabelVO.getCreateUser())){
+                AdviserBaseInfoDto adviserBaseInfoDto = adviserBaseInfoDtoMap.get(bookLabelVO.getCreateUser());
+                if (null!=adviserBaseInfoDto){
+                    bookLabelVO.setAdviserName(adviserBaseInfoDto.getPartyName());
+                    bookLabelVO.setAgentName(adviserBaseInfoDto.getAgentName());
+                }
+            }
+        }
         return pageBeanNew;
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/BookLabelVO.java

@@ -39,4 +39,13 @@ public class BookLabelVO extends BaseDto {
 
     @ApiModelProperty("申请说明")
     private String remark;
+
+    @ApiModelProperty("申请人id")
+    private Long createUser;
+
+    @ApiModelProperty("编辑名称")
+    private String adviserName;
+
+    @ApiModelProperty("出版社")
+    private String agentName;
 }

pcloud-service-book/src/main/resources/mapper/book/BookLabel.Mapper.xml

@@ -104,7 +104,8 @@
 		audit_state auditState,
 		seq seq,
 		create_time createTime,
-		remark AS remark
+		remark AS remark,
+		create_user createUser
 		from book_label
 		WHERE 1=1
 		<if test="auditState != null">