modify: 导出添加工单id条件

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-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/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)) {