From 5541a91af47fa71fd784ca0f95275a65081aab0d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 28 十月 2024 10:15:23 +0800
Subject: [PATCH] 调整自动排版纵向间距80->90

---
 modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index d14dfec..e1d3552 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -65,7 +65,7 @@
                ''                           as statusImg,
                d.dict_code                  as productType,
                p.repairable                 as isRepair,
-               p.task_mtbcf_accept          as taskMtbcf,
+               p.task_mtbcf_regulate        as taskMtbcf,
                p.task_mtbcf_other_params2   as taskMtbcfOtherParams2,
                p.task_mtbcf_other_params3   as taskMtbcfOtherParams3,
                p.reliab_distrib_type        as reliabDistribType,
@@ -73,7 +73,8 @@
                p.repair_mttcr               as repairMttcr,
                p.repair_mttcr_other_params2 as repairMttcrOtherParams2,
                p.repair_mttcr_other_params3 as repairMttcrOtherParams3,
-               p.task_mtbcf_regul_succ_rate as success_rate
+               p.task_mtbcf_regul_succ_rate as success_rate,
+               p.basic_unit_num             as basicUnitNum
         FROM product_model a
                  left join sys_dict_data d on d.DICT_VALUE = a.product_type and dict_type_id = '1728965873022050306'
                  left join param_data p on p.product_id = a.id
@@ -151,6 +152,54 @@
     <select id="getByPid" resultType="java.lang.Long">
         select id
         from product_model
-        where IS_DELETE=0 and PID=${id}
+        where IS_DELETE = 0
+          and PID = ${id}
+    </select>
+    <select id="getProductByShip" resultType="com.zt.life.modules.mainPart.basicInfo.dto.ProductDto">
+        select a.id,
+               a.pid,
+               a.name,
+               a.product_type,
+               a.name_path,
+               b.basic_unit_num as sameSbNum,
+               a.equip_type,
+               b.reliab_distrib_type,
+               b.basic_join_compute,
+               b.basic_mtbf_regulate,
+               b.basic_mtbf_regul_succ_rate,
+               b.basic_mtbf_operating_ratio,
+               b.task_mtbcf_regulate,
+               b.task_mtbcf_other_params2,
+               b.task_mtbcf_other_params3,
+               b.task_mtbcf_regul_succ_rate,
+               b.task_mtbcf_operating_ratio,
+               b.repairable,
+               b.repair_distrib_type,
+               b.repair_mttcr,
+               b.repair_mttcr_other_params2,
+               b.repair_mttcr_other_params3
+        from product_model a,
+             param_data b
+        where a.IS_DELETE = 0
+          and b.IS_DELETE = 0
+          and a.ship_id = ${shipId}
+          AND a.id &lt;&gt; a.ship_id
+          and a.id = b.product_id
+    </select>
+    <select id="getProductListByShip" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+        select a.*, b.basic_unit_num as sameSbNum
+        from product_model a,
+             param_data b
+        where a.IS_DELETE = 0 and b.IS_DELETE = 0
+          and a.id = b.product_id
+        <if test="productId !=null">
+            and a.ship_id = #{productId}
+        </if>
+        <if test="level1 !=null">
+            and a.product_type &gt;= #{level1}
+        </if>
+        <if test="level2 !=null">
+            and a.product_type &lt;= #{level2}
+        </if>
     </select>
 </mapper>

--
Gitblit v1.9.1