Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -244,7 +244,7 @@ public class ChangeFlowBiz {
                 throw ExceptionFactory.createBiz(ResponseCode.SUBMIT_FLOW_ERROR, "首次提交节点失败");
             }
             // 更新节点id
-            changeRecord.setFlowNode(nodeId);
+            changeRecord.setFlowNode(ChangeFlowEnum.CHANGE_FLOW_EXE.getNodeId());
             changeRecord.setUpdateTime(DateUtils.getCurrentTime());
             changeFlowService.updateRecord(changeRecord);
             HashMap<String, Object> param = new HashMap<>();
@@ -804,7 +804,7 @@ public class ChangeFlowBiz {
                 return changeFlowVO;
             }).collect(Collectors.toList());
         }
-        PageVO pageVO = buildPageVo(list.size(), pageSize, page);
+        PageVO pageVO = buildPageVo(changeRecordPageInfo.getTotal(), pageSize, page);
         ChangeFlowListVO changeFlowListVO = new ChangeFlowListVO();
         changeFlowListVO.setPageVo(pageVO);
         changeFlowListVO.setChangeFlowList(list);
@@ -814,12 +814,13 @@ public class ChangeFlowBiz {
     /**
      * 构建分页信息
      *
-     * @param totalCount
+     * @param total
      * @param pageSize
      * @param page
      * @return
      */
-    private PageVO buildPageVo(int totalCount, Integer pageSize, Integer page) {
+    private PageVO buildPageVo(Long total, Integer pageSize, Integer page) {
+        Integer totalCount = Math.toIntExact(total);
         int totalPage;
         int i = totalCount % pageSize;
         if (i != 0) {

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangeCommanderEnum.java

@@ -8,7 +8,7 @@ public enum ChangeCommanderEnum {
 
     COMMANDER_ORIGINATOR(1,"发起人"),
     FIXED_PERSON(2,"固定人"),
-    GOODS_ASSOCIATED(3,"产品关联角色"),
+    GOODS_ASSOCIATED(3,"商品关联角色"),
     SUPPLIERS_ASSOCIATED(4,"供应商关联角色");
 
     ChangeCommanderEnum(Integer id, String name) {

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangePrincipalEnum.java

@@ -6,7 +6,7 @@ package com.netease.mail.yanxuan.change.common.enums;
  */
 public enum ChangePrincipalEnum {
 
-    GOODS_BU(1,"商品BU"),
+    GOODS_BU(1,"商品开发"),
     PURCHASE(2,"采购"),
     PROSPECTUS(3,"计划"),
     SQE(4,"SQE");