广电报备列表显示已报备的数据

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysGdController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
 import com.kxs.common.idempotent.annotation.Idempotent;
 import com.kxs.product.api.model.KxsGdReport;
+import com.kxs.product.biz.constant.enums.GdReportEnum;
 import com.kxs.product.biz.service.KxsGdReportService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -40,6 +41,7 @@ public class SysGdController {
     public R page(Page<KxsGdReport> page, KxsGdReport param) {
         return R.ok(kxsGdReportService.page(page,
                 Wrappers.<KxsGdReport>lambdaQuery().eq(StrUtil.isNotBlank(param.getGdSn()),KxsGdReport::getGdSn, param.getGdSn())
+                        .eq(KxsGdReport::getStatus, GdReportEnum.REPORT)
                         .eq(StrUtil.isNotBlank(param.getGdMobile()),KxsGdReport::getGdMobile, param.getGdMobile())
                         .eq(StrUtil.isNotBlank(param.getUserCode()),KxsGdReport::getUserCode, param.getUserCode())
                         .eq(param.getIsCheck() != null, KxsGdReport::getIsCheck, param.getIsCheck())

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdReportServiceImpl.java

@@ -115,6 +115,10 @@ public class KxsGdReportServiceImpl extends ServiceImpl<KxsGdReportMapper, KxsGd
         if(report != null){
             throw new GlobalCustomerException("该工单sn已报备");
         }
+        KxsGdReport reportMobile = this.getOne(Wrappers.<KxsGdReport>lambdaQuery().eq(KxsGdReport::getGdMobile, param.getGdMobile()));
+        if(reportMobile != null){
+            throw new GlobalCustomerException("该工单广电手机号码已报备");
+        }
 
 
         kxsGdReport.setStatus(GdReportEnum.REPORT.getType());

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdServiceImpl.java

@@ -61,13 +61,14 @@ public class KxsGdServiceImpl implements KxsGdService {
                                 .eq(KxsGdReport::getGdSn, gdQueryOrder.getIccId())
                                 .eq(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
                         if (kxsGdReport != null) {
-                            kxsGdReportMapper.update(null, Wrappers.<KxsGdReport>lambdaUpdate().eq(KxsGdReport::getId, kxsGdReport.getId())
-                                    .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
-                                    .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
                             //发送广电激活MQ消息
                             RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();
                             BeanUtil.copyProperties(gdQueryOrder, msgEntity);
                             mqSender.send(RabbitGdActQueueMQ.build(msgEntity));
+
+                            kxsGdReportMapper.update(null, Wrappers.<KxsGdReport>lambdaUpdate().eq(KxsGdReport::getId, kxsGdReport.getId())
+                                    .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
+                                    .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
                             log.info("发送广电激活数据{}", kxsGdReport.getGdSn()
                                     + "," + kxsGdReport.getGdMobile());
                         }