Merge remote-tracking branch 'origin/develop' into develop

@@ -96,6 +96,13 @@ public class DemandController {
         Boolean vo = demandService.lastApprove(dto);
         Boolean vo = demandService.lastApprove(dto);
         return CommonRes.success(vo);
         return CommonRes.success(vo);
     }
     }
+
+    @PostMapping("/process-order-list")
+    @Operation(summary = "查询加工单列表")
+    public CommonRes<List<ProcessOrderProcessDtlRSVO>> listByProcessOrderNo() {
+        List<ProcessOrderProcessDtlRSVO> pageVO = demandService.listByProcessOrderNo();
+        return CommonRes.success(pageVO);
+    }
     
     
     //endregion
     //endregion
     
     

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @program: 
+ * @description: 加工单加工明细返回参数
+ * @author: xup
+ * @create: 2025-02-10 17:57
+ **/
+@Data
+@Schema(title = "加工单加工明细返回参数")
+public class ProcessOrderProcessDtlRSVO {
+    
+    /**
+     * 系统唯一标识
+     */
+    @Schema(description = "系统唯一标识")
+    private String guid;
+    
+    /**
+     * 会员Guid
+     */
+    @Schema(description = "会员Guid")
+    private String tenantGuid;
+    
+    /**
+     * 加工单Guid
+     */
+    @Schema(description = "加工单Guid")
+    private String processOrderGuid;
+    
+    /**
+     * 加工单号
+     */
+    @Schema(description = "加工单号")
+    private String processOrderNo;
+    
+    /**
+     * 加工单名称
+     */
+    @Schema(description = "加工单名称")
+    private String processOrderName;
+    
+    /**
+     * 加工方式（1 数据服务；2 需求申请）
+     */
+    @Schema(description = "加工方式（1 数据服务；2 需求申请）")
+    private Integer processType;
+    
+    /**
+     * 业务Guid
+     */
+    @Schema(description = "业务Guid")
+    private String bizGuid;
+    
+    /**
+     * 加工状态(N 未开始；A 进行中；Y 已完成)
+     */
+    @Schema(description = "加工状态(N 未开始；A 进行中；Y 已完成)")
+    private String processState;
+    
+    /**
+     * 加工时间
+     */
+    @Schema(description = "加工时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date processTime;
+    
+    /**
+     * 交付时间
+     */
+    @Schema(description = "交付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date deliverTime;
+    
+    /******** 库表存储属性 需处理 *****/
+    
+    /******** 自定义扩展 *****/
+    
+    /******** 子对象 *****/
+    
+}

@@ -3,6 +3,7 @@ package com.csbr.qingcloud.portal.feign;
 import com.csbr.cloud.common.config.FastCallFeignConfiguration;
 import com.csbr.cloud.common.config.FastCallFeignConfiguration;
 import com.csbr.cloud.common.response.CommonRes;
 import com.csbr.cloud.common.response.CommonRes;
 import com.csbr.qingcloud.portal.domain.vo.DemandUpdateStateVO;
 import com.csbr.qingcloud.portal.domain.vo.DemandUpdateStateVO;
+import com.csbr.qingcloud.portal.domain.vo.ProcessOrderProcessDtlRSVO;
 import com.csbr.qingcloud.portal.domain.vo.ProcessOrderRQVO;
 import com.csbr.qingcloud.portal.domain.vo.ProcessOrderRQVO;
 import jakarta.validation.Valid;
 import jakarta.validation.Valid;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -24,4 +25,7 @@ public interface DataProcessBasicFeign {
     @PostMapping(value = "/process-order-process-dtl/get-order-state", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     @PostMapping(value = "/process-order-process-dtl/get-order-state", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     CommonRes<Map<String, DemandUpdateStateVO>> getOrderState(@RequestBody List<String> processOrderGuids);
     CommonRes<Map<String, DemandUpdateStateVO>> getOrderState(@RequestBody List<String> processOrderGuids);
 
 
+    @PostMapping(value = "/process-order-process-dtl/process-order-list", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<List<ProcessOrderProcessDtlRSVO>> processOrderList(@RequestBody List<String> processOrderGuids);
+
 }
 }

 package com.csbr.qingcloud.portal.service;
 package com.csbr.qingcloud.portal.service;
 
 
-import com.csbr.qingcloud.portal.domain.vo.DemandApproveVO;
-import com.csbr.qingcloud.portal.domain.vo.DemandUpdateStateVO;
+import com.csbr.qingcloud.portal.domain.vo.*;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
-import com.csbr.qingcloud.portal.domain.vo.DemandQueryVO;
-import com.csbr.qingcloud.portal.domain.vo.DemandRSVO;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -76,4 +73,9 @@ public interface DemandService {
 
 
     DemandRSVO getDemandDetailByProcess(String processOrderNo);
     DemandRSVO getDemandDetailByProcess(String processOrderNo);
 
 
+    /**
+     * 根据加工单编号查询资产列表
+     * @return
+     */
+    List<ProcessOrderProcessDtlRSVO> listByProcessOrderNo();
 }
 }

@@ -2,6 +2,7 @@ package com.csbr.qingcloud.portal.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
@@ -30,6 +31,7 @@ import csbr.cloud.entity.utils.UserContextHolder;
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import io.seata.spring.annotation.GlobalTransactional;
 import io.seata.spring.annotation.GlobalTransactional;
@@ -342,6 +344,19 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         return convertToVO(list.get(0),getStateMap(Collections.singletonList(list.get(0).getGuid())));
         return convertToVO(list.get(0),getStateMap(Collections.singletonList(list.get(0).getGuid())));
     }
     }
 
 
+    @Override
+    public List<ProcessOrderProcessDtlRSVO> listByProcessOrderNo() {
+        LambdaQueryWrapper<MfDemand> queryWrapper = Wrappers.lambdaQuery(MfDemand.class);
+        queryWrapper.isNotNull(MfDemand::getRequirementOrderNo).isNotNull(MfDemand::getProcessOrderNo);
+        queryWrapper.orderByDesc(MfDemand::getCreateTime);
+        List<MfDemand> mfDemands = mfDemandService.list(queryWrapper);
+        if (ObjectUtils.isEmpty(mfDemands)) {
+            return null;
+        }
+        List<String> guids = mfDemands.stream().map(MfDemand::getGuid).toList();
+        return dataProcessBasicFeign.processOrderList(guids).getData();
+    }
+
     /**
     /**
      * 获取发起流程参数
      * 获取发起流程参数
      * @author xcq
      * @author xcq