报价评估工序排序

hx-item/src/main/java/com/fjhx/item/entity/product/TechnologyBo.java

@@ -0,0 +1,14 @@
+package com.fjhx.item.entity.product;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TechnologyBo {
+
+    /**
+     * 工艺线路
+     */
+    private String processRoute;
+}

hx-sale/src/main/java/com/fjhx/sale/entity/ext/po/ExtQuotation.java

@@ -139,5 +139,5 @@ public class ExtQuotation extends BasePo {
     /**
      * 生成待创建产品时间
      */
-    private Long waitProductTime;
+    private Date waitProductTime;
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/quotation/QuotationEstimateMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.sale.mapper.quotation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.item.entity.product.ProcessesBo;
+import com.fjhx.item.entity.product.TechnologyBo;
 import com.fjhx.sale.entity.quotation.po.QuotationEstimate;
 import com.fjhx.sale.entity.quotation.vo.QuotationEstimateVo;
 
@@ -20,6 +21,8 @@ public interface QuotationEstimateMapper extends BaseMapper<QuotationEstimate> {
 
     List<ProcessesBo> getProductionProcessesList();
 
+    TechnologyBo getTechnologyInfo(Long id);
+
     List<QuotationEstimateVo> getMoldInfoList(List<Long> moldIds);
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/quotation/impl/QuotationEstimateServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.item.entity.product.ProcessesBo;
+import com.fjhx.item.entity.product.TechnologyBo;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.sale.entity.quotation.dto.QuotationEstimateDto;
@@ -102,9 +103,20 @@ public class QuotationEstimateServiceImpl extends ServiceImpl<QuotationEstimateM
                 quotationEstimateVos.add(quotationEstimate);
             }
 
+            //赋值工序信息
+            List<ProcessesBo> processesList = baseMapper.getProductionProcessesList();
+            Map<Long, ProcessesBo> collect = processesList.stream().collect(Collectors.toMap(ProcessesBo::getId, Function.identity()));
 
-            List<ProcessesBo> processesList = productInfoService.getProcessesByTechnologyId(technologyId);
-            for (ProcessesBo processesBo : processesList) {
+            TechnologyBo technologyInfo = baseMapper.getTechnologyInfo(technologyId);
+            String processRoute = technologyInfo.getProcessRoute();
+            String[] split = processRoute.split(",");
+
+            for (String processIdStr : split) {
+                long processId = Long.parseLong(processIdStr);
+                ProcessesBo processesBo = collect.get(processId);
+                if (ObjectUtil.isEmpty(processesBo)) {
+                    continue;
+                }
                 QuotationEstimateVo quotationEstimate = new QuotationEstimateVo();
                 quotationEstimate.setProcessesId(processesBo.getId());
                 quotationEstimate.setCode(processesBo.getCode());

hx-sale/src/main/resources/mapper/quotation/QuotationEstimateMapper.xml

@@ -16,4 +16,9 @@
             </foreach>
         </where>
     </select>
+    <select id="getTechnologyInfo" resultType="com.fjhx.item.entity.product.TechnologyBo">
+        SELECT *
+        FROM technology t
+        where t.id = #{id}
+    </select>
 </mapper>