区间评分详情查询，新增or修改，删除

ims-service/ims-eval/src/main/java/com/ims/eval/controller/EvaluationScoringRuleController.java

@@ -1,18 +1,15 @@
 package com.ims.eval.controller;
 
 
+import com.ims.eval.dao.result.CustomException;
 import com.ims.eval.dao.result.R;
-import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.entity.EvaluationScoringRule;
 import com.ims.eval.service.IEvaluationScoringRuleService;
-import com.ims.eval.service.impl.EvaluationScoringRuleServiceImpl;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -47,4 +44,45 @@ public class EvaluationScoringRuleController {
 		return R.ok().data(list);
 	}
 
+	/**
+	 * 添加/修改
+	 *
+	 * @param evaluationScoringRule
+	 * @return
+	 */
+	@PostMapping(value = "/saveOrUpdate")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R saveOrUpdate(@RequestBody EvaluationScoringRule evaluationScoringRule) {
+
+		try {
+			boolean b = iEvaluationScoringRuleService.saveOrUpdate(evaluationScoringRule);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("操作数据库失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@PostMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = iEvaluationScoringRuleService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/controller/IntervalScoringTableController.java

@@ -1,9 +1,16 @@
 package com.ims.eval.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ims.eval.dao.result.CustomException;
+import com.ims.eval.dao.result.R;
+import com.ims.eval.entity.IntervalScoringTable;
+import com.ims.eval.service.IIntervalScoringTableService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +24,60 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//interval-scoring-table")
 public class IntervalScoringTableController {
 
+
+	@Autowired
+	private IIntervalScoringTableService intervalScoringTableService;
+
+
+	/**
+	 * 区间评分详情查询
+	 *
+	 * @param ruleId 考评得分规则id
+	 * @return
+	 */
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "ruleId", required = false) String ruleId){
+		List<IntervalScoringTable> list = intervalScoringTableService.list(ruleId);
+		return R.ok().data(list);
+	}
+
+	/**
+	 * 添加/修改
+	 *
+	 * @param intervalScoringTable
+	 * @return
+	 */
+	@PostMapping(value = "/saveOrUpdate")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R saveOrUpdate(@RequestBody IntervalScoringTable intervalScoringTable) {
+
+		try {
+			boolean b = intervalScoringTableService.saveOrUpdate(intervalScoringTable);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("操作数据库失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@PostMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = intervalScoringTableService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationScoringRule.java

@@ -61,12 +61,6 @@ public class EvaluationScoringRule extends Model {
 	 */
 	private String indicatorUnit;
 
-	/**
-	 * 关联得分区间表
-	 */
-
-	@TableField(exist = false)
-    private List<IntervalScoringTable> intervalScoringTableList;
 
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/IntervalScoringTable.java

@@ -1,5 +1,6 @@
 package com.ims.eval.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.util.Date;
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationScoringRuleService.java

@@ -17,4 +17,5 @@ public interface IEvaluationScoringRuleService extends IService<EvaluationScorin
 
 	List<EvaluationScoringRule> list(String indicatorUnit,String type,String businessPhase);
 
+	boolean saveOrUpdateEvaluationScoringRule(EvaluationScoringRule evaluationScoringRule);
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IIntervalScoringTableService.java

@@ -3,6 +3,8 @@ package com.ims.eval.service;
 import com.ims.eval.entity.IntervalScoringTable;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IIntervalScoringTableService extends IService<IntervalScoringTable> {
 
+	List<IntervalScoringTable> list(String ruleId);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationScoringRuleServiceImpl.java

@@ -48,13 +48,14 @@ public class EvaluationScoringRuleServiceImpl extends ServiceImpl<EvaluationScor
 			qw.lambda().eq(EvaluationScoringRule::getType, type);
 		}
 		List<EvaluationScoringRule> evaluationScoringRules = evaluationScoringRuleMapper.selectList(qw);
-		for (EvaluationScoringRule evaluationScoringRule: evaluationScoringRules){
-			QueryWrapper<IntervalScoringTable> qw1 = new QueryWrapper<>();
-			qw1.eq("rule_id",evaluationScoringRule.getId());
-			List<IntervalScoringTable> intervalScoringTables = intervalScoringTableMapper.selectList(qw1);
-			evaluationScoringRule.setIntervalScoringTableList(intervalScoringTables);
-		}
 		return evaluationScoringRules;
 	}
 
+	@Override
+	public boolean saveOrUpdateEvaluationScoringRule(EvaluationScoringRule evaluationScoringRule) {
+		int result = 0;
+
+		return false;
+	}
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/IntervalScoringTableServiceImpl.java

@@ -1,11 +1,16 @@
 package com.ims.eval.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ims.common.utils.StringUtils;
+import com.ims.eval.entity.EvaluationScoringRule;
 import com.ims.eval.entity.IntervalScoringTable;
 import com.ims.eval.dao.IntervalScoringTableMapper;
 import com.ims.eval.service.IIntervalScoringTableService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +22,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class IntervalScoringTableServiceImpl extends ServiceImpl<IntervalScoringTableMapper, IntervalScoringTable> implements IIntervalScoringTableService {
 
+
+	@Override
+	public List<IntervalScoringTable> list(String ruleId) {
+		QueryWrapper<IntervalScoringTable> qw = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(ruleId)) {
+			qw.lambda().eq(IntervalScoringTable::getRuleId, ruleId);
+		}
+		List<IntervalScoringTable> intervalScoringTables = baseMapper.selectList(qw);
+		return intervalScoringTables;
+	}
 }