补正提醒

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java

@@ -4,8 +4,11 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,6 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.DateUtils;
 import cn.iocoder.yudao.module.inspection.entity.WarnMessage;
 import cn.iocoder.yudao.module.inspection.service.IWarnMessageService;
+import io.prometheus.client.CollectorRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.iocoder.yudao.module.inspection.mapper.InspectionEquInfoMapper;
@@ -30,6 +34,7 @@ public class InspectionEquInfoServiceImpl extends ServiceImpl<InspectionEquInfoM
 {
     @Autowired
     private IWarnMessageService messageService;
+    private CollectorRegistry collectorRegistry;
 
     /**
      * 查询equInfo
@@ -92,14 +97,16 @@ public class InspectionEquInfoServiceImpl extends ServiceImpl<InspectionEquInfoM
      * @return 结果
      */
     @Override
+    @DSTransactional
     public int updateInspectionEquInfo(InspectionEquInfo inspectionEquInfo)
     {
         LambdaQueryWrapper<WarnMessage> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.eq(WarnMessage::getType,"equ").eq(WarnMessage::getObjectId,inspectionEquInfo.getId());
-        WarnMessage one = messageService.getOne(queryWrapper);
-        if (ObjectUtil.isNotEmpty(one)){
+        List<WarnMessage> list = messageService.list(queryWrapper);
+        if (CollUtil.isNotEmpty(list)){
             //更新处理
-            messageService.removeById(one.getId());
+            List<Long> ids = list.stream().map(WarnMessage::getId).collect(Collectors.toList());
+            messageService.removeBatchByIds(ids);
         }
         if (ObjectUtil.isNotEmpty(inspectionEquInfo.getNextCheckTime())){
             //同时处理提醒信息

dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml

@@ -534,6 +534,7 @@ FROM
                CASE
                    WHEN t.status = '已完成' AND t.is_pass = 0 THEN '不合格'
                    WHEN t.status = '已完成' AND t.is_pass = 1 THEN '合格'
+                   WHEN t.status = '已完成' THEN '未知'
                    ELSE ''
                    END AS result,
                t.status
@@ -546,6 +547,7 @@ FROM
                          ELSE '已支付'
                          END                     AS pay,
                      CASE
+                         WHEN oi.pay_type IS NOT NULL THEN '已完成'
                          WHEN has_status_0_or_null THEN '检测中'
                          WHEN (ii.status = 0 OR ii.status = 2) AND has_status_1 THEN '检测中'
                          WHEN (COALESCE(max_iwn_status, 0) = 2 OR ii.status = 1) THEN '已完成'

dl-module-inspection/src/main/resources/mapper/inspection/WarnMessageMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warnMessage.title != null  and warnMessage.title != ''"> and title = #{warnMessage.title}</if>
             <if test="warnMessage.partnerId != null "> and partner_id = #{warnMessage.partnerId}</if>
             <if test="warnMessage.isRead != null  and warnMessage.isRead != ''"> and is_read = #{warnMessage.isRead}</if>
+            and deleted = '0'
         </where>
         order by create_time desc
     </select>