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

pom.xml

@@ -416,7 +416,22 @@
 <!--            <artifactId>assertj-core</artifactId>-->
 <!--            <version>3.18.1</version>-->
 <!--        </dependency>-->
-
+        <!--easypoi-->
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-web</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>3.1.0</version>
+        </dependency>
 
     </dependencies>
 

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

@@ -95,12 +95,10 @@ public class AutoSubmit extends IJobHandler {
                 changeRecord.setFlowNode(execNode);
                 changeRecord.setUpdateTime(DateUtils.getCurrentTime());
                 changeFlowService.updateRecord(changeRecord);
-                // todo: 发送邮件
             } catch (Exception e) {
                 log.debug("[progressRecord] submit error, flowId{}", flowId);
             }
-        } else if (ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId().equals(flowNode)) {
-            // todo: 发送邮件
         }
+        // todo: 到达执行确认时间，发送邮件
     }
 }
\ No newline at end of file

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelDTO.java

+/**
+ * @(#)ChangeFlowExcelDTO.java, 2022/11/25.
+ * <p/>
+ * Copyright 2022 Netease, Inc. All rights reserved.
+ * NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+package com.netease.mail.yanxuan.change.integration.excel;
+
+import com.netease.mail.yanxuan.change.common.enums.ChangeStatusEnum;
+import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * @Author zcwang
+ * @Date 2022/11/25
+ */
+@Data
+public class ChangeFlowExcelDTO {
+    /**
+     * 主键id
+     */
+    @Excel(name = "变更ID")
+    private Long id;
+
+    /**
+     * 变更主体
+     * @see ChangeSubjectEnum
+     */
+    @Excel(name = "变更主体")
+    private String changeSubject;
+    /**
+     * 变更类型，一级类型>二级类型
+     */
+    @Excel(name = "变更类型")
+    private String changeType;
+
+    /**
+     * 变更负责部门名
+     */
+    @Excel(name = "变更负责部门名")
+    private String changeDepartment;
+
+    /**
+     * 变更内容
+     */
+    @Excel(name = "变更内容")
+    private String changeContent;
+    /**
+     * 变更负责人
+     */
+    @Excel(name = "变更负责人")
+    private String changeCommander;
+
+    /**
+     * 变更商品列表，SPUID+商品名称
+     */
+    @Excel(name = "变更商品")
+    private String changeItems;
+    /**
+     * 变更供应商，仅展示供应商ID，没有时展示为“/”
+     */
+    @Excel(name = "变更供应商")
+    private String supplier;
+    /**
+     * 变更状态
+     * @see ChangeStatusEnum
+     */
+    @Excel(name = "变更状态")
+    private Integer changeState;
+    /**
+     * 变更发起人
+     */
+    @Excel(name = "变更发起人")
+    private String changeCreator;
+
+    /**
+     * 变更行动部门列表
+     */
+    @Excel(name = "变更行动部门")
+    private String execDepartmentStrList;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间")
+    private Long createTime;
+
+}
\ No newline at end of file

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

@@ -6,6 +6,7 @@
  */
 package com.netease.mail.yanxuan.change.web.controller;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,14 +17,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 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.ChangeFlowService;
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
-import com.netease.mail.yanxuan.change.common.util.DateUtils;
-import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq;
@@ -52,6 +50,7 @@ public class ChangeFlowController {
 
     /**
      * 变更工单详情查询
+     * 
      * @return
      */
     @GetMapping("/detail")
@@ -65,7 +64,7 @@ public class ChangeFlowController {
      * @return
      */
     @GetMapping("/query")
-    public AjaxResult<PageInfo<ChangeRecord>> query(@RequestParam(name = "page", defaultValue = "1") Integer page,
+    public AjaxResult<PageInfo<ChangeFlowVO>> query(@RequestParam(name = "page", defaultValue = "1") Integer page,
                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                             @RequestParam(name = "itemId", required = false) String itemId,
                             @RequestParam(name = "supplier", required = false) String supplier,
@@ -93,6 +92,7 @@ public class ChangeFlowController {
 
     /**
      * 返回提示文案
+     * 
      * @return
      */
     @GetMapping("/title")
@@ -102,6 +102,7 @@ public class ChangeFlowController {
 
     /**
      * 发起变更，如果发起人=审核人，自动跳转到第一个节点
+     * 
      * @return
      */
     @PostMapping("/create")
@@ -111,6 +112,7 @@ public class ChangeFlowController {
 
     /**
      * 变更工单提交
+     * 
      * @return
      */
     @PostMapping("/submit")
@@ -120,15 +122,18 @@ public class ChangeFlowController {
 
     /**
      * 工单转交
+     * 
      * @return
      */
     @PostMapping("/deliver")
-    public AjaxResult<Boolean> deliver() {
+    public AjaxResult<Void> deliver() {
+        changeFlowBiz.deliver();
         return AjaxResult.success();
     }
 
     /**
      * 工单取消
+     * 
      * @return
      */
     @PostMapping("/cancel")
@@ -138,6 +143,7 @@ public class ChangeFlowController {
 
     /**
      * 引用变更工单
+     * 
      * @return
      */
     @GetMapping("/quote")
@@ -145,19 +151,40 @@ public class ChangeFlowController {
         return AjaxResult.success(changeFlowBiz.quote(flowId));
     }
 
-
     /**
      * 导出变更
+     * 
      * @return
      */
     @PostMapping("/export")
-    public AjaxResult<Void> 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.setState(changeState);
+        changeFlowListQueryReq.setChangeCommander(changeCommander);
+        changeFlowListQueryReq.setChangeDepartment(changeDepartment);
+        changeFlowListQueryReq.setChangeExecDepartment(changeExecDepartment);
+        changeFlowListQueryReq.setStartTime(startTime);
+        changeFlowListQueryReq.setEndTime(endTime);
+        changeFlowBiz.export(changeFlowListQueryReq, response);
         return AjaxResult.success();
     }
 
     /**
      * 获取审批人
+     * 
      * @param interfaceInput
      * @return
      */