Merge remote-tracking branch 'origin/master'

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

@@ -39,8 +39,8 @@ public class ScoreIndicatorController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('score:indicator:list')")
     @GetMapping("/tree")
-    public AjaxResult tree(Long dimensionId) {
-        return AjaxResult.success(service.selectTree(dimensionId));
+    public AjaxResult tree(Long dimensionId, Integer org) {
+        return AjaxResult.success(service.selectTree(dimensionId, org));
     }
 
     @PreAuthorize("@ss.hasPermi('score:indicator:export')")

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/ScoreIndicatorMapper.java

@@ -8,5 +8,5 @@ import java.util.List;
 
 public interface ScoreIndicatorMapper extends BaseMapper<ScoreIndicator> {
     List<ScoreIndicator> selectList(ScoreIndicator query);
-    List<ScoreIndicator> selectByDimensionId(@Param("dimensionId") Long dimensionId);
+    List<ScoreIndicator> selectByDimensionId(@Param("dimensionId") Long dimensionId, @Param("org") Integer org);
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/IScoreIndicatorService.java

@@ -8,5 +8,5 @@ import java.util.List;
 public interface IScoreIndicatorService extends IService<ScoreIndicator> {
     List<ScoreIndicator> selectList(ScoreIndicator query);
     /** 返回指定维度下的指标树（带 children 嵌套） */
-    List<ScoreIndicator> selectTree(Long dimensionId);
+    List<ScoreIndicator> selectTree(Long dimensionId,Integer org);
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/ScoreIndicatorServiceImpl.java

@@ -25,8 +25,8 @@ public class ScoreIndicatorServiceImpl
     }
 
     @Override
-    public List<ScoreIndicator> selectTree(Long dimensionId) {
-        List<ScoreIndicator> all = mapper.selectByDimensionId(dimensionId);
+    public List<ScoreIndicator> selectTree(Long dimensionId,Integer  org) {
+        List<ScoreIndicator> all = mapper.selectByDimensionId(dimensionId,org);
         return buildTree(all, 0L);
     }
 

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

@@ -7,6 +7,9 @@
         <result property="dimensionId"   column="dimension_id"/>
         <result property="dimensionName" column="dimension_name"/>
         <result property="indicatorId"   column="indicator_id"/>
+        <result property="level2Id"      column="level2_id"/>
+        <result property="level3Id"      column="level3_id"/>
+        <result property="level4Id"      column="level4_id"/>
         <result property="level2Name"    column="level2_name"/>
         <result property="level3Name"    column="level3_name"/>
         <result property="level4Name"    column="level4_name"/>
@@ -38,6 +41,7 @@
 
     <sql id="selectVo">
         SELECT id, dimension_id, dimension_name, indicator_id,
+               level2_id, level3_id, level4_id,
                level2_name, level3_name, level4_name,
                event_time, location, person_id, dept_id, team_id, group_id, person_name, dept_name, team_name, group_name,
                score_value, cascade_score, total_score, event_desc,
@@ -60,6 +64,9 @@
         <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>
         <if test="sourceType != null and sourceType != ''">AND source_type = #{sourceType}</if>
+        <if test="level2Id != null">AND level2_id = #{level2Id}</if>
+        <if test="level3Id != null">AND level3_id = #{level3Id}</if>
+        <if test="level4Id != null">AND level4_id = #{level4Id}</if>
         <if test="level2Name != null and level2Name != ''">AND level2_name LIKE CONCAT('%', #{level2Name}, '%')</if>
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
             AND event_time &gt;= #{params.beginTime}

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

@@ -40,10 +40,11 @@
         ORDER BY dimension_id ASC, sort_order ASC, id ASC
     </select>
 
-    <select id="selectByDimensionId" parameterType="java.lang.Long"
+    <select id="selectByDimensionId"
             resultMap="ScoreIndicatorResult">
         <include refid="selectVo"/>
         AND dimension_id = #{dimensionId}
+        And org = #{org}
         ORDER BY sort_order ASC, id ASC
     </select>