chenshudong 1 місяць тому
батько
коміт
f9c02c7f23

+ 8 - 0
airport-system/src/main/java/com/sundot/airport/system/mapper/BasePerformanceIndicatorMapper.java

@@ -28,6 +28,14 @@ public interface BasePerformanceIndicatorMapper {
28
     public List<BasePerformanceIndicator> selectBasePerformanceIndicatorList(BasePerformanceIndicator basePerformanceIndicator);
28
     public List<BasePerformanceIndicator> selectBasePerformanceIndicatorList(BasePerformanceIndicator basePerformanceIndicator);
29
 
29
 
30
     /**
30
     /**
31
+     * 查询考核指标列表(严格)
32
+     *
33
+     * @param basePerformanceIndicator 考核指标
34
+     * @return 考核指标集合
35
+     */
36
+    public List<BasePerformanceIndicator> selectBasePerformanceIndicatorStrictList(BasePerformanceIndicator basePerformanceIndicator);
37
+
38
+    /**
31
      * 新增考核指标
39
      * 新增考核指标
32
      *
40
      *
33
      * @param basePerformanceIndicator 考核指标
41
      * @param basePerformanceIndicator 考核指标

+ 8 - 0
airport-system/src/main/java/com/sundot/airport/system/service/IBasePerformanceIndicatorService.java

@@ -28,6 +28,14 @@ public interface IBasePerformanceIndicatorService {
28
     public List<BasePerformanceIndicator> selectBasePerformanceIndicatorList(BasePerformanceIndicator basePerformanceIndicator);
28
     public List<BasePerformanceIndicator> selectBasePerformanceIndicatorList(BasePerformanceIndicator basePerformanceIndicator);
29
 
29
 
30
     /**
30
     /**
31
+     * 查询考核指标列表(严格)
32
+     *
33
+     * @param basePerformanceIndicator 考核指标
34
+     * @return 考核指标集合
35
+     */
36
+    public List<BasePerformanceIndicator> selectBasePerformanceIndicatorStrictList(BasePerformanceIndicator basePerformanceIndicator);
37
+
38
+    /**
31
      * 新增考核指标
39
      * 新增考核指标
32
      *
40
      *
33
      * @param basePerformanceIndicator 考核指标
41
      * @param basePerformanceIndicator 考核指标

+ 12 - 1
airport-system/src/main/java/com/sundot/airport/system/service/impl/BasePerformanceIndicatorServiceImpl.java

@@ -63,6 +63,17 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
63
     }
63
     }
64
 
64
 
65
     /**
65
     /**
66
+     * 查询考核指标列表(严格)
67
+     *
68
+     * @param basePerformanceIndicator 考核指标
69
+     * @return 考核指标
70
+     */
71
+    @Override
72
+    public List<BasePerformanceIndicator> selectBasePerformanceIndicatorStrictList(BasePerformanceIndicator basePerformanceIndicator) {
73
+        return basePerformanceIndicatorMapper.selectBasePerformanceIndicatorStrictList(basePerformanceIndicator);
74
+    }
75
+
76
+    /**
66
      * 新增考核指标
77
      * 新增考核指标
67
      *
78
      *
68
      * @param basePerformanceIndicator 考核指标
79
      * @param basePerformanceIndicator 考核指标
@@ -231,7 +242,7 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
231
                 queryParam.setCategoryCodeOne(data.getCategoryCodeOne());
242
                 queryParam.setCategoryCodeOne(data.getCategoryCodeOne());
232
                 queryParam.setCategoryCode(data.getCategoryCode());
243
                 queryParam.setCategoryCode(data.getCategoryCode());
233
                 queryParam.setName(data.getName());
244
                 queryParam.setName(data.getName());
234
-                List<BasePerformanceIndicator> existingList = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorList(queryParam);
245
+                List<BasePerformanceIndicator> existingList = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorStrictList(queryParam);
235
 
246
 
236
                 if (CollUtil.isEmpty(existingList)) {
247
                 if (CollUtil.isEmpty(existingList)) {
237
                     // 新增
248
                     // 新增

+ 12 - 0
airport-system/src/main/resources/mapper/system/BasePerformanceIndicatorMapper.xml

@@ -77,6 +77,18 @@
77
         order by create_time desc
77
         order by create_time desc
78
     </select>
78
     </select>
79
 
79
 
80
+    <select id="selectBasePerformanceIndicatorStrictList" parameterType="BasePerformanceIndicator"
81
+            resultMap="BasePerformanceIndicatorResult">
82
+        <include refid="selectBasePerformanceIndicatorVo"/>
83
+        <where>
84
+            <if test="categoryCodeOne != null  and categoryCodeOne != ''">and category_code_one = #{categoryCodeOne}
85
+            </if>
86
+            <if test="categoryCode != null  and categoryCode != ''">and category_code = #{categoryCode}</if>
87
+            <if test="name != null  and name != ''">and name = #{name}</if>
88
+        </where>
89
+        order by create_time desc
90
+    </select>
91
+
80
     <select id="selectBasePerformanceIndicatorById" parameterType="Long" resultMap="BasePerformanceIndicatorResult">
92
     <select id="selectBasePerformanceIndicatorById" parameterType="Long" resultMap="BasePerformanceIndicatorResult">
81
         <include refid="selectBasePerformanceIndicatorVo"/>
93
         <include refid="selectBasePerformanceIndicatorVo"/>
82
         where id = #{id}
94
         where id = #{id}