考评周期、考评等级

operation_manager/src/main/java/com/huaxu/base/BaseEntity.java

@@ -1,5 +1,9 @@
 package com.huaxu.base;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,7 +22,8 @@ import java.util.Date;
 public class BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "主键")
-    private Integer id;
+    @TableId(type = IdType.AUTO)
+    private Long id;
 
     @ApiModelProperty(value = "租户标识")
     private String tenantId;
@@ -30,17 +35,20 @@ public class BaseEntity implements Serializable {
     private Integer deptOrgId;
 
     @ApiModelProperty(value = "创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date dateCreate;
 
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date dateUpdate;
 
     @ApiModelProperty(value = "更新人")
     private String updateBy;
 
     @ApiModelProperty(value = "数据删除标记")
+    @TableLogic
     private Integer status;
 }

operation_manager/src/main/java/com/huaxu/evaluation/controller/EvaluationCycleController.java

@@ -0,0 +1,132 @@
+package com.huaxu.evaluation.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaxu.evaluation.entity.EvaluationGradeEntity;
+import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
+import com.huaxu.model.Pagination;
+import com.huaxu.model.ResultStatus;
+import com.huaxu.util.UserUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.ui.ModelMap;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Date;
+
+import org.springframework.web.bind.annotation.*;
+import com.huaxu.evaluation.entity.EvaluationCycleEntity;
+import com.huaxu.evaluation.service.EvaluationCycleService;
+
+/**
+ * 考评周期页面控制器
+ *
+ * @author WYY
+ * @date 2021-05-08 09:09
+ */
+@RestController
+@RequestMapping("/evaluation/cycle")
+@Api(tags = "考评周期")
+public class EvaluationCycleController {
+
+    @Autowired
+    private EvaluationCycleService evaluationCycleService;
+
+    @ApiOperation(value = "分页查询考评周期")
+    @RequestMapping(value = "/selectPage", method = RequestMethod.GET)
+    public AjaxMessage<Pagination<EvaluationCycleEntity>> list(
+            @RequestParam Integer pageNum,
+            @RequestParam Integer pageSize,
+            @ApiParam(value = "周期类型", required = false)@RequestParam(required = false) String type,
+            @RequestParam(required = false) Long companyOrgId) {
+        IPage<EvaluationCycleEntity> iPage = new Page<>(pageNum, pageSize);
+        EvaluationCycleEntity entity = new EvaluationCycleEntity();
+        if (type != null)
+            entity.setType(Integer.valueOf(type));
+        if(companyOrgId!=null)
+            entity.setCompanyOrgId(companyOrgId.intValue());
+        iPage = evaluationCycleService.findPage(iPage, entity);
+        Pagination<EvaluationCycleEntity> pages = new Pagination<>(iPage);
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+    /**
+     * 新增
+     */
+    @ApiOperation(value = "新增考评周期")
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public AjaxMessage<Integer> addCycle(@ApiParam(value = "周期信息", required = true) @RequestBody EvaluationCycleEntity evaluationCycle){
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if (currentUser != null) {
+            evaluationCycle.setUpdateBy(currentUser.getUsername());
+            evaluationCycle.setCreateBy(currentUser.getUsername());
+            evaluationCycle.setDateCreate(new Date());
+            evaluationCycle.setDateUpdate(new Date());
+            evaluationCycle.setTenantId(currentUser.getTenantId());
+        }
+        evaluationCycle.setStatus(1);
+        int result = evaluationCycleService.addEvaluationCycle(evaluationCycle)? 1: 0;
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+
+    @ApiOperation(value = "按ID查询考评周期")
+    @GetMapping(value = "/findCycleById")
+    public  AjaxMessage<EvaluationCycleEntity> findCycleById(@ApiParam(value = "周期ID", required = true) @RequestParam  Long id){
+        EvaluationCycleEntity evaluationCycle = evaluationCycleService.findEvaluationCycleById(id);
+        return new AjaxMessage<>(ResultStatus.OK, evaluationCycle);
+    }
+
+    /**
+     * 修改保存考评等级
+     */
+    @ApiOperation(value = "修改保存考评周期")
+    @RequestMapping(value = "/edit", method = RequestMethod.POST)
+    public  AjaxMessage<Integer> editEvaluationCycle(@ApiParam(value = "考评周期", required = true) @RequestBody EvaluationCycleEntity evaluationCycle){
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if (currentUser != null) {
+            evaluationCycle.setUpdateBy(currentUser.getUsername());
+            evaluationCycle.setDateUpdate(new Date());
+        }
+        int result= evaluationCycleService.updateEvaluationCycleById(evaluationCycle)? 1: 0;
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除考评周期")
+    @RequestMapping(value = "/deleteByIds", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxMessage<Integer> deleteByIds(@ApiParam(value = "周期IDS", required = true) @RequestBody Long[] ids) {
+        if (ids == null || ids.length == 0) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
+        int result = evaluationCycleService.delEvaluationCycleByIds(ids) ? 1 : 0;
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "单个删除考评周期")
+    @RequestMapping(value = "/deleteById", method = RequestMethod.POST)
+    public AjaxMessage<Integer> deleteById(@ApiParam(value = "周期ID", required = true) @RequestParam Long id) {
+        if (id == null) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
+        List<Long> longIds = new ArrayList<>();
+        longIds.add(id);
+        EvaluationCycleEntity evaluationCycle = evaluationCycleService.findEvaluationCycleById(id);
+        if (evaluationCycle == null) {
+            return new AjaxMessage<>(ResultStatus.EXSIT_IS_PARENT_ERROR, 0);
+        } else {
+            int result = evaluationCycleService.delEvaluationCycleById(id) ? 1 : 0;
+            return new AjaxMessage<>(ResultStatus.OK, result);
+        }
+    }
+}

operation_manager/src/main/java/com/huaxu/evaluation/controller/EvaluationGradeController.java

@@ -0,0 +1,130 @@
+package com.huaxu.evaluation.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
+import com.huaxu.model.Pagination;
+import com.huaxu.model.ResultStatus;
+import com.huaxu.util.UserUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.ui.ModelMap;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Date;
+import org.springframework.web.bind.annotation.*;
+import com.huaxu.evaluation.entity.EvaluationGradeEntity;
+import com.huaxu.evaluation.service.EvaluationGradeService;
+
+/**
+ * 考评等级页面控制器
+ * @author WYY
+ * @date 2021-05-08 09:23
+ */
+@RestController
+@RequestMapping("/evaluation/grade")
+@Api(tags = "考评等级")
+public class EvaluationGradeController {
+
+    @Autowired
+    private EvaluationGradeService evaluationGradeService;
+
+    @ApiOperation(value = "分页查询等级信息")
+    @RequestMapping(value = "/selectPage", method = RequestMethod.GET)
+    public AjaxMessage<Pagination<EvaluationGradeEntity>> list(
+            @RequestParam Integer pageNum,
+            @RequestParam Integer pageSize,
+            @ApiParam(value = "绩效等级", required = false)@RequestParam(required = false) String type,
+            @RequestParam(required = false) Long companyOrgId
+            ) {
+        IPage<EvaluationGradeEntity> iPage = new Page<>(pageNum, pageSize);
+        EvaluationGradeEntity entity = new EvaluationGradeEntity();
+        if (type != null)
+            entity.setType(Long.valueOf(type));
+        if (companyOrgId != null)
+            entity.setCompanyOrgId(companyOrgId.intValue());
+        iPage = evaluationGradeService.findPage(iPage, entity);
+        Pagination<EvaluationGradeEntity> pages = new Pagination<>(iPage);
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+    /**
+     * 新增
+     */
+    @ApiOperation(value = "新增等级信息")
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public AjaxMessage<Integer> addGrade(@ApiParam(value = "等级信息", required = true) @RequestBody EvaluationGradeEntity evaluationGrade){
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if (currentUser != null) {
+            evaluationGrade.setUpdateBy(currentUser.getUsername());
+            evaluationGrade.setCreateBy(currentUser.getUsername());
+            evaluationGrade.setDateCreate(new Date());
+            evaluationGrade.setDateUpdate(new Date());
+            evaluationGrade.setTenantId(currentUser.getTenantId());
+        }
+        evaluationGrade.setStatus(1);
+        int result = evaluationGradeService.addEvaluationGrade(evaluationGrade)? 1: 0;
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }    
+
+
+    @ApiOperation(value = "按ID查询绩效等级")
+    @GetMapping(value = "/findGradeById")
+    public  AjaxMessage<EvaluationGradeEntity> findGradeById(@ApiParam(value = "等级ID", required = true) @RequestParam  Long id){
+        EvaluationGradeEntity evaluationGrade = evaluationGradeService.findEvaluationGradeById(id);
+        return new AjaxMessage<>(ResultStatus.OK, evaluationGrade);
+    }
+
+    /**
+     * 修改保存考评等级
+     */
+    @ApiOperation(value = "修改保存考评等级")
+    @RequestMapping(value = "/edit", method = RequestMethod.POST)
+    public  AjaxMessage<Integer> editEvaluationGrade(@ApiParam(value = "绩效等级", required = true) @RequestBody EvaluationGradeEntity evaluationGrade){
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if (currentUser != null) {
+            evaluationGrade.setUpdateBy(currentUser.getUsername());
+            evaluationGrade.setDateUpdate(new Date());
+        }
+        int result= evaluationGradeService.updateEvaluationGradeById(evaluationGrade)? 1: 0;
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除绩效等级")
+    @RequestMapping(value = "/deleteByIds", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxMessage<Integer> deleteByIds(@ApiParam(value = "等级IDS", required = true) @RequestBody Long[] ids) {
+        if (ids == null || ids.length == 0) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
+        int result = evaluationGradeService.delEvaluationGradeByIds(ids) ? 1 : 0;
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "单个删除绩效等级")
+    @RequestMapping(value = "/deleteById", method = RequestMethod.POST)
+    public AjaxMessage<Integer> deleteById(@ApiParam(value = "绩效ID", required = true) @RequestParam Long id) {
+        if (id == null) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
+        List<Long> longIds = new ArrayList<>();
+        longIds.add(id);
+        EvaluationGradeEntity evaluationGrade = evaluationGradeService.findEvaluationGradeById(id);
+        if (evaluationGrade == null) {
+            return new AjaxMessage<>(ResultStatus.EXSIT_IS_PARENT_ERROR, 0);
+        } else {
+            int result = evaluationGradeService.delEvaluationGradeById(id) ? 1 : 0;
+            return new AjaxMessage<>(ResultStatus.OK, result);
+        }
+    }
+}

operation_manager/src/main/java/com/huaxu/evaluation/controller/EvaluationItemController.java

@@ -0,0 +1,130 @@
+package com.huaxu.evaluation.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaxu.evaluation.entity.EvaluationItemEntity;
+import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.LoginUser;
+import com.huaxu.model.Pagination;
+import com.huaxu.model.ResultStatus;
+import com.huaxu.util.UserUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.ui.ModelMap;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Date;
+import org.springframework.web.bind.annotation.*;
+import com.huaxu.evaluation.entity.EvaluationItemEntity;
+import com.huaxu.evaluation.service.EvaluationItemService;
+
+/**
+ * 考评项页面控制器
+ * @author WYY
+ * @date 2021-05-08 09:25
+ */
+@RestController
+@RequestMapping("/evaluation/item")
+@Api(tags = "考评项")
+public class EvaluationItemController{
+    @Autowired
+    private EvaluationItemService evaluationItemService;
+    @ApiOperation(value = "分页查询考评项")
+    @RequestMapping(value = "/selectPage", method = RequestMethod.GET)
+    public AjaxMessage<Pagination<EvaluationItemEntity>> list(
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false) Long companyOrgId,
+            @RequestParam(required = false) Long deptOrgId,
+            @RequestParam Integer pageNum,
+            @RequestParam Integer pageSize) {
+        IPage<EvaluationItemEntity> iPage = new Page<>(pageNum, pageSize);
+        EvaluationItemEntity entity = new EvaluationItemEntity();
+        entity.setName(name);
+        if (companyOrgId != null)
+            entity.setCompanyOrgId(companyOrgId.intValue());
+        if(deptOrgId!=null)
+            entity.setDeptOrgId(deptOrgId.intValue());
+        iPage = evaluationItemService.findPage(iPage, entity);
+        Pagination<EvaluationItemEntity> pages = new Pagination<>(iPage);
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+    /**
+     * 新增
+     */
+    @ApiOperation(value = "新增考评项")
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public AjaxMessage<Integer> addGrade(@ApiParam(value = "考评项", required = true) @RequestBody EvaluationItemEntity evaluationItem){
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if (currentUser != null) {
+            evaluationItem.setUpdateBy(currentUser.getUsername());
+            evaluationItem.setCreateBy(currentUser.getUsername());
+            evaluationItem.setDateCreate(new Date());
+            evaluationItem.setDateUpdate(new Date());
+            evaluationItem.setTenantId(currentUser.getTenantId());
+        }
+        evaluationItem.setStatus(1);
+        int result = evaluationItemService.addEvaluationItem(evaluationItem)? 1: 0;
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+
+    @ApiOperation(value = "按ID查询考评项")
+    @GetMapping(value = "/findGradeById")
+    public  AjaxMessage<EvaluationItemEntity> findGradeById(@ApiParam(value = "考评项ID", required = true) @RequestParam  Long id){
+        EvaluationItemEntity evaluationItem = evaluationItemService.findEvaluationItemById(id);
+        return new AjaxMessage<>(ResultStatus.OK, evaluationItem);
+    }
+
+    /**
+     * 修改保存考评等级
+     */
+    @ApiOperation(value = "修改保存考评项")
+    @RequestMapping(value = "/edit", method = RequestMethod.POST)
+    public  AjaxMessage<Integer> editEvaluationGrade(@ApiParam(value = "考评项", required = true) @RequestBody EvaluationItemEntity evaluationItem){
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if (currentUser != null) {
+            evaluationItem.setUpdateBy(currentUser.getUsername());
+            evaluationItem.setDateUpdate(new Date());
+        }
+        int result= evaluationItemService.updateEvaluationItemById(evaluationItem)? 1: 0;
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除考评项")
+    @RequestMapping(value = "/deleteByIds", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxMessage<Integer> deleteByIds(@ApiParam(value = "考评项IDS", required = true) @RequestBody Long[] ids) {
+        if (ids == null || ids.length == 0) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
+        int result = evaluationItemService.delEvaluationItemByIds(ids) ? 1 : 0;
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "单个删除考评项")
+    @RequestMapping(value = "/deleteById", method = RequestMethod.POST)
+    public AjaxMessage<Integer> deleteById(@ApiParam(value = "考评项ID", required = true) @RequestParam Long id) {
+        if (id == null) {
+            return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
+        }
+        List<Long> longIds = new ArrayList<>();
+        longIds.add(id);
+        EvaluationItemEntity evaluationGrade = evaluationItemService.findEvaluationItemById(id);
+        if (evaluationGrade == null) {
+            return new AjaxMessage<>(ResultStatus.EXSIT_IS_PARENT_ERROR, 0);
+        } else {
+            int result = evaluationItemService.delEvaluationItemById(id) ? 1 : 0;
+            return new AjaxMessage<>(ResultStatus.OK, result);
+        }
+    }
+}

operation_manager/src/main/java/com/huaxu/evaluation/dao/EvaluationCycleMapper.java

@@ -1,16 +1,34 @@
 package com.huaxu.evaluation.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaxu.evaluation.entity.EvaluationCycleEntity;
+import java.io.Serializable;
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 /**
- * @ClassName EvaluationCycleMapper
- * @Description: 考评周期
- * @Author lihui
- * @Date 2021/5/7
- * @Version V1.0
- **/
+ *
+ * sc_evaluation_cycleDAO接口
+ * @author: WYY
+ * @date 2021-05-08 09:09
+ */
 @Mapper
 public interface EvaluationCycleMapper extends BaseMapper<EvaluationCycleEntity> {
+
+	/**
+     * 自定义分页查询
+     * @param  page 
+     * @param  evaluationCycleEntity 实体类
+     */
+     Page<EvaluationCycleEntity> findPage(IPage<EvaluationCycleEntity> page,
+                                       @Param("evaluationCycle") EvaluationCycleEntity evaluationCycleEntity);
+
+     EvaluationCycleEntity findEvaluationCycleById(Serializable id);
+
+
+     List<EvaluationCycleEntity> findList(EvaluationCycleEntity evaluationCycleEntity);
+
+     /**删除相关方法  使用mybatis-plus集成的 **/
 }

operation_manager/src/main/java/com/huaxu/evaluation/dao/EvaluationGradeMapper.java

@@ -1,17 +1,34 @@
 package com.huaxu.evaluation.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaxu.evaluation.entity.EvaluationGradeEntity;
-import com.huaxu.evaluation.entity.EvaluationResultEntity;
+import java.io.Serializable;
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 /**
- * @ClassName EvaluationGradeMapper
- * @Description: 考评等级
- * @Author lihui
- * @Date 2021/5/7
- * @Version V1.0
- **/
+ *
+ * sc_evaluation_gradeDAO接口
+ * @author: WYY
+ * @date 2021-05-08 09:23
+ */
 @Mapper
 public interface EvaluationGradeMapper extends BaseMapper<EvaluationGradeEntity> {
+
+	/**
+     * 自定义分页查询
+     * @param  page 
+     * @param  evaluationGradeEntity 实体类
+     */
+     Page<EvaluationGradeEntity> findPage(IPage<EvaluationGradeEntity> page,
+                                       @Param("evaluationGrade") EvaluationGradeEntity evaluationGradeEntity);
+
+     EvaluationGradeEntity findEvaluationGradeById(Serializable id);
+
+
+     List<EvaluationGradeEntity> findList(EvaluationGradeEntity evaluationGradeEntity);
+
+     /**删除相关方法  使用mybatis-plus集成的 **/
 }

operation_manager/src/main/java/com/huaxu/evaluation/dao/EvaluationItemMapper.java

@@ -1,17 +1,34 @@
 package com.huaxu.evaluation.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaxu.evaluation.entity.EvaluationItemEntity;
-import com.huaxu.evaluation.entity.EvaluationResultEntity;
+import java.io.Serializable;
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 /**
- * @ClassName EvaluationItemMapper
- * @Description: 考评项
- * @Author lihui
- * @Date 2021/5/7
- * @Version V1.0
- **/
+ *
+ * sc_evaluation_itemDAO接口
+ * @author: WYY
+ * @date 2021-05-08 09:25
+ */
 @Mapper
 public interface EvaluationItemMapper extends BaseMapper<EvaluationItemEntity> {
+
+	/**
+     * 自定义分页查询
+     * @param  page 
+     * @param  evaluationItemEntity 实体类
+     */
+     Page<EvaluationItemEntity> findPage(IPage<EvaluationItemEntity> page,
+                                       @Param("evaluationItem") EvaluationItemEntity evaluationItemEntity);
+
+     EvaluationItemEntity findEvaluationItemById(Serializable id);
+
+
+     List<EvaluationItemEntity> findList(EvaluationItemEntity evaluationItemEntity);
+
+     /**删除相关方法  使用mybatis-plus集成的 **/
 }

operation_manager/src/main/java/com/huaxu/evaluation/dao/EvaluationItemValueMapper.java

@@ -1,17 +1,34 @@
 package com.huaxu.evaluation.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaxu.evaluation.entity.EvaluationItemValueEntity;
-import com.huaxu.evaluation.entity.EvaluationResultEntity;
+import java.io.Serializable;
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 /**
- * @ClassName EvaluationItemValueMapper
- * @Description: 考评项分值
- * @Author lihui
- * @Date 2021/5/7
- * @Version V1.0
- **/
+ *
+ * sc_evaluation_item_valueDAO接口
+ * @author: WYY
+ * @date 2021-05-08 09:27
+ */
 @Mapper
 public interface EvaluationItemValueMapper extends BaseMapper<EvaluationItemValueEntity> {
+
+	/**
+     * 自定义分页查询
+     * @param  page 
+     * @param  evaluationItemValueEntity 实体类
+     */
+     Page<EvaluationItemValueEntity> findPage(IPage<EvaluationItemValueEntity> page,
+                                       @Param("evaluationItemValue") EvaluationItemValueEntity evaluationItemValueEntity);
+
+     EvaluationItemValueEntity findEvaluationItemValueById(Serializable id);
+
+
+     List<EvaluationItemValueEntity> findList(EvaluationItemValueEntity evaluationItemValueEntity);
+
+     /**删除相关方法  使用mybatis-plus集成的 **/
 }

operation_manager/src/main/java/com/huaxu/evaluation/entity/EvaluationCycleEntity.java

@@ -1,32 +1,65 @@
 package com.huaxu.evaluation.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.huaxu.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
+import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
- * @ClassName EvaluationCycleEntity
- * @Description: 考评周期
- * @Author lihui
- * @Date 2021/5/7
- * @Version V1.0
- **/
+ * sc_evaluation_cycle
+ * @author: WYY
+ * @date 2021-05-08 09:09
+ */
 @Data
 @TableName("sc_evaluation_cycle")
 public class EvaluationCycleEntity extends BaseEntity {
 
+    private static final long serialVersionUID = 1L;
+
+    /** 类型(0月度 1季度 2年度) */
     @ApiModelProperty(value = "类型(0月度 1季度 2年度)")
     private Integer type;
 
+    @ApiModelProperty(value = "所属部门ID")
+    @TableField(exist = false)
+    @JsonIgnore
+    private Integer deptOrgId;
+
+    @ApiModelProperty(value = "所属公司名称")
+    @TableField(exist = false)
+    private Integer companyOrgName;
+
+    /** 考评日期 */
     @ApiModelProperty(value = "考评日期")
     private Integer evaluationDay;
 
+    /** 备注 */
     @ApiModelProperty(value = "备注")
     private String remarks;
 
-}
+    @ApiModelProperty(value ="权限",hidden = true)
+    @TableField(exist = false)
+    @JsonIgnore
+    private List<ProgramItem> programItems;
+
+    @ApiModelProperty(value="用户权限类型")
+    @TableField(exist = false)
+    @JsonIgnore
+    private Integer permissonType;
+
+    /** 用户类型 */
+    @ApiModelProperty(value = "用户类型(-9999 超管 -999普通用户 2普通用户)")
+    @TableField(exist = false)
+    @JsonIgnore
+    private String userType;
+  }

operation_manager/src/main/java/com/huaxu/evaluation/entity/EvaluationGradeEntity.java

@@ -1,37 +1,72 @@
 package com.huaxu.evaluation.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.huaxu.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
+import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
- * @ClassName EvaluationGradeEntity
- * @Description: 考评等级
- * @Author lihui
- * @Date 2021/5/7
- * @Version V1.0
- **/
+ * sc_evaluation_grade
+ * @author: WYY
+ * @date 2021-05-08 09:23
+ */
 @Data
 @TableName("sc_evaluation_grade")
 public class EvaluationGradeEntity extends BaseEntity {
 
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "所属部门ID")
+    @TableField(exist = false)
+    @JsonIgnore
+    private Integer deptOrgId;
+
+    @ApiModelProperty(value = "所属公司名称")
+    @TableField(exist = false)
+    private Integer companyOrgName;
+
+    /** 绩效等级(0A 1B 2C 3D 4E) */
     @ApiModelProperty(value = "绩效等级(0A 1B 2C 3D 4E)")
-    private Integer evaluationGrade;
+    private Long evaluationGrade;
 
-    @ApiModelProperty(value = "类型(0大于等于 1小于 2介于)")
-    private Integer type;
+    /** 类型(0大于等于 2小于 1介于) */
+    @ApiModelProperty(value = "类型(0大于等于 2小于 1介于)")
+    private Long type;
 
+    /** 分值1 */
     @ApiModelProperty(value = "分值1")
-    private BigDecimal valueOne;
+    private Double valueOne;
 
+    /** 分值2 */
     @ApiModelProperty(value = "分值2")
-    private BigDecimal valueTwo;
+    private Double valueTwo;
 
+    /** 备注 */
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty(value ="权限",hidden = true)
+    @TableField(exist = false)
+    @JsonIgnore
+    private List<ProgramItem> programItems;
+
+    @ApiModelProperty(value="用户权限类型")
+    @TableField(exist = false)
+    @JsonIgnore
+    private Integer permissonType;
+
+    /** 用户类型 */
+    @ApiModelProperty(value = "用户类型(-9999 超管 -999普通用户 2普通用户)")
+    @TableField(exist = false)
+    @JsonIgnore
+    private String userType;
 }

operation_manager/src/main/java/com/huaxu/evaluation/entity/EvaluationItemEntity.java

@@ -1,40 +1,77 @@
 package com.huaxu.evaluation.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.huaxu.base.BaseEntity;
+import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
- * @ClassName EvaluationItemEntity
- * @Description: 考评项
- * @Author lihui
- * @Date 2021/5/7
- * @Version V1.0
- **/
+ * sc_evaluation_item
+ * @author: WYY
+ * @date 2021-05-08 09:25
+ */
 @Data
 @TableName("sc_evaluation_item")
 public class EvaluationItemEntity extends BaseEntity {
 
+    private static final long serialVersionUID = 1L;
 
+    /** 类型(0任务完成数 1任务按时完成率 2自定义) */
     @ApiModelProperty(value = "类型(0任务完成数 1任务按时完成率 2自定义)")
-    private Integer type;
+    private Long type;
 
+    /** 名称 */
     @ApiModelProperty(value = "名称")
     private String name;
 
+    @ApiModelProperty(value = "所属公司名称")
+    @TableField(exist = false)
+    private Integer companyOrgName;
+
+    @ApiModelProperty(value = "所属部门名称")
+    @TableField(exist = false)
+    private Integer deptOrgName;
+
+    /** 分值 */
     @ApiModelProperty(value = "分值")
-    private BigDecimal value;
+    private Double value;
 
+    /** 条件值 */
     @ApiModelProperty(value = "条件值")
-    private BigDecimal valueCondition;
+    private Double valueCondition;
 
+    /** 周期(0月度 1季度 2年度) */
     @ApiModelProperty(value = "周期(0月度 1季度 2年度)")
     private Integer cycle;
 
+    /** 评分标准 */
     @ApiModelProperty(value = "评分标准")
     private String remarks;
 
-}
+    @ApiModelProperty(value ="权限",hidden = true)
+    @TableField(exist = false)
+    @JsonIgnore
+    private List<ProgramItem> programItems;
+
+    @ApiModelProperty(value="用户权限类型")
+    @TableField(exist = false)
+    @JsonIgnore
+    private Integer permissonType;
+
+    /** 用户类型 */
+    @ApiModelProperty(value = "用户类型(-9999 超管 -999普通用户 2普通用户)")
+    @TableField(exist = false)
+    @JsonIgnore
+    private String userType;
+
+  }

operation_manager/src/main/java/com/huaxu/evaluation/entity/EvaluationItemValueEntity.java

@@ -1,36 +1,45 @@
 package com.huaxu.evaluation.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.huaxu.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * @ClassName EvaluationItemValueEntity
- * @Description: 考评项分值
- * @Author lihui
- * @Date 2021/5/7
- * @Version V1.0
- **/
+ * sc_evaluation_item_value
+ * @author: WYY
+ * @date 2021-05-08 09:27
+ */
 @Data
 @TableName("sc_evaluation_item_value")
 public class EvaluationItemValueEntity extends BaseEntity {
 
-    @ApiModelProperty(value = "考评项ID")
-    private Integer evaluationItemId;
+    private static final long serialVersionUID = 1L;
+    /** 考评项ID */
+    @NotNull(message = "参数值不能为空")
+    @ApiModelProperty(value = "名称")
+    private Long evaluationItemId;
 
-    @ApiModelProperty(value = "类型(0大于等于 1小于 2介于)")
-    private Integer type;
+    /** 类型(0大于等于 2小于 1介于) */
+    @ApiModelProperty(value = "类型(0大于等于 2小于 1介于)")
+    private Long type;
 
+    /** 分值 */
     @ApiModelProperty(value = "分值")
-    private BigDecimal value;
+    private Double value;
 
+    /** 分值1 */
     @ApiModelProperty(value = "分值1")
-    private BigDecimal valueOne;
+    private Double valueOne;
 
+    /** 分值2 */
     @ApiModelProperty(value = "分值2")
-    private BigDecimal valueTwo;
-
+    private Double valueTwo;
 }

operation_manager/src/main/java/com/huaxu/evaluation/service/EvaluationCycleService.java

@@ -0,0 +1,64 @@
+package com.huaxu.evaluation.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.evaluation.dao.EvaluationCycleMapper;
+import com.huaxu.evaluation.entity.EvaluationCycleEntity;
+import com.huaxu.evaluation.entity.EvaluationGradeEntity;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import javax.annotation.Resource;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+import java.util.List;
+import java.util.Arrays;
+
+/**
+ * 考评周期Service接口
+ *
+ * @author: WYY
+ * @date 2021-05-08 09:09
+ */
+public interface EvaluationCycleService {
+
+    /**
+     * 自定义分页查询，含关联实体对像
+     */
+    public IPage<EvaluationCycleEntity> findPage(IPage<EvaluationCycleEntity> page, EvaluationCycleEntity evaluationCycleEntity);
+
+
+    /**
+     * 查列表
+     */
+    public List<EvaluationCycleEntity> findList(EvaluationCycleEntity evaluationCycleEntity);
+
+    /**
+     * 批量删除
+     */
+    public boolean delEvaluationCycleByIds(Long[] ids);
+
+    /**
+     * 单个删除
+     */
+    public boolean delEvaluationCycleById(Long id);
+
+    /**
+     * 保存
+     */
+    public boolean addEvaluationCycle(EvaluationCycleEntity evaluationCycle);
+
+    /**
+     * 修改根居ID
+     */
+    public boolean updateEvaluationCycleById(EvaluationCycleEntity evaluationCycle);
+
+    /**
+     * 根居ID获取对象
+     */
+    public EvaluationCycleEntity findEvaluationCycleById(Long id);
+}

operation_manager/src/main/java/com/huaxu/evaluation/service/EvaluationGradeService.java

@@ -0,0 +1,64 @@
+package com.huaxu.evaluation.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.evaluation.dao.EvaluationGradeMapper;
+import com.huaxu.evaluation.entity.EvaluationGradeEntity;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import javax.annotation.Resource;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+import java.util.List;
+import java.util.Arrays;
+
+/**
+ * 考评等级Service接口
+ *
+ * @author: WYY
+ * @date 2021-05-08 09:23
+ */
+@Service
+public interface EvaluationGradeService {
+
+
+
+    /**
+     * 自定义分页查询，含关联实体对像
+     */
+    public IPage<EvaluationGradeEntity> findPage(IPage<EvaluationGradeEntity> page, EvaluationGradeEntity evaluationGradeEntity);
+
+    /**
+     * 查列表
+     */
+    public List<EvaluationGradeEntity> findList(EvaluationGradeEntity evaluationGradeEntity) ;
+    /**
+     * 批量删除
+     */
+    public boolean delEvaluationGradeByIds(Long[] ids);
+
+    /**
+     * 单个删除
+     */
+    public boolean delEvaluationGradeById(Long id);
+
+    /**
+     * 保存
+     */
+    public boolean addEvaluationGrade(EvaluationGradeEntity evaluationGrade);
+
+    /**
+     * 修改根居ID
+     */
+    public boolean updateEvaluationGradeById(EvaluationGradeEntity evaluationGrade) ;
+
+    /**
+     * 根居ID获取对象
+     */
+    public EvaluationGradeEntity findEvaluationGradeById(Long id) ;
+}

operation_manager/src/main/java/com/huaxu/evaluation/service/EvaluationItemService.java

@@ -0,0 +1,63 @@
+package com.huaxu.evaluation.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.evaluation.entity.EvaluationGradeEntity;
+import com.huaxu.evaluation.entity.EvaluationItemEntity;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import javax.annotation.Resource;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+import java.util.List;
+import java.util.Arrays;
+
+/**
+ * 考评项Service接口
+ *
+ * @author: WYY
+ * @date 2021-05-08 09:25
+ */
+public interface EvaluationItemService {
+
+    /**
+     * 自定义分页查询，含关联实体对像
+     */
+    public IPage<EvaluationItemEntity> findPage(IPage<EvaluationItemEntity> page, EvaluationItemEntity evaluationItemEntity);
+
+
+    /**
+     * 查列表
+     */
+    public List<EvaluationItemEntity> findList(EvaluationItemEntity evaluationItemEntity);
+
+    /**
+     * 批量删除
+     */
+    public boolean delEvaluationItemByIds(Long[] ids);
+
+    /**
+     * 单个删除
+     */
+    public boolean delEvaluationItemById(Long id);
+
+    /**
+     * 保存
+     */
+    public boolean addEvaluationItem(EvaluationItemEntity evaluationItem);
+
+    /**
+     * 修改根居ID
+     */
+    public boolean updateEvaluationItemById(EvaluationItemEntity evaluationItem);
+
+    /**
+     * 根居ID获取对象
+     */
+    public EvaluationItemEntity findEvaluationItemById(Long id);
+}

operation_manager/src/main/java/com/huaxu/evaluation/service/EvaluationItemValueService.java

@@ -0,0 +1,52 @@
+package com.huaxu.evaluation.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.evaluation.entity.EvaluationItemEntity;
+import com.huaxu.evaluation.entity.EvaluationItemValueEntity;
+
+import java.util.Map;
+import java.util.List;
+import java.util.Arrays;
+
+/**
+ * 考评项分值Service接口
+ *
+ * @author: WYY
+ * @date 2021-05-08 09:27
+ */
+public interface EvaluationItemValueService {
+    /**
+     * 自定义分页查询，含关联实体对像
+     */
+    public IPage<EvaluationItemValueEntity> findPage(IPage<EvaluationItemValueEntity> page, EvaluationItemValueEntity evaluationItemValueEntity);
+
+    /**
+     * 查列表
+     */
+    public List<EvaluationItemValueEntity> findList(EvaluationItemValueEntity evaluationItemValueEntity);
+
+    /**
+     * 批量删除
+     */
+    public boolean delEvaluationItemValueByIds(Long[] ids);
+
+    /**
+     * 单个删除
+     */
+    public boolean delEvaluationItemValueById(Long id);
+    /**
+     * 保存
+     */
+    public boolean addEvaluationItemValue(EvaluationItemValueEntity evaluationItemValue);
+
+    /**
+     * 修改根居ID
+     */
+    public boolean updateEvaluationItemValueById(EvaluationItemValueEntity evaluationItemValue);
+
+    /**
+     * 根居ID获取对象
+     */
+    public EvaluationItemValueEntity findEvaluationItemValueById(Long id);
+}

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationCycleServiceImpl.java

@@ -0,0 +1,106 @@
+package com.huaxu.evaluation.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.huaxu.evaluation.dao.EvaluationCycleMapper;
+import com.huaxu.evaluation.dao.EvaluationGradeMapper;
+import com.huaxu.evaluation.entity.EvaluationCycleEntity;
+import com.huaxu.evaluation.entity.EvaluationGradeEntity;
+import com.huaxu.evaluation.service.EvaluationCycleService;
+import com.huaxu.evaluation.service.EvaluationGradeService;
+import com.huaxu.model.LoginUser;
+import com.huaxu.util.UserUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 考评周期Service接口
+ *
+ * @author: WYY
+ * @date 2021-05-08 09:09
+ */
+@Service
+public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMapper, EvaluationCycleEntity> implements EvaluationCycleService {
+
+    @Resource
+    EvaluationCycleMapper evaluationCycleMapper;
+    /**
+     * 自定义分页查询，含关联实体对像
+     */
+    public IPage<EvaluationCycleEntity> findPage(IPage<EvaluationCycleEntity> page, EvaluationCycleEntity evaluationCycleEntity) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            evaluationCycleEntity.setTenantId(currentUser.getTenantId());
+            evaluationCycleEntity.setProgramItems(currentUser.getProgramItemList());
+            evaluationCycleEntity.setUserType(currentUser.getType());
+            //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+            evaluationCycleEntity.setPermissonType(currentUser.getPermissonType());
+        }
+        Page<EvaluationCycleEntity> iPage = evaluationCycleMapper.findPage(page, evaluationCycleEntity);
+        return iPage;
+    }
+    /**
+     * 查列表
+     */
+    public List<EvaluationCycleEntity> findList(EvaluationCycleEntity evaluationCycleEntity) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            evaluationCycleEntity.setTenantId(currentUser.getTenantId());
+            evaluationCycleEntity.setProgramItems(currentUser.getProgramItemList());
+            evaluationCycleEntity.setUserType(currentUser.getType());
+            //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+            evaluationCycleEntity.setPermissonType(currentUser.getPermissonType());
+        }
+        return evaluationCycleMapper.findList(evaluationCycleEntity);
+    }
+
+    /**
+     * 批量删除
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delEvaluationCycleByIds(Long[] ids) {
+        return this.removeByIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 单个删除
+     */
+    public boolean delEvaluationCycleById(Long id) {
+        return this.removeById(id);
+    }
+
+    /**
+     * 保存
+     */
+    public boolean addEvaluationCycle(EvaluationCycleEntity evaluationCycle) {
+        if (this.save(evaluationCycle)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 修改根居ID
+     */
+    public boolean updateEvaluationCycleById(EvaluationCycleEntity evaluationCycle) {
+        if (this.updateById(evaluationCycle)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 根居ID获取对象
+     */
+    public EvaluationCycleEntity findEvaluationCycleById(Long id) {
+        return evaluationCycleMapper.findEvaluationCycleById(id);
+    }
+}

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationGradeServiceImpl.java

@@ -0,0 +1,106 @@
+package com.huaxu.evaluation.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.huaxu.evaluation.dao.EvaluationGradeMapper;
+import com.huaxu.evaluation.entity.EvaluationGradeEntity;
+import com.huaxu.evaluation.service.EvaluationGradeService;
+import com.huaxu.model.LoginUser;
+import com.huaxu.util.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 考评等级Service接口
+ *
+ * @author: WYY
+ * @date 2021-05-08 09:23
+ */
+@Service
+public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMapper, EvaluationGradeEntity> implements EvaluationGradeService {
+
+    @Resource
+    private EvaluationGradeMapper evaluationGradeMapper;
+    /**
+     * 自定义分页查询，含关联实体对像
+     */
+    public IPage<EvaluationGradeEntity> findPage(IPage<EvaluationGradeEntity> page, EvaluationGradeEntity evaluationGradeEntity) {
+
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            evaluationGradeEntity.setTenantId(currentUser.getTenantId());
+            evaluationGradeEntity.setProgramItems(currentUser.getProgramItemList());
+            evaluationGradeEntity.setUserType(currentUser.getType());
+            //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+            evaluationGradeEntity.setPermissonType(currentUser.getPermissonType());
+        }
+        Page<EvaluationGradeEntity> iPage = evaluationGradeMapper.findPage(page,evaluationGradeEntity);
+        return iPage;
+    }
+
+    /**
+     * 查列表
+     */
+    public List<EvaluationGradeEntity> findList(EvaluationGradeEntity evaluationGradeEntity) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            evaluationGradeEntity.setTenantId(currentUser.getTenantId());
+            evaluationGradeEntity.setProgramItems(currentUser.getProgramItemList());
+            evaluationGradeEntity.setUserType(currentUser.getType());
+            //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+            evaluationGradeEntity.setPermissonType(currentUser.getPermissonType());
+        }
+        return evaluationGradeMapper.findList(evaluationGradeEntity);
+    }
+
+    /**
+     * 批量删除
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delEvaluationGradeByIds(Long[] ids) {
+        return this.removeByIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 单个删除
+     */
+    public boolean delEvaluationGradeById(Long id) {
+        return this.removeById(id);
+    }
+
+    /**
+     * 保存
+     */
+    public boolean addEvaluationGrade(EvaluationGradeEntity evaluationGrade) {
+        if (this.save(evaluationGrade)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 修改根居ID
+     */
+    public boolean updateEvaluationGradeById(EvaluationGradeEntity evaluationGrade) {
+        if (this.updateById(evaluationGrade)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 根居ID获取对象
+     */
+    public EvaluationGradeEntity findEvaluationGradeById(Long id) {
+        return evaluationGradeMapper.findEvaluationGradeById(id);
+    }
+}

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationItemServiceImpl.java

@@ -0,0 +1,104 @@
+package com.huaxu.evaluation.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.huaxu.evaluation.dao.EvaluationItemMapper;
+import com.huaxu.evaluation.entity.EvaluationGradeEntity;
+import com.huaxu.evaluation.entity.EvaluationItemEntity;
+import com.huaxu.evaluation.service.EvaluationItemService;
+import com.huaxu.model.LoginUser;
+import com.huaxu.util.UserUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 考评项Service接口
+ *
+ * @author: WYY
+ * @date 2021-05-08 09:25
+ */
+@Service
+public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper, EvaluationItemEntity> implements EvaluationItemService {
+
+    @Resource
+    private EvaluationItemMapper evaluationItemMapper;
+    /**
+     * 自定义分页查询，含关联实体对像
+     */
+    public IPage<EvaluationItemEntity> findPage(IPage<EvaluationItemEntity> page, EvaluationItemEntity evaluationItemEntity) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            evaluationItemEntity.setTenantId(currentUser.getTenantId());
+            evaluationItemEntity.setProgramItems(currentUser.getProgramItemList());
+            evaluationItemEntity.setUserType(currentUser.getType());
+            //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+            evaluationItemEntity.setPermissonType(currentUser.getPermissonType());
+        }
+        Page<EvaluationItemEntity> iPage = evaluationItemMapper.findPage(page,evaluationItemEntity);
+        return iPage;
+    }
+    /**
+     * 查列表
+     */
+    public List<EvaluationItemEntity> findList(EvaluationItemEntity evaluationItemEntity) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            evaluationItemEntity.setTenantId(currentUser.getTenantId());
+            evaluationItemEntity.setProgramItems(currentUser.getProgramItemList());
+            evaluationItemEntity.setUserType(currentUser.getType());
+            //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+            evaluationItemEntity.setPermissonType(currentUser.getPermissonType());
+        }
+        return evaluationItemMapper.findList(evaluationItemEntity);
+    }
+
+    /**
+     * 批量删除
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delEvaluationItemByIds(Long[] ids) {
+        return this.removeByIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 单个删除
+     */
+    public boolean delEvaluationItemById(Long id) {
+        return this.removeById(id);
+    }
+
+    /**
+     * 保存
+     */
+    public boolean addEvaluationItem(EvaluationItemEntity evaluationItem) {
+        if (this.save(evaluationItem)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 修改根居ID
+     */
+    public boolean updateEvaluationItemById(EvaluationItemEntity evaluationItem) {
+        if (this.updateById(evaluationItem)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 根居ID获取对象
+     */
+    public EvaluationItemEntity findEvaluationItemById(Long id) {
+        return evaluationItemMapper.findEvaluationItemById(id);
+    }
+}

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationItemValueServiceImpl.java

@@ -0,0 +1,98 @@
+package com.huaxu.evaluation.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.huaxu.evaluation.dao.EvaluationItemValueMapper;
+import com.huaxu.evaluation.entity.EvaluationItemEntity;
+import com.huaxu.evaluation.entity.EvaluationItemValueEntity;
+import com.huaxu.evaluation.service.EvaluationItemValueService;
+import com.huaxu.model.LoginUser;
+import com.huaxu.util.UserUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 考评项分值Service接口
+ *
+ * @author: WYY
+ * @date 2021-05-08 09:27
+ */
+@Service
+public class EvaluationItemValueServiceImpl extends ServiceImpl<EvaluationItemValueMapper, EvaluationItemValueEntity> implements EvaluationItemValueService {
+
+    @Resource
+    private EvaluationItemValueMapper evaluationItemValueMapper;
+
+    /**
+     * 自定义分页查询，含关联实体对像
+     */
+    public IPage<EvaluationItemValueEntity> findPage(IPage<EvaluationItemValueEntity> page, EvaluationItemValueEntity evaluationItemValueEntity) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            evaluationItemValueEntity.setTenantId(currentUser.getTenantId());
+        }
+        Page<EvaluationItemValueEntity> iPage = evaluationItemValueMapper.findPage(page,evaluationItemValueEntity);
+        return iPage;
+    }
+
+    /**
+     * 查列表
+     */
+    public List<EvaluationItemValueEntity> findList(EvaluationItemValueEntity evaluationItemValueEntity) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        if(currentUser!=null) {
+            evaluationItemValueEntity.setTenantId(currentUser.getTenantId());
+        }
+        return evaluationItemValueMapper.findList(evaluationItemValueEntity);
+    }
+
+    /**
+     * 批量删除
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delEvaluationItemValueByIds(Long[] ids) {
+        return this.removeByIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 单个删除
+     */
+    public boolean delEvaluationItemValueById(Long id) {
+        return this.removeById(id);
+    }
+
+    /**
+     * 保存
+     */
+    public boolean addEvaluationItemValue(EvaluationItemValueEntity evaluationItemValue) {
+        if (this.save(evaluationItemValue)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 修改根居ID
+     */
+    public boolean updateEvaluationItemValueById(EvaluationItemValueEntity evaluationItemValue) {
+        if (this.updateById(evaluationItemValue)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 根居ID获取对象
+     */
+    public EvaluationItemValueEntity findEvaluationItemValueById(Long id) {
+        return evaluationItemValueMapper.findEvaluationItemValueById(id);
+    }
+}

operation_manager/src/main/resources/application-dev.properties

@@ -8,7 +8,7 @@ spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.hikari.max-lifetime=30000
-mybatis-plus.mapper-locations=classpath:mapper/*.xml,classpath*:mapper/task/*.xml,classpath*:mapper/order/*.xml
+mybatis-plus.mapper-locations=classpath:mapper/*.xml,classpath*:mapper/task/*.xml,classpath*:mapper/order/*.xml,classpath*:mapper/evaluation/*.xml
 mybatis-plus.type-aliases-package=com.huaxu.entity
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis-plus.global-config.db-config.logic-delete-value=0 

operation_manager/src/main/resources/application-prd.properties

@@ -8,7 +8,7 @@ spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.hikari.max-lifetime=30000
-mybatis-plus.mapper-locations=classpath:mapper/*.xml,classpath*:mapper/task/*.xml,classpath*:mapper/order/*.xml
+mybatis-plus.mapper-locations=classpath:mapper/*.xml,classpath*:mapper/task/*.xml,classpath*:mapper/order/*.xml,classpath*:mapper/evaluation/*.xml
 mybatis-plus.type-aliases-package=com.huaxu.entity
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis-plus.global-config.db-config.logic-delete-value=0 

operation_manager/src/main/resources/application-sit.properties

@@ -8,7 +8,7 @@ spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.hikari.max-lifetime=30000
-mybatis-plus.mapper-locations=classpath:mapper/*.xml,classpath*:mapper/task/*.xml,classpath*:mapper/order/*.xml
+mybatis-plus.mapper-locations=classpath:mapper/*.xml,classpath*:mapper/task/*.xml,classpath*:mapper/order/*.xml,classpath*:mapper/evaluation/*.xml
 mybatis-plus.type-aliases-package=com.huaxu.entity
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis-plus.global-config.db-config.logic-delete-value=0 

operation_manager/src/main/resources/mapper/evaluation/EvaluationCycleMapper.xml

@@ -1,4 +1,91 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huaxu.evaluation.dao.EvaluationCycleMapper" >
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaxu.evaluation.dao.EvaluationCycleMapper">
+
+
+    <resultMap type="com.huaxu.evaluation.entity.EvaluationCycleEntity" id="EvaluationCycleResult">
+        <result property="id" column="id"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="companyOrgId" column="company_org_id"/>
+        <result property="type" column="type"/>
+        <result property="evaluationDay" column="evaluation_day"/>
+        <result property="remarks" column="remarks"/>
+        <result property="status" column="status"/>
+        <result property="dateCreate" column="date_create"/>
+        <result property="createBy" column="create_by"/>
+        <result property="dateUpdate" column="date_update"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+    <!--  实体栏位  -->
+    <sql id="evaluationCycleColumns">
+         a.id as "id" ,
+         a.tenant_id as "tenantId" ,
+         a.company_org_id as "companyOrgId" ,
+         a.type as "type" ,
+         a.evaluation_day as "evaluationDay" ,
+         a.remarks as "remarks" ,
+         a.status as "status" ,
+         a.date_create as "dateCreate" ,
+         a.create_by as "createBy" ,
+         a.date_update as "dateUpdate" ,
+         a.update_by as "updateBy" 
+     </sql>
+
+
+    <!--  根据主键获取实体   -->
+    <select id="findEvaluationCycleById" resultType="com.huaxu.evaluation.entity.EvaluationCycleEntity">
+        SELECT
+        <include refid="evaluationCycleColumns"/>
+        FROM sc_evaluation_cycle a
+        WHERE a.id = #{id} and a.status=1
+    </select>
+
+    <!--  根据获取实体List   -->
+    <select id="findList" resultType="com.huaxu.evaluation.entity.EvaluationCycleEntity">
+        SELECT
+        <include refid="evaluationCycleColumns"/>
+        FROM sc_evaluation_cycle a
+
+        <where>
+            <if test="companyOrgId!=null">
+                and a.COMPANY_ORG_ID = #{companyOrgId}
+            </if>
+            and a.status=1
+            <if test="type != null ">and a.type = #{type}</if>
+            <if test="tenantId != null ">and a.tenantId = #{tenantId}</if>
+        </where>
+    </select>
+
+    <!--  根据获取实体 page   -->
+    <select id="findPage" resultType="com.huaxu.evaluation.entity.EvaluationCycleEntity">
+        SELECT
+        <include refid="evaluationCycleColumns"/>
+        FROM sc_evaluation_cycle a
+        <where>
+            <if test="evaluationCycle.companyOrgId!=null">
+                and a.COMPANY_ORG_ID = #{evaluationCycle.companyOrgId}
+            </if>
+            and a.status=1
+            <if test="evaluationCycle.type != null ">and a.type = #{evaluationCycle.type}</if>
+            <if test="evaluationCycle.tenantId != null ">and a.tenantId = #{evaluationCycle.tenantId}</if>
+            <if test="evaluationCycle.userType!=null and evaluationCycle.userType!=-999 and evaluationCycle.userType!=-9999 and  evaluationCycle.programItems != null and evaluationCycle.programItems.size() > 0">
+                <if test="evaluationCycle.permissonType == 5 or evaluationCycle.permissonType == 2">
+                    and
+                    a.COMPANY_ORG_ID in
+                    <foreach collection="evaluationCycle.programItems" item="item" open="(" close=")" separator=",">
+                        #{item.orgId}
+                    </foreach>
+                </if>
+                <if test="evaluationCycle.permissonType == 1">
+                    and a.COMPANY_ORG_ID in
+                    <foreach collection="evaluationCycle.programItems" item="item" open="(" close=")" separator=",">
+                        #{item.orgId}
+                    </foreach>
+                </if>
+            </if>
+        </where>
+    </select>
 </mapper>

operation_manager/src/main/resources/mapper/evaluation/EvaluationGradeMapper.xml

@@ -1,4 +1,97 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huaxu.evaluation.dao.EvaluationGradeMapper" >
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaxu.evaluation.dao.EvaluationGradeMapper">
+
+
+    <resultMap type="com.huaxu.evaluation.entity.EvaluationGradeEntity" id="EvaluationGradeResult">
+        <result property="id" column="id"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="companyOrgId" column="company_org_id"/>
+        <result property="evaluationGrade" column="evaluation_grade"/>
+        <result property="type" column="type"/>
+        <result property="valueOne" column="value_one"/>
+        <result property="valueTwo" column="value_two"/>
+        <result property="remarks" column="remarks"/>
+        <result property="status" column="status"/>
+        <result property="dateCreate" column="date_create"/>
+        <result property="createBy" column="create_by"/>
+        <result property="dateUpdate" column="date_update"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+    <!--  实体栏位  -->
+    <sql id="evaluationGradeColumns">
+         a.id as "id" ,
+         a.tenant_id as "tenantId" ,
+         a.company_org_id as "companyOrgId" ,
+         a.evaluation_grade as "evaluationGrade" ,
+         a.type as "type" ,
+         a.value_one as "valueOne" ,
+         a.value_two as "valueTwo" ,
+         a.remarks as "remarks" ,
+         a.status as "status" ,
+         a.date_create as "dateCreate" ,
+         a.create_by as "createBy" ,
+         a.date_update as "dateUpdate" ,
+         a.update_by as "updateBy" 
+     </sql>
+
+
+    <!--  根据主键获取实体   -->
+    <select id="findEvaluationGradeById" resultType="com.huaxu.evaluation.entity.EvaluationGradeEntity">
+        SELECT
+        <include refid="evaluationGradeColumns"/>
+        FROM sc_evaluation_grade a
+        WHERE a.id = #{id} and a.status=1
+    </select>
+
+    <!--  根据获取实体List   -->
+    <select id="findList" resultType="com.huaxu.evaluation.entity.EvaluationGradeEntity">
+        SELECT
+        <include refid="evaluationGradeColumns"/>
+        FROM sc_evaluation_grade a
+
+        <where>
+            <if test="companyOrgId!=null">
+                and a.COMPANY_ORG_ID = #{companyOrgId}
+            </if>
+            <if test="evaluationGrade != null ">and a.evaluation_grade = #{evaluationGrade}</if>
+            <if test="tenantId != null ">and a.tenantId = #{tenantId}</if>
+            and a.status=1
+        </where>
+    </select>
+
+    <!--  根据获取实体 page   -->
+    <select id="findPage" resultType="com.huaxu.evaluation.entity.EvaluationGradeEntity">
+        SELECT
+        <include refid="evaluationGradeColumns"/>
+        FROM sc_evaluation_grade a
+        <where>
+            <if test="evaluationGrade.companyOrgId!=null">
+                 and a.COMPANY_ORG_ID = #{evaluationGrade.companyOrgId}
+            </if>
+            <if test="evaluationGrade.evaluationGrade != null ">and a.evaluation_grade =
+                #{evaluationGrade.evaluationGrade}
+            </if>
+            <if test="evaluationGrade.tenantId != null ">and a.tenantId = #{evaluationGrade.tenantId}</if>
+            and a.status=1
+            <if test="evaluationGrade.userType!=null and evaluationGrade.userType!=-999 and evaluationGrade.userType!=-9999 and  evaluationGrade.programItems != null and evaluationGrade.programItems.size() > 0">
+                <if test="evaluationGrade.permissonType == 5 or evaluationGrade.permissonType == 2">
+                    and
+                    a.COMPANY_ORG_ID in
+                    <foreach collection="evaluationGrade.programItems" item="item" open="(" close=")" separator=",">
+                        #{item.orgId}
+                    </foreach>
+                </if>
+                <if test="evaluationGrade.permissonType == 1">
+                    and a.COMPANY_ORG_ID in
+                    <foreach collection="evaluationGrade.programItems" item="item" open="(" close=")" separator=",">
+                        #{item.orgId}
+                    </foreach>
+                </if>
+            </if>
+        </where>
+    </select>
 </mapper>

operation_manager/src/main/resources/mapper/evaluation/EvaluationItemMapper.xml

@@ -1,4 +1,125 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huaxu.evaluation.dao.EvaluationItemMapper" >
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaxu.evaluation.dao.EvaluationItemMapper">
+
+
+    <resultMap type="com.huaxu.evaluation.entity.EvaluationItemEntity" id="EvaluationItemResult">
+        <result property="id" column="id"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="companyOrgId" column="company_org_id"/>
+        <result property="deptOrgId" column="dept_org_id"/>
+        <result property="type" column="type"/>
+        <result property="name" column="name"/>
+        <result property="value" column="value"/>
+        <result property="valueCondition" column="value_condition"/>
+        <result property="cycle" column="cycle"/>
+        <result property="remarks" column="remarks"/>
+        <result property="status" column="status"/>
+        <result property="dateCreate" column="date_create"/>
+        <result property="createBy" column="create_by"/>
+        <result property="dateUpdate" column="date_update"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+    <!--  实体栏位  -->
+    <sql id="evaluationItemColumns">
+         a.id as "id" ,
+         a.tenant_id as "tenantId" ,
+         a.company_org_id as "companyOrgId" ,
+         a.dept_org_id as "deptOrgId" ,
+         a.type as "type" ,
+         a.name as "name" ,
+         a.value as "value" ,
+         a.value_condition as "valueCondition" ,
+         a.cycle as "cycle" ,
+         a.remarks as "remarks" ,
+         a.status as "status" ,
+         a.date_create as "dateCreate" ,
+         a.create_by as "createBy" ,
+         a.date_update as "dateUpdate" ,
+         a.update_by as "updateBy" 
+     </sql>
+
+
+    <!--  根据主键获取实体   -->
+    <select id="findEvaluationItemById" resultType="com.huaxu.evaluation.entity.EvaluationItemEntity">
+        SELECT
+        <include refid="evaluationItemColumns"/>
+        FROM sc_evaluation_item a
+
+        WHERE a.id = #{id} and a.status=1
+    </select>
+
+    <!--  根据获取实体List   -->
+    <select id="findList" resultType="com.huaxu.evaluation.entity.EvaluationItemEntity">
+        SELECT
+        <include refid="evaluationItemColumns"/>
+        FROM sc_evaluation_item a
+
+        <where>
+            <if test="companyOrgId!=null and deptOrgId!=null">
+                and a.DEPT_ORG_ID = #{deptOrgId} and a.COMPANY_ORG_ID = #{companyOrgId}
+            </if>
+
+            <if test="companyOrgId!=null and deptOrgId == null">
+                and a.DEPT_ORG_ID is null and a.COMPANY_ORG_ID = #{companyOrgId}
+            </if>
+            <if test="name != null  and name != ''">
+                and a.name LIKE concat('%',#{name},'%')
+            </if>
+            <if test="tenantId != null ">and a.tenantId = #{tenantId}</if>
+            and a.status=1
+        </where>
+    </select>
+
+    <!--  根据获取实体 page   -->
+    <select id="findPage" resultType="com.huaxu.evaluation.entity.EvaluationItemEntity">
+        SELECT
+        <include refid="evaluationItemColumns"/>
+        FROM sc_evaluation_item a
+
+        <where>
+            <if test="evaluationItem.companyOrgId!=null and evaluationItem.deptOrgId!=null">
+                and a.DEPT_ORG_ID = #{evaluationItem.deptOrgId} and a.COMPANY_ORG_ID = #{evaluationItem.companyOrgId}
+            </if>
+
+            <if test="evaluationItem.companyOrgId!=null and evaluationItem.deptOrgId == null">
+                and a.DEPT_ORG_ID is null and a.COMPANY_ORG_ID = #{evaluationItem.companyOrgId}
+            </if>
+            <if test="evaluationItem.name != null  and evaluationItem.name != ''">
+                and a.name LIKE concat('%',#{evaluationItem.name},'%')
+            </if>
+            <if test="evaluationItem.tenantId != null ">and a.tenantId = #{evaluationItem.tenantId}</if>
+            and a.status=1
+            <if test="evaluationItem.userType!=null and evaluationItem.userType!=-999 and evaluationItem.userType!=-9999 and  evaluationItem.programItems != null and evaluationItem.programItems.size() > 0">
+                <if test="evaluationItem.permissonType == 5 or evaluationItem.permissonType == 2">
+                    and ( a.DEPT_ORG_ID in
+                    <foreach collection="evaluationItem.programItems" item="item" open="(" close=")" separator=",">
+                        #{item.orgId}
+                    </foreach>
+                    or
+                    a.COMPANY_ORG_ID in
+                    <foreach collection="evaluationItem.programItems" item="item" open="(" close=")" separator=",">
+                        #{item.orgId}
+                    </foreach>
+                    )
+                </if>
+                <if test="evaluationItem.permissonType == 4 or evaluationItem.permissonType == 3">
+                    and a.DEPT_ORG_ID in
+                    <foreach collection="evaluationItem.programItems" item="item" open="(" close=")" separator=",">
+                        #{item.orgId}
+                    </foreach>
+                </if>
+                <if test="evaluationItem.permissonType == 1">
+                    and a.COMPANY_ORG_ID in
+                    <foreach collection="evaluationItem.programItems" item="item" open="(" close=")" separator=",">
+                        #{item.orgId}
+                    </foreach>
+                    and (a.DEPT_ORG_ID is null or a.DEPT_ORG_ID =0)
+                </if>
+            </if>
+        </where>
+    </select>
 </mapper>

operation_manager/src/main/resources/mapper/evaluation/EvaluationItemValueMapper.xml

@@ -1,4 +1,77 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huaxu.evaluation.dao.EvaluationItemValueMapper" >
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaxu.evaluation.mapper.EvaluationItemValueMapper">
+
+
+    <resultMap type="com.huaxu.evaluation.entity.EvaluationItemValueEntity" id="EvaluationItemValueResult">
+        <result property="id" column="id"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="evaluationItemId" column="evaluation_item_id"/>
+        <result property="type" column="type"/>
+        <result property="value" column="value"/>
+        <result property="valueOne" column="value_one"/>
+        <result property="valueTwo" column="value_two"/>
+        <result property="status" column="status"/>
+        <result property="dateCreate" column="date_create"/>
+        <result property="createBy" column="create_by"/>
+        <result property="dateUpdate" column="date_update"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+    <!--  实体栏位  -->
+    <sql id="evaluationItemValueColumns">
+         a.id as "id" ,
+         a.tenant_id as "tenantId" ,
+         a.evaluation_item_id as "evaluationItemId" ,
+         a.type as "type" ,
+         a.value as "value" ,
+         a.value_one as "valueOne" ,
+         a.value_two as "valueTwo" ,
+         a.status as "status" ,
+         a.date_create as "dateCreate" ,
+         a.create_by as "createBy" ,
+         a.date_update as "dateUpdate" ,
+         a.update_by as "updateBy" 
+     </sql>
+
+
+    <!--  根据主键获取实体   -->
+    <select id="findEvaluationItemValueById" resultType="com.huaxu.evaluation.entity.EvaluationItemValueEntity">
+        SELECT
+        <include refid="evaluationItemValueColumns"/>
+        FROM sc_evaluation_item_value a
+
+        WHERE a.id = #{id} and a.status=1
+    </select>
+
+    <!--  根据获取实体List   -->
+    <select id="findList" resultType="com.huaxu.evaluation.entity.EvaluationItemValueEntity">
+        SELECT
+        <include refid="evaluationItemValueColumns"/>
+        FROM sc_evaluation_item_value a
+
+        <where>
+            <if test="evaluationItemId != null ">and a.evaluation_item_id = #{evaluationItemId}</if>
+            <if test="tenantId != null ">and a.tenantId = #{tenantId}</if>
+        </where>
+    </select>
+
+    <!--  根据获取实体 page   -->
+    <select id="findPage" resultType="com.huaxu.evaluation.entity.EvaluationItemValueEntity">
+        SELECT
+        <include refid="evaluationItemValueColumns"/>
+        FROM sc_evaluation_item_value a
+
+        <where>
+            <if test="evaluationItemValue.evaluationItemId != null ">and a.evaluation_item_id =
+                #{evaluationItemValue.evaluationItemId}
+            </if>
+            <if test="evaluationItemValue.dateUpdate != null ">and a.date_update = #{evaluationItemValue.dateUpdate}
+            </if>
+            <if test="evaluationItemValue.tenantId != null ">and a.tenantId = #{evaluationItemValue.tenantId}</if>
+            and a.status=1
+        </where>
+    </select>
 </mapper>