修改规则判断同名的方法

src/main/java/com/keymobile/indicators/api/hytobacco/TaskRuleCtrl.java

@@ -74,7 +74,7 @@ public class TaskRuleCtrl {
     @PostMapping("save")
     public Result save(@RequestBody TaskRule rule) {
         Result result = null;
-        TaskRule temp = taskRuleService.findRuleByName(rule.getRuleType(), rule.getName());
+        TaskRule temp = taskRuleService.findRuleByName(rule.getRuleLevel(), rule.getName());
         if (temp != null && !temp.getId().equals(rule.getId())) {
             result = Result.genFailedResult("已经存在同名任务规则定义!");
         } else {

src/main/java/com/keymobile/indicators/model/mapper/indicators/TaskRuleMapper.java

@@ -25,11 +25,11 @@ public interface TaskRuleMapper extends BaseMapper<TaskRule> {
 
     /**
      * 根据类型和名字获取任务规则
-     * @param ruleType
+     * @param ruleLevel
      * @param name
      * @return
      */
-    TaskRule findRuleByName(@Param("ruleType") Integer ruleType, @Param("name") String name);
+    TaskRule findRuleByName(@Param("ruleLevel") String ruleLevel, @Param("name") String name);
 
     /**
      * 分页查询填报任务规则

src/main/java/com/keymobile/indicators/service/dataenter/TaskRuleService.java

@@ -27,10 +27,11 @@ public interface TaskRuleService {
 
     /**
      * 根据名字获取规则
+     * @param ruleLevel
      * @param name
      * @return
      */
-    TaskRule findRuleByName(Integer ruleType, String name);
+    TaskRule findRuleByName(String ruleLevel, String name);
 
     /**
      * 创建规则

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskRuleServiceImpl.java

@@ -50,8 +50,8 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     }
 
     @Override
-    public TaskRule findRuleByName(Integer ruleType, String name) {
-        return taskRuleMapper.findRuleByName(ruleType, name);
+    public TaskRule findRuleByName(String ruleLevel, String name) {
+        return taskRuleMapper.findRuleByName(ruleLevel, name);
     }
 
     @Override

src/main/resources/mybatis/mapping/TaskRuleMapper.xml

@@ -19,7 +19,7 @@
 		select  *
 		from data_enter_task_rule
 		where state = 1
-		and rule_type = #{ruleType}
+		and rule_level = #{ruleLevel}
 		and name = #{name}
 		limit 1
 	</select>