问题处理

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderDetailVo.java

@@ -153,4 +153,11 @@ public class ProductionOrderDetailVo extends ProductionOrderDetail {
      * 合同类型
      */
     private Integer contractType;
+
+    private Long contractCompanyId;
+
+    /**
+     * 业务公司名称
+     */
+    private String contractCompanyName;
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderVo.java

@@ -57,4 +57,12 @@ public class ProductionOrderVo extends ProductionOrder {
      */
     private Integer contractType;
 
+
+    private Long contractCompanyId;
+
+    /**
+     * 业务公司名称
+     */
+    private String contractCompanyName;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -206,6 +206,8 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
 
             //赋值生产公司名称
             record.setCompanyName(companyNameMap.get(record.getCompanyId()));
+            record.setCompanyName(companyNameMap.get(record.getContractCompanyId()));
+
         }
 
         //赋值业务员名称

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -185,6 +185,9 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
 
             //赋值生产公司
             record.setCompanyName(sysDeptMap.get(record.getCompanyId()));
+
+            record.setContractCompanyName(sysDeptMap.get(record.getContractCompanyId()));
+
         }
 
         return page;

hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -27,7 +27,8 @@
 			   c.prod_tag,
 			   c.prod_remark,
 			   c.create_user                                                  as saleUserId,
-			   c.contract_type
+			   c.contract_type,
+			   c.company_id                                                   as contractCompanyId
 		FROM production_order_detail pod
 				 LEFT JOIN production_order po ON pod.produce_order_id = po.id
 				 LEFT JOIN contract c ON pod.contract_id = c.id

hx-mes/src/main/resources/mapper/production/ProduceOrderMapper.xml

@@ -18,7 +18,8 @@
 			   po.finish_time,
 			   (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue,
 			   po.confirm_status,
-			   c.contract_type
+			   c.contract_type,
+			   c.company_id                                                   as contractCompanyId
 		from production_order po
 				 LEFT JOIN contract c ON po.contract_id = c.id
 			${ew.customSqlSegment}