Merge remote-tracking branch 'origin/main'

src/main/java/org/energy/modules/leger/mapper/DynamicledgerMapper.xml

@@ -71,6 +71,7 @@
                 l_equipment_ledger aa
                     left join smt_work_permit c
                               on aa.kks_encoding = c.kks_encoding
+                                  and c.check_status = '2'
                                   and c.is_deleted = '0'
         <if test="entity.station != null and entity.station != ''">
             and aa.station = #{entity.station}
@@ -98,6 +99,7 @@
                     left join smt_operation_ticket d
                               on aa.kks_encoding = d.kks_encoding
                                   and d.is_deleted = '0'
+                                  and d.review_status = '2'
         <if test="entity.station != null and entity.station!= ''">
             and aa.station = #{entity.station}
         </if>
@@ -166,6 +168,7 @@
             a.id = b.equipment_ledger_id
           and a.is_deleted = '0'
           and b.is_deleted = '0'
+
           and a.kks_encoding = #{entity.kksEncoding}
     </select>
     <!-- 通用查询映射结果 -->
@@ -206,7 +209,7 @@
     </resultMap>
 
     <select id="getWorkticketListbyKksCd" resultMap="WorkticketResultMap">
-        select  * from smt_work_permit where is_deleted = '0'
+        select  * from smt_work_permit where is_deleted = '0' and check_status = '2'
           and kks_encoding = #{entity.kksEncoding}
     </select>
 
@@ -248,7 +251,7 @@
         <result column="review_status" property="reviewStatus"/>
     </resultMap>
     <select id="getOperationListbyKksCd" resultMap="OperationResultMap">
-        select  * from smt_operation_ticket where is_deleted = '0'
+        select  * from smt_operation_ticket where is_deleted = '0' and review_status = '2'
             and kks_encoding = #{entity.kksEncoding}
     </select>