Merge remote-tracking branch 'origin/develop_tzs_main' into develop_tzs_main

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
@@ -265,6 +266,7 @@ public class JyjcInspectionApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "报检信息手工推送至kafka", notes = "报检信息手工推送至kafka,预留")
     @GetMapping(value = "/data-push")
+    @Transactional
     public void pushTest(
             @RequestParam("id") Long id) {
         JyjcInspectionApplicationModel model = jyjcInspectionApplicationServiceImpl.queryBySeq(id);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionApplicationPushEventListener.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
@@ -118,7 +119,7 @@ public class InspectionApplicationPushEventListener {
     IdxBizJgFactoryInfoMapper factoryInfoMapper;
 
     @Autowired
-    MaintenanceInfoMapper maintenanceInfoMapper;
+    IdxBizJgMaintenanceRecordInfoMapper maintenanceInfoMapper;
 
     @Autowired
     JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
@@ -249,7 +250,7 @@ public class InspectionApplicationPushEventListener {
             pushDataPipeline.setPipelineClass(applicationModel.getEquCategory());
             pushDataPipeline.setSuperviseOrgName(this.getSuperviseNameByCode(applicationModel.getApplicationUnitCode()));
             IdxBizJgProjectContraption projectContraption = this.setProjectContraptionInfo(applicationModel.getProjectContraptionId(), pushDataPipeline);
-            pushDataPipeline.setInspectionEquips(this.getPipelines(applicationModel,projectContraption));
+            pushDataPipeline.setInspectionEquips(this.getPipelines(applicationModel, projectContraption));
             pushDataPipeline.setTotalLength(calTotalLength(pushDataPipeline.getInspectionEquips()));
             pushDataPipeline.setTraceId(traceId + "");
             pushDataPipeline.setApplicationUnitAddress(applicationUnitAddress);
@@ -362,9 +363,11 @@ public class InspectionApplicationPushEventListener {
     }
 
     private void setMaintenanceInfo(InspectionEquipData equipData, String equipUnicode) {
-        MaintenanceInfo maintenanceInfo = maintenanceInfoMapper.selectOne(new LambdaQueryWrapper<MaintenanceInfo>()
-                .eq(AbstractEquipBaseEntity::getRecord, equipUnicode)
-                .select(MaintenanceInfo::getRecord, MaintenanceInfo::getMeUnitCreditCode, MaintenanceInfo::getMeUnitName));
+        QueryWrapper<IdxBizJgMaintenanceRecordInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord, equipUnicode)
+                .select(IdxBizJgMaintenanceRecordInfo::getRecord,IdxBizJgMaintenanceRecordInfo::getMeUnitCreditCode, IdxBizJgMaintenanceRecordInfo::getMeUnitName)
+                .orderByDesc(IdxBizJgMaintenanceRecordInfo::getRecDate).last("limit 1");
+        IdxBizJgMaintenanceRecordInfo maintenanceInfo = maintenanceInfoMapper.selectOne(queryWrapper);
         if (maintenanceInfo != null) {
             equipData.setMeUnitCreditCode(maintenanceInfo.getMeUnitCreditCode());
             equipData.setMeUnitName(maintenanceInfo.getMeUnitName());