add: 平台下载

pom.xml

@@ -450,30 +450,6 @@
             <version>${des.version}</version>
         </dependency>
 
-        <!-- mapstruct -->
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-        <!-- mapStruct 支持 lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-mapstruct-binding</artifactId>
-            <version>0.2.0</version>
-        </dependency>
-
-
     </dependencies>
 
     <repositories>

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

-/**
- * @(#)ExportMapper.java, 2022/12/8.
- * <p/>
- * Copyright 2022 Netease, Inc. All rights reserved.
- * NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
- */
-package com.netease.mail.yanxuan.change.biz.convert;
-
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExportQuery;
-import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowRequest;
-
-/**
- * @Author zcwang
- * @Date 2022/12/8
- */
-@Mapper
-public interface ExportMapper {
-
-    ExportMapper INSTANCE = Mappers.getMapper(ExportMapper.class);
-
-    ChangeFlowExportQuery convertChangeFlowExport(ChangeFlowRequest req);
-}
\ No newline at end of file

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

@@ -8,6 +8,8 @@ package com.netease.mail.yanxuan.change.biz.service;
 
 import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 
 /**

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

@@ -16,6 +16,7 @@ import com.netease.mail.dp.des.common.api.query.CallbackQueryParam;
 import com.netease.mail.dp.des.interaction.api.req.TaskReq;
 import com.netease.mail.dp.des.starter.client.DesClient;
 import com.netease.mail.yanxuan.change.biz.config.AppConfig;
+import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowRequest;
 
 /**
  * @Author zcwang
@@ -30,7 +31,7 @@ public class DESExportService {
     @Autowired
     private AppConfig appConfig;
 
-    public String changeFlowExport(ChangeFlowExportQuery query) {
+    public String changeFlowExport(ChangeFlowRequest query) {
         TaskReq taskReq = new TaskReq();
         taskReq.setUserEmail(query.getUid());
         taskReq.setProductCode(query.getServiceCode());

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

@@ -6,20 +6,73 @@
  */
 package com.netease.mail.yanxuan.change.dal.meta.model.req;
 
+import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
+
+import lombok.Data;
+
 /**
  * @Author zcwang
  * @Date 2022/12/8
  */
+@Data
 public class ChangeFlowRequest {
+    /**
+     * 变更商品（变更主体为商品时有效）
+     */
     private String itemId;
+
+    /**
+     * 变更供应商（变更主体为供应商时有效）
+     */
     private String supplier;
+
+    /**
+     * 一级变更类型id
+     */
     private Long parentChangeClassId;
+
+    /**
+     * 二级变更类型id
+     */
     private Long sonChangeClassId;
+
+    /**
+     * 工单状态
+     */
     private Integer changeState;
+
+    /**
+     * 变更负责人
+     */
     private String changeCommander;
+
+    /**
+     * 变更负责部门名
+     */
     private String changeDepartment;
+
+    /**
+     * 变更行动部门
+     */
     private String changeExecDepartment;
+
+    /**
+     * 开始时间
+     */
     private Long startTime;
+
+    /**
+     * 结束时间
+     */
     private Long endTime;
 
+    /**
+     * 创建端
+     * @see CreateSourceEnum
+     */
+    private Integer createSource;
+
+    private String serviceCode;
+
+    private String uid;
 }
\ No newline at end of file

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

@@ -6,7 +6,6 @@
  */
 package com.netease.mail.yanxuan.change.web.controller;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.apache.logging.log4j.util.Strings;
@@ -21,12 +20,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz;
 import com.netease.mail.yanxuan.change.biz.config.TitleConfig;
+import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExportQuery;
 import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
+import com.netease.mail.yanxuan.change.biz.service.DESExportService;
 import com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService;
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.netease.mail.yanxuan.change.common.bean.RequestLocalBean;
 import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
-import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExportQuery;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.QueryCommanderEmailReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
@@ -38,8 +38,6 @@ import com.netease.mail.yanxuan.change.dal.meta.model.rpc.CommanderResponse;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.BasicChangeFlowVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowListVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowVO;
-import com.netease.mail.yanxuan.change.biz.convert.ExportMapper;
-import com.netease.mail.yanxuan.change.biz.service.DESExportService;
 import com.netease.yanxuan.flowx.sdk.meta.dto.exec.InterfaceInputDTO;
 import com.netease.yanxuan.flowx.sdk.meta.dto.exec.UserBaseContainerDTO;
 
@@ -54,8 +52,6 @@ import lombok.extern.slf4j.Slf4j;
 @RequestMapping("/change/flow")
 public class ChangeFlowController {
 
-    private static final ExportMapper exportMapper = ExportMapper.INSTANCE;
-
     @Autowired
     private ChangeFlowService changeFlowService;
 
@@ -108,7 +104,7 @@ public class ChangeFlowController {
         changeFlowListQueryReq.setChangeExecDepartment(changeExecDepartment);
         changeFlowListQueryReq.setStartTime(startTime);
         changeFlowListQueryReq.setEndTime(endTime);
-        // QC端可以查看所有，不许加入过滤条件
+        // QC端可以查看所有，不加入过滤条件
         if (!CreateSourceEnum.QC.getType().equals(createSource)) {
             changeFlowListQueryReq.setCreateSource(createSource);
         }
@@ -186,35 +182,42 @@ public class ChangeFlowController {
      */
     @PostMapping("/export")
     public AjaxResult<Void> export(@RequestParam(name = "itemId", required = false) String itemId,
-                        @RequestParam(name = "supplier", required = false) String supplier,
-                        @RequestParam(name = "parentChangeClassId", required = false) Long parentChangeClassId,
-                        @RequestParam(name = "sonChangeClassId", required = false) Long sonChangeClassId,
-                        @RequestParam(name = "changeState", required = false) Integer changeState,
-                        @RequestParam(name = "changeCommander", required = false) String changeCommander,
-                        @RequestParam(name = "changeDepartment", required = false) String changeDepartment,
-                        @RequestParam(name = "changeExecDepartment", required = false) String changeExecDepartment,
-                        @RequestParam(name = "startTime", required = false) Long startTime,
-                        @RequestParam(name = "endTime", required = false) Long endTime, HttpServletResponse response) {
-        ChangeFlowListQueryReq changeFlowListQueryReq = new ChangeFlowListQueryReq();
-        changeFlowListQueryReq.setItemId(itemId);
-        changeFlowListQueryReq.setSupplier(supplier);
-        changeFlowListQueryReq.setParentChangeClassId(parentChangeClassId);
-        changeFlowListQueryReq.setSonChangeClassId(sonChangeClassId);
-        changeFlowListQueryReq.setChangeState(changeState);
-        changeFlowListQueryReq.setChangeCommander(changeCommander);
-        changeFlowListQueryReq.setChangeDepartment(changeDepartment);
-        changeFlowListQueryReq.setChangeExecDepartment(changeExecDepartment);
-        changeFlowListQueryReq.setStartTime(startTime);
-        changeFlowListQueryReq.setEndTime(endTime);
-        changeFlowBiz.export(changeFlowListQueryReq, response);
+                                    @RequestParam(name = "supplier", required = false) String supplier,
+                                    @RequestParam(name = "parentChangeClassId", required = false) Long parentChangeClassId,
+                                    @RequestParam(name = "sonChangeClassId", required = false) Long sonChangeClassId,
+                                    @RequestParam(name = "changeState", required = false) Integer changeState,
+                                    @RequestParam(name = "changeCommander", required = false) String changeCommander,
+                                    @RequestParam(name = "changeDepartment", required = false) String changeDepartment,
+                                    @RequestParam(name = "changeExecDepartment", required = false) String changeExecDepartment,
+                                    @RequestParam(name = "startTime", required = false) Long startTime,
+                                    @RequestParam(name = "endTime", required = false) Long endTime,
+                                    @RequestParam(name = "createSource") Integer createSource,
+                                    @RequestParam(name = "serviceCode") Integer serviceCode) {
+        ChangeFlowRequest changeFlowRequest = new ChangeFlowRequest();
+        changeFlowRequest.setItemId(itemId);
+        changeFlowRequest.setSupplier(supplier);
+        changeFlowRequest.setParentChangeClassId(parentChangeClassId);
+        changeFlowRequest.setSonChangeClassId(sonChangeClassId);
+        changeFlowRequest.setChangeState(changeState);
+        changeFlowRequest.setChangeCommander(changeCommander);
+        changeFlowRequest.setChangeDepartment(changeDepartment);
+        changeFlowRequest.setChangeExecDepartment(changeExecDepartment);
+        changeFlowRequest.setStartTime(startTime);
+        changeFlowRequest.setEndTime(endTime);
+        // QC端可以查看所有，不加入过滤条件
+        if (!CreateSourceEnum.QC.getType().equals(createSource)) {
+            changeFlowRequest.setCreateSource(createSource);
+        }
+        if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
+            Assert.isTrue(Strings.isNotBlank(supplier), "同舟端查询供应商id不可为空");
+        }
+        this.exportAddressBook(changeFlowRequest);
         return AjaxResult.success();
     }
 
-    @GetMapping("/getChangeFlowExport")
     public AjaxResult exportAddressBook(ChangeFlowRequest req) {
-        ChangeFlowExportQuery query = exportMapper.convertChangeFlowExport(req);
-        query.setUid(RequestLocalBean.getUid());
-        desExportService.changeFlowExport(query);
+        req.setUid(RequestLocalBean.getUid());
+        desExportService.changeFlowExport(req);
         return new AjaxResult();
     }