Merge remote-tracking branch 'origin/master'

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

@@ -75,7 +75,7 @@ public class EvaluationScoringRuleController {
 	@ApiOperation(value = "删除", notes = "删除")
 	public R deleteAll(@PathVariable("ids") String ids) {
 		String[] strings = ids.split(",");
-		boolean b = iEvaluationScoringRuleService.removeByIds(Arrays.asList(strings));
+		boolean b = iEvaluationScoringRuleService.deleteByIds(Arrays.asList(strings));
 		if (b) {
 			return R.ok().data(b);
 		} else {

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

@@ -57,15 +57,15 @@ public class IntervalScoringTableController {
 	public R saveOrUpdate(@RequestBody IntervalScoringTable intervalScoringTable) {
 
 		try {
-			intervalScoringTable.setRange(URLDecoder.decode(intervalScoringTable.getRange(), "UTF-8"));
-			intervalScoringTable.setRegularExpression(URLDecoder.decode(intervalScoringTable.getRegularExpression(),"UTF-8"));
+			intervalScoringTable.setRange(URLDecoder.decode(intervalScoringTable.getRange()));
+			intervalScoringTable.setRegularExpression(URLDecoder.decode(intervalScoringTable.getRegularExpression()));
 			boolean b = intervalScoringTableService.saveOrUpdate(intervalScoringTable);
 			if (b) {
 				return R.ok().data(b);
 			} else {
 				return R.error().data("操作数据库失败！");
 			}
-		} catch (CustomException | UnsupportedEncodingException e){
+		} catch (CustomException e){
 			return R.customError(e.getMessage()).data("失败！");
 		}
 	}

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

@@ -19,4 +19,6 @@ public interface IEvaluationScoringRuleService extends IService<EvaluationScorin
 	IPage<EvaluationScoringRule> list(Integer pageNum, Integer pageSize, String indicatorId);
 
 	boolean saveOrUpdateEvaluationScoringRule(EvaluationScoringRule evaluationScoringRule);
+
+    boolean deleteByIds(List<String> asList);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.StringUtils;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.dao.IndicatorDictionaryMapper;
 import com.ims.eval.dao.IndicatorMapper;
 import com.ims.eval.dao.IntervalScoringTableMapper;
@@ -11,10 +12,12 @@ import com.ims.eval.entity.EvaluationScoringRule;
 import com.ims.eval.dao.EvaluationScoringRuleMapper;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.entity.IntervalScoringTable;
 import com.ims.eval.service.IEvaluationScoringRuleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -102,4 +105,30 @@ public class EvaluationScoringRuleServiceImpl extends ServiceImpl<EvaluationScor
 		return false;
 	}
 
+	@Override
+	@Transactional
+	public boolean deleteByIds(List<String> asList) {
+
+		asList.stream().forEach(r ->{
+			int i = baseMapper.deleteById(r);
+			if (i == 1){
+				QueryWrapper<IntervalScoringTable> qw = new QueryWrapper<>();
+				if (StringUtils.isNotEmpty(r)) {
+					qw.lambda().eq(IntervalScoringTable::getRuleId, r);
+				}
+				List<IntervalScoringTable> intervalScoringTables = intervalScoringTableMapper.selectList(qw);
+				for (IntervalScoringTable intervalScoringTable : intervalScoringTables){
+					int id = intervalScoringTableMapper.deleteById(intervalScoringTable.getId());
+					if (id != 1){
+						throw new CustomException("删除区间评分数据失败！");
+					}
+				}
+			}else {
+				throw new CustomException("删除得分规则公式失败！");
+			}
+		});
+
+		return true;
+	}
+
 }