airport-admin/src/main/java/com/sundot/airport/web/controller/score/ScoreEventController.java

@@ -16,6 +16,8 @@ import com.sundot.airport.ledger.domain.ScoreIndicator;
 import com.sundot.airport.ledger.mapper.ScoreIndicatorMapper;
 import com.sundot.airport.ledger.service.IScoreEventService;
 import com.sundot.airport.ledger.service.IScoreIndicatorService;
+import com.sundot.airport.system.domain.BasePosition;
+import com.sundot.airport.system.service.IBasePositionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -41,6 +43,9 @@ public class ScoreEventController extends BaseController {
     @Autowired
     private IScoreIndicatorService indicatorService;
 
+    @Autowired
+    private IBasePositionService basePositionService;
+
     @PreAuthorize("@ss.hasPermi('score:event:list')")
     @GetMapping("/list")
     public TableDataInfo list(ScoreEvent query) {
@@ -152,6 +157,16 @@ public class ScoreEventController extends BaseController {
                 entity.setLevel4Id(level4Id);
             }
         }
+
+        // 通过区域查找航站楼
+        BasePosition terminl = findTerminlByRegionalId(entity.getRegionalId());
+        if (terminl != null) {
+            entity.setTerminlId(terminl.getId());
+            entity.setTerminlName(terminl.getName());
+        } else {
+            entity.setTerminlId(null);
+            entity.setTerminlName(null);
+        }
     }
 
     /**
@@ -166,4 +181,18 @@ public class ScoreEventController extends BaseController {
         ScoreIndicator indicator = indicatorService.getOne(wrapper);
         return indicator != null ? indicator.getId() : null;
     }
+
+    /**
+     * 通过区域查找航站楼
+     */
+    private BasePosition findTerminlByRegionalId(Long regionalId) {
+        if (regionalId == null) {
+            return null;
+        }
+        BasePosition regional = basePositionService.selectBasePositionById(regionalId);
+        if (regional == null) {
+            return null;
+        }
+        return basePositionService.selectBasePositionById(regional.getParentId());
+    }
 }

airport-ledger/src/main/resources/mapper/ledger/ScoreEventMapper.xml

@@ -81,7 +81,7 @@
         <if test="channelName != null and channelName != ''">AND channel_name LIKE CONCAT('%', #{channelName}, '%')</if>
         <if test="postId != null">AND post_id = #{postId}</if>
         <if test="postName != null and postName != ''">AND post_name LIKE CONCAT('%', #{postName}, '%')</if>
-        <if test="scoreType != null and scoreType != ''">AND score_type = #{scoreType}</if>
+        <if test="scoreType != null and scoreType != '' and scoreType != '0'">AND score_type = #{scoreType}</if>
         <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</if>
         <if test="deptName != null and deptName != ''">AND dept_name LIKE CONCAT('%', #{deptName}, '%')</if>
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</if>