merge:feature-modifyDownload-230129:operator:hzhuyuanyuan@corp.netease.com:auto_…

merge:feature-modifyDownload-230129:operator:hzhuyuanyuan@corp.netease.com:auto_branch_merge_by_branchService_end

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

@@ -1280,6 +1280,7 @@ public class ChangeFlowBiz {
         return userBaseContainer;
     }
 
+    @Deprecated
     public void export(ChangeFlowListQueryReq changeFlowListQueryReq, HttpServletResponse response) {
         List<ChangeRecord> changeRecords = changeRecordMapper.selectByCondition(changeFlowListQueryReq);
         if (CollectionUtils.isEmpty(changeRecords)) {

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

@@ -115,11 +115,12 @@ public class ChangeFlowExportCallback implements DesCallbackService {
 
     @Override
     public List<List<ExcelCell>> queryExcelData(CallbackQueryReq req) {
-        log.info("[op: address book export callback queryExcelData] req={}", JSON.toJSONString(req));
+        log.info("[op: change flow export callback queryExcelData] req={}", JSON.toJSONString(req));
         ChangeFlowExportQuery query = JSON.parseObject(req.getParamJson(), ChangeFlowExportQuery.class);
         query.setOffset(req.getOffset());
         query.setLimit(req.getLimit());
         List<ChangeFlowExcelDTO> list = getExportList(query);
+        log.debug("[op: change flow export callback queryExcelData] size:{}", list.size());
         return list.stream().map(ChangeFlowExcelVo::init).collect(Collectors.toList());
     }
 

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

@@ -83,6 +83,11 @@ public class ChangeFlowExportQuery {
      */
     protected String uid;
 
+    /**
+     * 工单id
+     */
+    private Long flowId;
+
     private Long limit;
 
     private Long offset;

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java

@@ -160,7 +160,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         //记录最大出现次数
         int temp = 0;
         //记录最大值
-        GoodsResponseRpc name = new GoodsResponseRpc();
+        GoodsResponseRpc responseRpc = new GoodsResponseRpc();
         //记录出现的所有值
         List<GoodsResponseRpc> emails = new ArrayList<GoodsResponseRpc>();
         //遍历取出所有商品关联的人
@@ -211,16 +211,22 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                 email.setOccurrenceNumber(goodsResponseRpc.getOccurrenceNumber() + 1);
                 if (temp < goodsResponseRpc.getOccurrenceNumber()) {
                     temp = goodsResponseRpc.getOccurrenceNumber();
-                    name = goodsResponseRpc;
+                    responseRpc = goodsResponseRpc;
                 }
             }
             map.put(email.getName(), email);
         }
-        if (name.getName() == null) {
+        if (responseRpc.getName() == null) {
             Iterator<GoodsResponseRpc> iterator = map.values().iterator();
-            name = iterator.next();
+            responseRpc = iterator.next();
         }
-        return name;
+        if (StringUtils.isBlank(responseRpc.getEmail())) {
+            Integer byType = ChangePrincipalEnum.getByType(commander);
+            if (null != byType) {
+                this.goodsGetEmail(responseRpc, byType);
+            }
+        }
+        return responseRpc;
     }
 
     /**
@@ -236,7 +242,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
      */
     private GoodsResponseRpc queryChangeSupplier(ChangeCommanderEnum commanderEnum, String changeSupplierId,
         String commander) {
-        GoodsResponseRpc rpc = new GoodsResponseRpc();
+        GoodsResponseRpc goodsResponseRpc = new GoodsResponseRpc();
         if (!commanderEnum.getId().equals(ChangeCommanderEnum.SUPPLIERS_ASSOCIATED.getId()) || changeSupplierId == null
             || commander == null) {
             return null;
@@ -260,16 +266,18 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         req.setSupplierIdList(supplierIdList);
         //进行参数解析
         List<SupplierUserRsp> listAjaxResponse = supplierInfoService.querySupplierRelatedUser(req);
-        if (CollectionUtils.isEmpty(listAjaxResponse)) {
-            return null;
-        }
+        if (!CollectionUtils.isEmpty(listAjaxResponse)) {
             SupplierUserRsp supplierUserRsp = listAjaxResponse.get(0);
             Map<String, String> uid2NameMap = supplierUserRsp.getUid2NameMap();
-        for (String key: uid2NameMap.keySet()) {
-            rpc.setName(uid2NameMap.get(key));
-            rpc.setEmail(key);
+            for (String key : uid2NameMap.keySet()) {
+                goodsResponseRpc.setName(uid2NameMap.get(key));
+                goodsResponseRpc.setEmail(key);
             }
-        return rpc;
+        }
+        if (StringUtils.isBlank(goodsResponseRpc.getEmail())) {
+            this.getEmail(goodsResponseRpc, req.getSearchType());
+        }
+        return goodsResponseRpc;
     }
 
     /**
@@ -499,4 +507,46 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         }
     }
 
+    private void getEmail(GoodsResponseRpc goodsResponseRpc, Integer type) {
+        switch (type) {
+            case 4:
+                //商品开发
+                goodsResponseRpc.setName(appConfig.getFunctionaryName());
+                goodsResponseRpc.setEmail(appConfig.getFunctionaryEmail());
+            case 1:
+                //采购
+                goodsResponseRpc.setName(appConfig.getPurchaseName());
+                goodsResponseRpc.setEmail(appConfig.getPurchaseEmail());
+            case 2:
+                //计划
+                goodsResponseRpc.setName(appConfig.getGoodsProjectName());
+                goodsResponseRpc.setEmail(appConfig.getGoodsProjectEmail());
+            case 3:
+                //SQE
+                goodsResponseRpc.setName(appConfig.getSqeName());
+                goodsResponseRpc.setEmail(appConfig.getSqeEmail());
+        }
+    }
+
+    private void goodsGetEmail(GoodsResponseRpc goodsResponseRpc, Integer type) {
+        switch (type) {
+            case 1:
+                //商品开发
+                goodsResponseRpc.setName(appConfig.getFunctionaryName());
+                goodsResponseRpc.setEmail(appConfig.getFunctionaryEmail());
+            case 2:
+                //采购
+                goodsResponseRpc.setName(appConfig.getPurchaseName());
+                goodsResponseRpc.setEmail(appConfig.getPurchaseEmail());
+            case 3:
+                //计划
+                goodsResponseRpc.setName(appConfig.getGoodsProjectName());
+                goodsResponseRpc.setEmail(appConfig.getGoodsProjectEmail());
+            case 4:
+                //SQE
+                goodsResponseRpc.setName(appConfig.getSqeName());
+                goodsResponseRpc.setEmail(appConfig.getSqeEmail());
+        }
+    }
+
 }

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

@@ -29,4 +29,12 @@ public enum ChangePrincipalEnum {
         return name;
     }
 
+    public static Integer getByType(String name) {
+        for ( ChangePrincipalEnum value : ChangePrincipalEnum.values()) {
+            if (value.getName().equals(name)) {
+                return value.getType();
+            }
+        }
+        return null;
+    }
 }

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

@@ -13,7 +13,8 @@ package com.netease.mail.yanxuan.change.common.enums;
 public enum CreateSourceEnum {
     QC(1, "网易QC端"),
     TONG_ZHOU(2, "同舟端"),
-    PRODUCT(3, "商品端");
+    PRODUCT(3, "商品端"),
+    COLLABORATION_CENTER(4, "协同中心");
 
     private Integer type;
 

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowRequest.java

@@ -75,4 +75,9 @@ public class ChangeFlowRequest {
     private String serviceCode;
 
     private String uid;
+
+    /**
+     * 工单id
+     */
+    private Long flowId;
 }
\ No newline at end of file

yanxuan-qc-change-system-dal/src/main/resources/mybatis/mapper/ChangeRecordMapper.xml

@@ -128,6 +128,9 @@
             <if test="createSupplier != null">
                 and create_supplier = #{createSupplier}
             </if>
+            <if test="flowId != null">
+                and flow_id = #{flowId}
+            </if>
         </where>
                 limit #{offset},#{limit}
     </select>

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/config/UserInterceptor.java

@@ -76,7 +76,11 @@ public class UserInterceptor implements HandlerInterceptor {
             log.info("userInfo: {}", JSON.toJSONString(userInfo));
             if (userInfo != null) {
                 RequestLocalBean.setUid(userInfo.getUsername());
+                if (userInfo.getProfile() != null) {
                     RequestLocalBean.setName(userInfo.getProfile().getNickName());
+                } else {
+                    RequestLocalBean.setName(userInfo.getUsername());
+                }
             }
         } else {
             // 获取用户信息

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java

@@ -105,8 +105,9 @@ public class ChangeFlowController {
         changeFlowListQueryReq.setStartTime(startTime);
         changeFlowListQueryReq.setEndTime(endTime);
         changeFlowListQueryReq.setFlowId(flowId);
-        // QC端可以查看所有，不加入过滤条件
-        if (!CreateSourceEnum.QC.getType().equals(createSource)) {
+        // QC端/协同中心可以查看所有，不加入过滤条件
+        if (!CreateSourceEnum.QC.getType().equals(createSource)
+                && !CreateSourceEnum.COLLABORATION_CENTER.getType().equals(createSource)) {
             changeFlowListQueryReq.setCreateSource(createSource);
         }
         if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
@@ -198,7 +199,8 @@ public class ChangeFlowController {
                                     @RequestParam(name = "startTime", required = false) Long startTime,
                                     @RequestParam(name = "endTime", required = false) Long endTime,
                                     @RequestParam(name = "createSource", required = false, defaultValue = "1") Integer createSource,
-                                    @RequestParam(name = "serviceCode") String serviceCode) {
+                                    @RequestParam(name = "serviceCode") String serviceCode,
+                                    @RequestParam(name = "flowId", required = false) Long flowId) {
         ChangeFlowRequest changeFlowRequest = new ChangeFlowRequest();
         changeFlowRequest.setItemId(itemId);
         changeFlowRequest.setSupplier(supplier);
@@ -211,8 +213,10 @@ public class ChangeFlowController {
         changeFlowRequest.setStartTime(startTime);
         changeFlowRequest.setEndTime(endTime);
         changeFlowRequest.setServiceCode(serviceCode);
-        // QC端可以查看所有，不加入过滤条件
-        if (!CreateSourceEnum.QC.getType().equals(createSource)) {
+        changeFlowRequest.setFlowId(flowId);
+        // QC端/协同中心可以查看所有，不加入过滤条件
+        if (!CreateSourceEnum.QC.getType().equals(createSource)
+            && !CreateSourceEnum.COLLABORATION_CENTER.getType().equals(createSource)) {
             changeFlowRequest.setCreateSource(createSource);
         }
         if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {