我的订单显示客户联系人

biz-base/src/main/java/com/dayou/controller/MajorController.java

@@ -153,9 +153,9 @@ public class MajorController extends BaseController {
     /**
      * 大中型产品详情
      */
-    @GetMapping("/{id}/{productionNo}")
-    public RestResponse<MajorVO> productionDetail(@PathVariable Long id,@PathVariable("productionNo") String productionNo) throws InterruptedException {
-        MajorVO xMajor =majorService.productionDetail(id,productionNo);
+    @GetMapping("/{id}/{productionNo}/{production}")
+    public RestResponse<MajorVO> productionDetail(@PathVariable Long id,@PathVariable("productionNo") String productionNo,@PathVariable("production") String production) throws InterruptedException {
+        MajorVO xMajor =majorService.productionDetail(id,productionNo,production);
         return RestResponse.data(xMajor);
     }
 }

dao/src/main/java/com/dayou/mapper/MajorMapper.java

@@ -30,5 +30,5 @@ public interface MajorMapper extends CustomBaseMapper<Major> {
 
     List<MajorSubClientDTO> findMajorSubClient();
 
-    MajorVO productionDetail(@Param("id")Long id, @Param("productionNo") String productionNo);
+    MajorVO productionDetail(@Param("id")Long id, @Param("productionNo") String productionNo,@Param("production") String production);
 }

dao/src/main/resources/mapper/MajorMapper.xml

@@ -482,7 +482,7 @@
         FROM
             major m
                 LEFT JOIN user u ON u.id = m.client_manager_id
-                left join (select major_id,report_no, evaluate_acreage,evaluate_amount from major_production where major_id = #{id} and report_no = #{productionNo} and deleted=0) mp on mp.major_id = m.id
+                left join (select major_id,report_no, evaluate_acreage,evaluate_amount from major_production where major_id = #{id} and report_no = #{productionNo} and deleted=0 and production = #{production}) mp on mp.major_id = m.id
                 left join customer_company cc1 on cc1.id = m.clientele_id
                 left join customer_company cc2 on cc2.id = m.clientele_sub_id
                 left join customer_linkman cl1 on cl1.id = m.clientele_contact_id

service/src/main/java/com/dayou/service/IMajorService.java

@@ -40,5 +40,5 @@ public interface IMajorService extends IService<Major> {
 
     List<MajorSubClientDTO> findMajorSubClient();
 
-    MajorVO productionDetail(Long id, String productionNo);
+    MajorVO productionDetail(Long id, String productionNo,String production);
 }

service/src/main/java/com/dayou/service/impl/MajorServiceImpl.java

@@ -209,8 +209,8 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
     }
 
     @Override
-    public MajorVO productionDetail(Long id, String productionNo) {
-        return majorMapper.productionDetail(id,productionNo);
+    public MajorVO productionDetail(Long id, String productionNo,String production) {
+        return majorMapper.productionDetail(id,productionNo,production);
     }
 
 //    /**