代码提交

ims-service/ims-eval/pom.xml

@@ -50,6 +50,12 @@
             <artifactId>apm-toolkit-logback-1.x</artifactId>
             <version>8.5.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.ims.as</groupId>
+            <artifactId>sm-test</artifactId>
+            <version>2.5.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

ims-service/ims-eval/src/main/java/com/ims/eval/dao/result/CustomException.java

@@ -1,4 +1,4 @@
-package com.ims.eval.dao.result;
+package com.ims.eval.config;
 
 import org.springframework.stereotype.Component;
 

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

@@ -2,8 +2,8 @@ package com.ims.eval.controller;
 
 
 import com.ims.eval.cache.CacheContext;
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.dao.result.R;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.service.IDataDictionaryService;
 import io.swagger.annotations.ApiOperation;

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

@@ -2,14 +2,11 @@ package com.ims.eval.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.dao.result.R;
-import com.ims.eval.entity.DataDictionary;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.EvaluateRule;
-import com.ims.eval.entity.Indicator;
 import com.ims.eval.service.IEvaluateRuleService;
 import io.swagger.annotations.ApiOperation;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,8 +1,8 @@
 package com.ims.eval.controller;
 
 
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.dao.result.R;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.EvaluateRuleInfo;
 import com.ims.eval.service.IEvaluateRuleInfoService;
 import io.swagger.annotations.ApiOperation;

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

@@ -0,0 +1,64 @@
+package com.ims.eval.controller;
+
+
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.entity.EvaluationDept;
+import com.ims.eval.service.IEvaluationDeptService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 考评部门 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+@RestController
+@RequestMapping("//evaluation-dept")
+public class EvaluationDeptController {
+
+	@Autowired
+	private IEvaluationDeptService evaluationDeptService;
+
+
+	//@ImsPreAuth("eval:evaluationDept:view")
+	@GetMapping(value = "listAll")
+	public R listAll(
+		@RequestParam(value = "id", required = false) String id,
+		@RequestParam(value = "enable", required = false) boolean enable) {
+		List<EvaluationDept> list = evaluationDeptService.listAll(id, enable);
+		return R.ok().data(list);
+	}
+
+
+	/**
+	 * 添加
+	 *
+	 * @param dept
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:dataDictionary:edit")
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody List<EvaluationDept> dept) {
+
+		try {
+			boolean b = evaluationDeptService.saveBatch(dept);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+}

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

@@ -0,0 +1,63 @@
+package com.ims.eval.controller;
+
+
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.entity.EvaluationPersonnel;
+import com.ims.eval.service.IEvaluationPersonnelService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 考评人员 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+@RestController
+@RequestMapping("//evaluation-personnel")
+public class EvaluationPersonnelController {
+
+	@Autowired
+	private IEvaluationPersonnelService evaluationPersonnelService;
+
+
+	//@ImsPreAuth("eval:evaluationPersonnel:view")
+	@GetMapping(value = "listAll")
+	public R listAll(
+		@RequestParam(value = "id", required = false) String id,
+		@RequestParam(value = "enable", required = false) boolean enable) {
+		List<EvaluationPersonnel> list = evaluationPersonnelService.listAll(id, enable);
+		return R.ok().data(list);
+	}
+
+	/**
+	 * 添加
+	 *
+	 * @param personnels
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:dataDictionary:edit")
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody List<EvaluationPersonnel> personnels) {
+
+		try {
+			boolean b = evaluationPersonnelService.saveBatch(personnels);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+}

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

@@ -2,8 +2,8 @@ package com.ims.eval.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.dao.result.R;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.EvaluationScoringRule;
 import com.ims.eval.service.IEvaluationScoringRuleService;
 import io.swagger.annotations.ApiOperation;
@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * <p>

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

@@ -0,0 +1,66 @@
+package com.ims.eval.controller;
+
+
+
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.entity.EvaluationUnit;
+import com.ims.eval.service.IEvaluationUnitService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 考评单位 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+@RestController
+@RequestMapping("//evaluation-unit")
+public class EvaluationUnitController {
+
+	@Autowired
+	private IEvaluationUnitService evaluationUnitService;
+
+
+	//@ImsPreAuth("eval:evaluationUnit:view")
+	@GetMapping(value = "listAll")
+	public R listAll(
+		@RequestParam(value = "id", required = false) String id,
+		@RequestParam(value = "enable", required = false) boolean enable) {
+		List<EvaluationUnit> list = evaluationUnitService.listAll(id, enable);
+		return R.ok().data(list);
+	}
+
+
+	/**
+	 * 添加
+	 *
+	 * @param units
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:evaluationUnit:edit")
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody List<EvaluationUnit> units) {
+
+		try {
+			boolean b = evaluationUnitService.saveBatch(units);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+}

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

@@ -2,8 +2,8 @@ package com.ims.eval.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.dao.result.R;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.IndicatorDictionary;
 import com.ims.eval.service.IIndicatorService;

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

@@ -1,9 +1,8 @@
 package com.ims.eval.controller;
 
 
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.dao.result.R;
-import com.ims.eval.entity.Indicator;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.IndicatorDictionary;
 import com.ims.eval.service.IIndicatorDictionaryService;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,9 +1,10 @@
 package com.ims.eval.controller;
 
 
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.dao.result.R;
+
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.IntervalScoringTable;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IIntervalScoringTableService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -2,11 +2,10 @@ package com.ims.eval.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.dao.result.R;
-import com.ims.eval.entity.Indicator;
+
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.OrganizationEvaluationRule;
-import com.ims.eval.service.IIndicatorService;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IOrganizationEvaluationRuleService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
 package com.ims.eval.controller;
 
 
-import com.ims.eval.dao.result.R;
-import com.ims.eval.entity.EvaluateRuleInfo;
-import com.ims.eval.entity.OrganizationEvaluationRule;
+
+
 import com.ims.eval.entity.OrganizationStructure;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IOrganizationStructureService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -2,11 +2,10 @@ package com.ims.eval.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.dao.result.R;
-import com.ims.eval.entity.OrganizationEvaluationRule;
+
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.PersonnelEvaluationRule;
-import com.ims.eval.service.IOrganizationEvaluationRuleService;
 import com.ims.eval.service.IPersonnelEvaluationRuleService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,9 +1,8 @@
 package com.ims.eval.controller;
 
 
-import com.ims.eval.dao.result.R;
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.Myuser;
-import com.ims.eval.entity.OrganizationEvaluationRule;
 import com.ims.eval.service.IUserService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluationDept;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考评部门 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+public interface EvaluationDeptMapper extends BaseMapper<EvaluationDept> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluationPersonnel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考评人员 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+public interface EvaluationPersonnelMapper extends BaseMapper<EvaluationPersonnel> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluationUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考评单位 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+public interface EvaluationUnitMapper extends BaseMapper<EvaluationUnit> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/result/ResultInfo.java

@@ -1,87 +0,0 @@
-package com.ims.eval.dao.result;
-
-import lombok.Data;
-
-/**
- *@ClassName ResultInfo
- *@Description 返回结果类统一封装
- *@Author 谢生杰
- *@Date 2020/9/25 18:53
- *@Version 1.0
- **/
-@Data
-public class ResultInfo {
-    // 状态码
-    private Integer code;
-    // 消息
-    private String message;
-    // 数据对象
-    private Object result;
-
-    private Integer total;
-
-    /**
-     * 无参构造器
-     */
-    public ResultInfo() {
-        super();
-    }
-
-    public ResultInfo(Status status) {
-        super();
-        this.code = status.code;
-        this.message = status.message;
-    }
-
-    public ResultInfo result(Object result) {
-        this.result = result;
-        return this;
-    }
-
-    public ResultInfo message(String message) {
-        this.message = message;
-        return this;
-    }
-    public ResultInfo total(Integer total) {
-        this.total = total;
-        return this;
-    }
-
-    /**
-     * 只返回状态，状态码，消息
-     *
-     * @param code
-     * @param message
-     */
-    public ResultInfo(Integer code, String message) {
-        super();
-        this.code = code;
-        this.message = message;
-    }
-
-    /**
-     * 只返回状态，状态码，数据对象
-     *
-     * @param code
-     * @param result
-     */
-    public ResultInfo(Integer code, Object result) {
-        super();
-        this.code = code;
-        this.result = result;
-    }
-
-    /**
-     * 返回全部信息即状态，状态码，消息，数据对象
-     *
-     * @param code
-     * @param message
-     * @param result
-     */
-    public ResultInfo(Integer code, String message, Object result) {
-        super();
-        this.code = code;
-        this.message = message;
-        this.result = result;
-    }
-}

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

@@ -0,0 +1,83 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 考评部门
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationDept extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 公司编码
+     */
+    private String companyId;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 公司简称
+     */
+    private String shortCompanyName;
+
+    /**
+     * 部门编码
+     */
+    private String deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 部门简称
+     */
+    private String shortDeptName;
+
+    /**
+     * 是否考核
+     */
+    private Boolean enable;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+
+}

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

@@ -0,0 +1,83 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 考评人员
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationPersonnel extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 公司编码
+     */
+    private String companyId;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 公司简称
+     */
+    private String shortCompanyName;
+
+    /**
+     * 部门编码
+     */
+    private String deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 部门简称
+     */
+    private String shortDeptName;
+
+    /**
+     * 是否考核
+     */
+    private Boolean enable;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+
+}

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

@@ -0,0 +1,68 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 考评单位
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationUnit extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 公司编码
+     */
+    private String companyId;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 公司简称
+     */
+    private String shortCompanyName;
+
+    /**
+     * 是否考核
+     */
+    private Boolean enable;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/OrganizationEvaluationRuleDTO.java

@@ -0,0 +1,25 @@
+package com.ims.eval.entity.dto.request;
+
+import com.ims.eval.entity.EvaluationDept;
+import com.ims.eval.entity.EvaluationUnit;
+import com.ims.eval.entity.OrganizationEvaluationRule;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@ApiModel(value="单位/部门考评配置请求类", description="单位/部门考评配置请求类")
+public class OrganizationEvaluationRuleDTO extends OrganizationEvaluationRule {
+
+	private static final long serialVersionUID = 1L;
+
+
+	@ApiModelProperty(value = "考评部门", required=true)
+	private List<EvaluationDept> evaluationDepts;
+
+	@ApiModelProperty(value = "考评单位", required=true)
+	private List<EvaluationUnit> evaluationUnits;
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/PersonnelEvaluationRuleDTO.java

@@ -0,0 +1,23 @@
+package com.ims.eval.entity.dto.request;
+
+import com.ims.eval.entity.EvaluationPersonnel;
+import com.ims.eval.entity.PersonnelEvaluationRule;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@ApiModel(value="人员考评配置请求类", description="人员考评配置请求类")
+public class PersonnelEvaluationRuleDTO extends PersonnelEvaluationRule {
+
+
+	private static final long serialVersionUID = 1L;
+
+
+	@ApiModelProperty(value = "考评部门", required=true)
+	private List<EvaluationPersonnel> evaluationPersonnels;
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/result/R.java

@@ -1,4 +1,4 @@
-package com.ims.eval.dao.result;
+package com.ims.eval.entity.dto.result;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ims-service/ims-eval/src/main/java/com/ims/eval/dao/result/ResultCode.java

@@ -1,4 +1,4 @@
-package com.ims.eval.dao.result;
+package com.ims.eval.entity.dto.result;
 
 /**
  * @ClassName : ResultCode

ims-service/ims-eval/src/main/java/com/ims/eval/entity/result/ResultInfo.java

@@ -1,4 +1,4 @@
-package com.ims.eval.entity.result;
+package com.ims.eval.entity.dto.result;
 
 import lombok.Data;
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/result/Status.java

@@ -1,4 +1,4 @@
-package com.ims.eval.dao.result;
+package com.ims.eval.entity.dto.result;
 /**
  *@ClassName Status
  *@Description 枚举类对象

ims-service/ims-eval/src/main/java/com/ims/eval/entity/result/R.java

@@ -1,71 +0,0 @@
-package com.ims.eval.entity.result;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @ClassName : R
- * @Author : xieshengjie
- * @Date: 2021/5/16 16:59
- * @Description : 结果集
- */
-@Data
-public class R {
-    @ApiModelProperty(value = "是否成功")
-    private Boolean success;
-    @ApiModelProperty(value = "返回码")
-    private Integer code;
-    @ApiModelProperty(value = "返回消息")
-    private String message;
-    @ApiModelProperty(value = "总数量")
-    private Integer count;
-    @ApiModelProperty(value = "返回数据")
-    private Object data = new Object();
-    private R(){}
-    public static R ok(){
-        R r = new R();
-        r.setSuccess(true);
-        r.setCode(ResultCode.SUCCESS);
-        r.setMessage("成功");
-        return r;
-    }
-    public static R ok(Integer count){
-        R r = new R();
-        r.setSuccess(true);
-        r.setCode(ResultCode.SUCCESS);
-        r.setMessage("成功");
-        r.setCount(count);
-        return r;
-    }
-    public static R error(){
-        R r = new R();
-        r.setSuccess(false);
-        r.setCode(ResultCode.ERROR);
-        r.setMessage("失败");
-        return r;
-    }
-    public R success(Boolean success){
-        this.setSuccess(success);
-        return this;
-    }
-    public R message(String message){
-        this.setMessage(message);
-        return this;
-    }
-    public R code(Integer code){
-        this.setCode(code);
-        return this;
-    }
-//    public R data(String key, Object value){
-//        this.data.put(key, value);
-//        return this;
-//    }
-//    public R data(Map<String, Object> map){
-//        this.setData(map);
-//        return this;
-//    }
-    public R data(Object value){
-        this.setData(value);
-        return this;
-    }
-}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/result/ResultCode.java

@@ -1,12 +0,0 @@
-package com.ims.eval.entity.result;
-
-/**
- * @ClassName : ResultCode
- * @Author : xieshengjie
- * @Date: 2021/5/16 17:01
- * @Description : 结果状态
- */
-public class ResultCode {
-    public static Integer SUCCESS = 200;
-    public static Integer ERROR = 500;
-}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/result/Status.java

@@ -1,42 +0,0 @@
-package com.ims.eval.entity.result;
-/**
- *@ClassName Status
- *@Description 枚举类对象
- *@Author 谢生杰
- *@Date 2020/9/25 18:54
- *@Version 1.0
- **/
-public enum Status {
-    // 公共
-    SUCCESS(2000, "成功"),
-    UNKNOWN_ERROR(9998,"未知异常"),
-    SYSTEM_ERROR(9999, "系统异常"),
-
-
-    INSUFFICIENT_PERMISSION(4003, "权限不足"),
-
-    WARN(9000, "失败"),
-    REQUEST_PARAMETER_ERROR(1002, "请求参数错误"),
-
-
-
-    // 登录
-    LOGIN_EXPIRE(2001, "未登录或者登录失效"),
-    LOGIN_CODE_ERROR(2002, "登录验证码错误"),
-    LOGIN_ERROR(2003, "用户名不存在或密码错误"),
-    LOGIN_USER_STATUS_ERROR(2004, "用户状态不正确"),
-    LOGOUT_ERROR(2005, "退出失败，token不存在"),
-    LOGIN_USER_NOT_EXIST(2006, "该用户不存在"),
-    LOGIN_USER_EXIST(2007, "该用户已存在");
-
-
-
-
-    public int code;
-    public String message;
-
-    Status(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-}

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

@@ -0,0 +1,21 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.EvaluationDept;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 考评部门 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+public interface IEvaluationDeptService extends IService<EvaluationDept> {
+
+	List<EvaluationDept> listAll(String  id, boolean enable);
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.EvaluationPersonnel;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 考评人员 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+public interface IEvaluationPersonnelService extends IService<EvaluationPersonnel> {
+
+	List<EvaluationPersonnel> listAll(String id, boolean enable);
+
+}

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

@@ -0,0 +1,20 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.EvaluationUnit;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 考评单位 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+public interface IEvaluationUnitService extends IService<EvaluationUnit> {
+
+	List<EvaluationUnit> listAll(String id, boolean enable);
+
+}

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

@@ -1,14 +1,11 @@
 package com.ims.eval.service.impl;
 
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.DataDictionaryMapper;
-import com.ims.eval.dao.result.CustomException;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.DataDictionary;
-import com.ims.eval.entity.Indicator;
 import com.ims.eval.service.IDataDictionaryService;
 import org.springframework.stereotype.Service;
 

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

@@ -1,16 +1,12 @@
 package com.ims.eval.service.impl;
 
 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.dao.result.CustomException;
-import com.ims.eval.entity.EvaluateRule;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.EvaluateRuleInfo;
 import com.ims.eval.dao.EvaluateRuleInfoMapper;
 import com.ims.eval.service.IEvaluateRuleInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

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

@@ -5,7 +5,7 @@ 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.cache.CacheContext;
-import com.ims.eval.dao.result.CustomException;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.EvaluateRule;
 import com.ims.eval.dao.EvaluateRuleMapper;
 import com.ims.eval.service.IEvaluateRuleService;

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

@@ -0,0 +1,62 @@
+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.EvaluationDept;
+import com.ims.eval.dao.EvaluationDeptMapper;
+import com.ims.eval.service.IEvaluationDeptService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * <p>
+ * 考评部门 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+@Service
+public class EvaluationDeptServiceImpl extends ServiceImpl<EvaluationDeptMapper, EvaluationDept> implements IEvaluationDeptService {
+
+
+	@Transactional
+	@Override
+	public boolean saveOrUpdate(EvaluationDept entity) {
+		boolean b = false;
+
+		b = super.saveOrUpdate(entity);
+
+		return b;
+	}
+
+
+	@Override
+	public List<EvaluationDept> listAll(String id, boolean enable) {
+
+		QueryWrapper<EvaluationDept> qw = new QueryWrapper();
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(EvaluationDept::getId, id);
+		}
+
+		qw.lambda().like(EvaluationDept::getEnable, enable);
+
+
+		List<EvaluationDept> list = baseMapper.selectList(qw);
+
+		return list;
+	}
+
+
+
+	@Transactional
+	@Override
+	public boolean saveBatch(Collection<EvaluationDept> entityList) {
+		boolean b  = super.saveBatch(entityList);
+		return b;
+	}
+}

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

@@ -0,0 +1,38 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.entity.EvaluationPersonnel;
+import com.ims.eval.dao.EvaluationPersonnelMapper;
+import com.ims.eval.service.IEvaluationPersonnelService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.beans.Transient;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * <p>
+ * 考评人员 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+@Service
+public class EvaluationPersonnelServiceImpl extends ServiceImpl<EvaluationPersonnelMapper, EvaluationPersonnel> implements IEvaluationPersonnelService {
+
+	@Override
+	public List<EvaluationPersonnel> listAll(String id, boolean enable) {
+		return null;
+	}
+
+
+	@Transient
+	@Override
+	public boolean saveBatch(Collection<EvaluationPersonnel> entityList) {
+		boolean b = super.saveBatch(entityList);
+		return b;
+	}
+
+
+}

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

@@ -0,0 +1,26 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.entity.EvaluationUnit;
+import com.ims.eval.dao.EvaluationUnitMapper;
+import com.ims.eval.service.IEvaluationUnitService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 考评单位 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-06
+ */
+@Service
+public class EvaluationUnitServiceImpl extends ServiceImpl<EvaluationUnitMapper, EvaluationUnit> implements IEvaluationUnitService {
+
+	@Override
+	public List<EvaluationUnit> listAll(String id, boolean enable) {
+		return null;
+	}
+}

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.cache.CacheContext;
 import com.ims.eval.dao.IndicatorDictionaryMapper;
-import com.ims.eval.dao.result.CustomException;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.IndicatorDictionary;
 import com.ims.eval.service.IIndicatorDictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -8,7 +8,7 @@ import com.ims.common.utils.StringUtils;
 import com.ims.eval.cache.CacheContext;
 import com.ims.eval.dao.IndicatorDictionaryMapper;
 import com.ims.eval.dao.IndicatorMapper;
-import com.ims.eval.dao.result.CustomException;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.IndicatorDictionary;
 import com.ims.eval.service.IIndicatorService;

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

@@ -5,8 +5,7 @@ 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.cache.CacheContext;
-import com.ims.eval.dao.result.CustomException;
-import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.OrganizationEvaluationRule;
 import com.ims.eval.dao.OrganizationEvaluationRuleMapper;
 import com.ims.eval.service.IOrganizationEvaluationRuleService;

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

@@ -4,9 +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.dao.result.CustomException;
-import com.ims.eval.entity.Indicator;
-import com.ims.eval.entity.OrganizationEvaluationRule;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.PersonnelEvaluationRule;
 import com.ims.eval.dao.PersonnelEvaluationRuleMapper;
 import com.ims.eval.service.IPersonnelEvaluationRuleService;