添加得分规则表

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -57,5 +58,25 @@ public class DataDictionaryController {
 	}
 
 
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary:remove")
+	@DeleteMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = dataDictionaryService.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/EvaluationScoringRuleController.java

@@ -0,0 +1,20 @@
+package com.ims.eval.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 考评得分规则表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+@RestController
+@RequestMapping("//evaluation-scoring-rule")
+public class EvaluationScoringRuleController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.ims.eval.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+@RestController
+@RequestMapping("//interval-scoring-table")
+public class IntervalScoringTableController {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationScoringRuleMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluationScoringRule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考评得分规则表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+public interface EvaluationScoringRuleMapper extends BaseMapper<EvaluationScoringRule> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/IntervalScoringTableMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.IntervalScoringTable;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+public interface IntervalScoringTableMapper extends BaseMapper<IntervalScoringTable> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 考评得分规则表
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationScoringRule extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 指标项ID
+     */
+    private String indicatorId;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 部门ID
+     */
+    private String departid;
+
+    /**
+     * 描述
+     */
+    private String describe;
+
+    /**
+     * 划分区间
+     */
+    private String parttitionInterval;
+
+
+}

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

@@ -35,7 +35,7 @@ public class Indicator extends Model {
     /**
      * 指标编码
      */
-    private String indicatorCede;
+    private String indicatorCode;
 
     /**
      * 指标单位

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

@@ -0,0 +1,74 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class IntervalScoringTable extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 考评得分规则表id
+     */
+    private String ruleId;
+
+    /**
+     * 区间范围
+     */
+    private String range;
+
+    /**
+     * 规则描述
+     */
+    private String ruleDescription;
+
+    /**
+     * 规则表达式
+     */
+    private String regularExpression;
+
+    /**
+     * 是否启用
+     */
+    private String enabled;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.EvaluationScoringRule;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 考评得分规则表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+public interface IEvaluationScoringRuleService extends IService<EvaluationScoringRule> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.IntervalScoringTable;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+public interface IIntervalScoringTableService extends IService<IntervalScoringTable> {
+
+}

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

@@ -50,13 +50,13 @@ public class DataDictionaryServiceImpl extends ServiceImpl<DataDictionaryMapper,
 	@Override
 	public boolean saveOrUpdate(DataDictionary entity) {
 
-		if (null != entity &&  (null == entity.getId() || "".equals(entity.getId().trim()))){
-			QueryWrapper<DataDictionary> qw = new QueryWrapper<>();
-			qw.lambda().eq(DataDictionary::getDataKey, entity.getDataKey());
-			List<DataDictionary> list = baseMapper.selectList(qw);
-			if (null !=list && list.size()>0){
-				throw  new RuntimeException("当前字典key已存在");
-			}
+		//业务判断
+		QueryWrapper<DataDictionary> qw = new QueryWrapper<>();
+		qw.lambda().eq(DataDictionary::getDataKey, entity.getDataKey());
+		qw.lambda().eq(DataDictionary::getSuperKey, entity.getSuperKey());
+		List<DataDictionary> list = baseMapper.selectList(qw);
+		if (null != list && list.size() > 0) {
+			throw new RuntimeException("当前字典key已存在");
 		}
 		return super.saveOrUpdate(entity);
 	}

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

@@ -0,0 +1,20 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.entity.EvaluationScoringRule;
+import com.ims.eval.dao.EvaluationScoringRuleMapper;
+import com.ims.eval.service.IEvaluationScoringRuleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 考评得分规则表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+@Service
+public class EvaluationScoringRuleServiceImpl extends ServiceImpl<EvaluationScoringRuleMapper, EvaluationScoringRule> implements IEvaluationScoringRuleService {
+
+}

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

@@ -51,6 +51,7 @@ public class IndicatorDictionaryServiceImpl extends ServiceImpl<IndicatorDiction
 
 		if (null != entity &&  (null == entity.getId() || "".equals(entity.getId().trim()))){
 			QueryWrapper<IndicatorDictionary> qw = new QueryWrapper<>();
+			qw.lambda().eq(IndicatorDictionary::getIndicatorId, entity.getIndicatorId());
 			qw.lambda().eq(IndicatorDictionary::getOptionCode, entity.getOptionCode());
 			List<IndicatorDictionary> list = baseMapper.selectList(qw);
 			if (null !=list && list.size()>0){

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

@@ -39,7 +39,7 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 		}
 
 		if (StringUtils.isNotEmpty(indicatorCede)) {
-			qw.lambda().like(Indicator::getIndicatorCede, indicatorCede);
+			qw.lambda().like(Indicator::getIndicatorCode, indicatorCede);
 		}
 
 		if (StringUtils.isNotEmpty(binSection)) {
@@ -71,7 +71,9 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 
 		if (null != entity &&  (null == entity.getId() || "".equals(entity.getId().trim()))){
 			QueryWrapper<Indicator> qw = new QueryWrapper<>();
-			qw.lambda().eq(Indicator::getIndicatorCede, entity.getIndicatorCede());
+			qw.lambda().eq(Indicator::getIndicatorCode, entity.getIndicatorCode());
+			qw.lambda().eq(Indicator::getBinSection, entity.getBinSection());
+			qw.lambda().eq(Indicator::getBinStage, entity.getBinStage());
 			List<Indicator> list = baseMapper.selectList(qw);
 			if (null !=list && list.size()>0){
 				throw  new RuntimeException("当前指标code已存在");

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

@@ -0,0 +1,20 @@
+package com.ims.eval.service.impl;
+
+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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+@Service
+public class IntervalScoringTableServiceImpl extends ServiceImpl<IntervalScoringTableMapper, IntervalScoringTable> implements IIntervalScoringTableService {
+
+}