add: 查询列表

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

@@ -6,6 +6,7 @@
  */
 package com.netease.mail.yanxuan.change.biz.biz;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,7 +29,6 @@ import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExecService;
 import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
 import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
 import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService;
-import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.netease.mail.yanxuan.change.common.bean.CommonConstants;
 import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
 import com.netease.mail.yanxuan.change.common.bean.ResponseCodeEnum;
@@ -45,7 +45,6 @@ import com.netease.mail.yanxuan.change.dal.entity.ChangeExecRecord;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeRecordMapper;
-import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeExecConfigReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
@@ -55,6 +54,7 @@ import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowSubmitReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.BasicChangeFlowVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowExecVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowVO;
+import com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemVO;
 import com.netease.mail.yanxuan.change.integration.flow.FlowRpcService;
 import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 import com.netease.yanxuan.flowx.sdk.meta.dto.base.FlowDataDTO;
@@ -411,22 +411,62 @@ public class ChangeFlowBiz {
         changeFlowVO.setFiles(changeFileList);
         changeFlowVO.setChangeProfit(changeRecord.getChangeProfit());
         changeFlowVO.setChangeProfitDesc(changeRecord.getChangeProfitDesc());
-        changeFlowVO.setChangeItems(changeRecord.getChangeItem());
+        String itemJsonStr = changeRecord.getChangeItem();
+        if (StringUtils.isNotBlank(itemJsonStr)) {
+            changeFlowVO.setChangeItems(JSON.parseArray(itemJsonStr, ItemVO.class));
+        }
         changeFlowVO.setChangeState(changeRecord.getState());
         changeFlowVO.setChangeCreator(changeRecord.getCreator());
         List<ChangeFlowExecVO> changeFlowExecRecord = changeFlowExecService.getChangeFlowExecRecord(changeRecord.getId());
         changeFlowVO.setChangeExecDepartment(changeFlowExecRecord);
         changeFlowVO.setCreateTime(changeRecord.getCreateTime());
         changeFlowVO.setChangeConfirmResultTime(changeRecord.getChangeConfirmResultTime());
-        changeFlowVO.setState(changeRecord.getState());
         changeFlowVO.setChangeResult(changeRecord.getChangeResult());
         return changeFlowVO;
     }
 
-    public PageInfo<ChangeRecord> query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
+    public PageInfo<ChangeFlowVO> query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
         //进行分页
         PageHelper.startPage(page,pageSize);
         List<ChangeRecord> changeRecords = changeRecordMapper.selectByCondition(changeFlowListQueryReq);
-        return new PageInfo<>(changeRecords);
+        List<ChangeFlowVO> list = new ArrayList<>();
+        // 处理数据
+        if (CollectionUtils.isNotEmpty(changeRecords)) {
+            list = changeRecords.stream().map(c -> {
+                ChangeFlowVO changeFlowVO = new ChangeFlowVO();
+                changeFlowVO.setId(c.getId());
+                changeFlowVO.setFlowId(c.getFlowId());
+                changeFlowVO.setChangeSubject(c.getChangeSubject());
+                ChangeType parentChangeType = changeTypeService.getChangeTypeById(c.getParentChangeClassId());
+                if (parentChangeType == null) {
+                    throw ExceptionFactory.createBiz(ResponseCode.CHANGE_TYPE_NOT_EXIST, "变更类型不存在");
+                }
+                ChangeType sonChangeType = changeTypeService.getChangeTypeById(c.getSonChangeClassId());
+                if (sonChangeType == null) {
+                    throw ExceptionFactory.createBiz(ResponseCode.CHANGE_TYPE_NOT_EXIST, "变更类型配置不存在");
+                }
+                changeFlowVO.setChangeType(parentChangeType.getTypeName() + ">" + sonChangeType.getTypeName());
+                changeFlowVO.setChangeDepartment(c.getChangeDepartment());
+                changeFlowVO.setChangeContent(c.getChangeContent());
+                changeFlowVO.setChangeCommander(c.getChangeCommander());
+                String itemJsonStr = c.getChangeItem();
+                if (StringUtils.isNotBlank(itemJsonStr)) {
+                    changeFlowVO.setChangeItems(JSON.parseArray(itemJsonStr, ItemVO.class));
+                }
+                changeFlowVO.setSupplier(c.getChangeSupplier());
+                changeFlowVO.setChangeState(c.getState());
+                changeFlowVO.setChangeCreator(c.getCreator());
+                String participateChangeExecDepartment = c.getParticipateChangeExecDepartment();
+                if (StringUtils.isNotBlank(participateChangeExecDepartment)) {
+                    changeFlowVO.setExecDepartmentStrList(JSON.parseArray(participateChangeExecDepartment, String.class));
+                }
+                changeFlowVO.setCreateTime(c.getCreateTime());
+                changeFlowVO.setChangeConfirmResultTime(c.getChangeConfirmResultTime());
+                changeFlowVO.setCancelReason(c.getCancelReason());
+                changeFlowVO.setRemark(c.getRemark());
+                return changeFlowVO;
+            }).collect(Collectors.toList());
+        }
+        return new PageInfo<ChangeFlowVO>(list);
     }
 }

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

@@ -13,14 +13,18 @@ import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeExecRecord;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowFile;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @Author zcwang
  * @Date 2022/11/14
  */
-
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 public class ChangeFlowVO {
 
@@ -86,7 +90,7 @@ public class ChangeFlowVO {
     /**
      * 变更商品列表
      */
-    private String changeItems;
+    private List<ItemVO> changeItems;
     /**
      * 变更供应商
      */
@@ -104,6 +108,11 @@ public class ChangeFlowVO {
      * 变更行动部门
      */
     private List<ChangeFlowExecVO> changeExecDepartment;
+
+    /**
+     * 变更行动部门列表
+     */
+    private List<String> execDepartmentStrList;
     /**
      * 创建时间
      */
@@ -115,11 +124,6 @@ public class ChangeFlowVO {
     private Long changeConfirmResultTime;
 
     /**
-     * 工单状态
-     */
-    private Integer state;
-
-    /**
      * 取消原因
      */
     private String cancelReason;

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

+/**
+ * @(#)ItemVO.java, 2022/11/21.
+ * <p/>
+ * Copyright 2022 Netease, Inc. All rights reserved.
+ * NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+package com.netease.mail.yanxuan.change.dal.meta.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author zcwang
+ * @Date 2022/11/21
+ */
+@Data
+public class ItemVO {
+
+    /**
+     * 商品spuId
+     */
+    private Long itemId;
+
+    /**
+     * 商品名
+     */
+    private String itemName;
+}
\ No newline at end of file

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

@@ -62,7 +62,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,