From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001 From: 赵文轩 <1652863494@qq.com> Date: 星期三, 12 六月 2024 09:04:56 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis --- ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 49 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 9 deletions(-) diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java index f71e330..4210147 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java @@ -55,6 +55,11 @@ */ public int deleteTjOrderDetailByOrderDetailId(String orderDetailId); + @Delete(" delete\n" + + " from tj_order_detail\n" + + " where order_id = #{orderId}") + int deleteTjOrderDetailByOrderId(String orderId); + /** * 鎵归噺鍒犻櫎浣撴椤圭洰鏄庣粏 * @@ -68,18 +73,14 @@ * 鏌ヨ宸茬即璐归」鐩� */ @Select("SELECT * FROM tj_project p WHERE p.pro_parent_id =0 AND p.pro_id IN (\n" + - " SELECT a.pro_id FROM tj_order_detail a WHERE !ISNULL(flowing_water_id) AND order_id=#{orderId})") + " SELECT a.pro_id FROM tj_order_detail a WHERE !ISNULL(flowing_water_id) AND order_id=#{orderId} and a.deleted=0 )") public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNull(String orderId); - - - - /** * 鏌ヨ鏈即璐归」鐩� */ @Select("SELECT * FROM tj_project p WHERE p.pro_parent_id =0 AND p.pro_id IN (\n" + - " SELECT a.pro_id FROM tj_order_detail a WHERE ISNULL(flowing_water_id) AND order_id=#{orderId})") + " SELECT a.pro_id FROM tj_order_detail a WHERE ISNULL(flowing_water_id) AND order_id=#{orderId} and a.deleted=0 )") public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNull(String orderId); @@ -107,7 +108,7 @@ @Insert("\tINSERT INTO tj_order_detail(\n" + - "\torder_detail_id,\n" + +// "\torder_detail_id,\n" + " order_id,\n" + " pro_id,\n" + " pro_result,\n" + @@ -118,12 +119,28 @@ " create_id,\n" + " pro_type) \n" + " \n" + - " SELECT a.id,#{orderId},a.pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.cus_id=#{cusId} \n" + + " SELECT #{orderId},a.pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.cus_id=#{cusId} \n" + "\t\t\n" + "\tUNION\n" + " \n" + - "\tSELECT DISTINCT a.parent_pro_id,#{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id WHERE a.cus_id=#{cusId}") + "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id WHERE a.cus_id=#{cusId} GROUP BY a.parent_pro_id") boolean saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId); + + + @Insert("INSERT INTO tj_pure_tone_test (\n" + + " tj_num,\n" + + "\tcus_id,\n" + + "\tcus_name,\n" + + "\tpro_id,\n" + + "\tpro_name,\n" + + "\tcreate_by,\n" + + "\tcreate_time,\n" + + "\tcreate_id\n" + + ")\n" + + "SELECT #{tjNum},b.cus_id,b.cus_name,'1633660948860522619','绾煶鍚槇'," + + "#{userName},SYSDATE(),#{userId} FROM tb_transition a LEFT JOIN tj_customer b " + + "ON a.cus_id=b.cus_idcard WHERE a.cus_id=#{cusId} AND a.parent_pro_id IN('1633660948860522619') GROUP BY a.cus_id") + boolean saveTjPureToneTesByCusId(@Param("cusId")String cusId,@Param("tjNum")String tjNum,@Param("userName")String userName,@Param("userId") String userId); @Update("UPDATE tj_order_detail a SET\n" + @@ -133,4 +150,18 @@ "a.update_id=#{userId}\n" + "WHERE a.order_id=#{orderId}") boolean updateTjOrderDetailsByOrderId(@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId,@Param("ls")String ls); + + + @Select("SELECT *\n" + + "FROM `tj_order_detail` \n" + + "where order_id=#{orderId}\n" + + "and pro_id IN\n" + + "(select pro_id from tj_project where pro_parent_id=#{proParentId})") + public List<TjOrderDetail> getDetailByOrderIdAndParId(@Param("orderId")Long orderId,@Param("proParentId")Long proParentId); + + public List<TjOrderDetail> getDetailByOrderIdAndParIds(@Param("orderId")Long orderId,@Param("proParentIds")List<Long> proParentIds); + + @Select("call pro_lis_sqdbgd(1,#{tjnumber,mode=IN})") +// @Select("select * from test_detail") + List<TjOrderDetail> addHuaYanTable(@Param("tjnumber") String tjnumber); } -- Gitblit v1.8.0