考评周期、考评等级

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

@@ -41,13 +41,13 @@ public class EvaluationGradeController {
     public AjaxMessage<Pagination<EvaluationGradeEntity>> list(
             @RequestParam Integer pageNum,
             @RequestParam Integer pageSize,
-            @ApiParam(value = "绩效等级", required = false)@RequestParam(required = false) String type,
+            @ApiParam(value = "绩效等级", required = false)@RequestParam(required = false) String grade,
             @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 (grade != null)
+            entity.setEvaluationGrade(Long.valueOf(grade));
         if (companyOrgId != null)
             entity.setCompanyOrgId(companyOrgId.intValue());
         iPage = evaluationGradeService.findPage(iPage, entity);

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

@@ -37,7 +37,7 @@ public class EvaluationCycleEntity extends BaseEntity {
 
     @ApiModelProperty(value = "所属公司名称")
     @TableField(exist = false)
-    private Integer companyOrgName;
+    private String companyOrgName;
 
     /** 考评日期 */
     @ApiModelProperty(value = "考评日期")

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

@@ -32,7 +32,7 @@ public class EvaluationGradeEntity extends BaseEntity {
 
     @ApiModelProperty(value = "所属公司名称")
     @TableField(exist = false)
-    private Integer companyOrgName;
+    private String companyOrgName;
 
     /** 绩效等级(0A 1B 2C 3D 4E) */
     @ApiModelProperty(value = "绩效等级(0A 1B 2C 3D 4E)")

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

@@ -36,11 +36,11 @@ public class EvaluationItemEntity extends BaseEntity {
 
     @ApiModelProperty(value = "所属公司名称")
     @TableField(exist = false)
-    private Integer companyOrgName;
+    private String companyOrgName;
 
     @ApiModelProperty(value = "所属部门名称")
     @TableField(exist = false)
-    private Integer deptOrgName;
+    private String deptOrgName;
 
     /** 分值 */
     @ApiModelProperty(value = "分值")

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

@@ -12,7 +12,9 @@ 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.org.OrgInfoUtil;
 import com.huaxu.util.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -32,6 +34,8 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
 
     @Resource
     EvaluationCycleMapper evaluationCycleMapper;
+    @Autowired
+    private OrgInfoUtil orgInfoUtil;
     /**
      * 自定义分页查询，含关联实体对像
      */
@@ -45,6 +49,10 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
             evaluationCycleEntity.setPermissonType(currentUser.getPermissonType());
         }
         Page<EvaluationCycleEntity> iPage = evaluationCycleMapper.findPage(page, evaluationCycleEntity);
+        for(EvaluationCycleEntity item:iPage.getRecords())
+        {
+            item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId()));
+        }
         return iPage;
     }
     /**

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

@@ -9,6 +9,7 @@ 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.org.OrgInfoUtil;
 import com.huaxu.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +31,8 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
 
     @Resource
     private EvaluationGradeMapper evaluationGradeMapper;
+    @Autowired
+    private OrgInfoUtil orgInfoUtil;
     /**
      * 自定义分页查询，含关联实体对像
      */
@@ -44,6 +47,10 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
             evaluationGradeEntity.setPermissonType(currentUser.getPermissonType());
         }
         Page<EvaluationGradeEntity> iPage = evaluationGradeMapper.findPage(page,evaluationGradeEntity);
+        for(EvaluationGradeEntity item:iPage.getRecords())
+        {
+            item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId()));
+        }
         return iPage;
     }
 

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

@@ -6,11 +6,14 @@ 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.EvaluationCycleEntity;
 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.org.OrgInfoUtil;
 import com.huaxu.util.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,6 +33,8 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
 
     @Resource
     private EvaluationItemMapper evaluationItemMapper;
+    @Autowired
+    private OrgInfoUtil orgInfoUtil;
     /**
      * 自定义分页查询，含关联实体对像
      */
@@ -43,6 +48,11 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
             evaluationItemEntity.setPermissonType(currentUser.getPermissonType());
         }
         Page<EvaluationItemEntity> iPage = evaluationItemMapper.findPage(page,evaluationItemEntity);
+        for(EvaluationItemEntity item:iPage.getRecords())
+        {
+            item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId()));
+            item.setDeptOrgName(orgInfoUtil.getOrgName(item.getDeptOrgId()));
+        }
         return iPage;
     }
     /**

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

@@ -55,7 +55,7 @@
             </if>
             and a.status=1
             <if test="type != null ">and a.type = #{type}</if>
-            <if test="tenantId != null ">and a.tenantId = #{tenantId}</if>
+            <if test="tenantId != null ">and a.TENANT_ID = #{tenantId}</if>
         </where>
     </select>
 
@@ -70,7 +70,7 @@
             </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.tenantId != null ">and a.TENANT_ID = #{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

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

@@ -58,7 +58,7 @@
                 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>
+            <if test="tenantId != null ">and a.TENANT_ID = #{tenantId}</if>
             and a.status=1
         </where>
     </select>
@@ -75,7 +75,7 @@
             <if test="evaluationGrade.evaluationGrade != null ">and a.evaluation_grade =
                 #{evaluationGrade.evaluationGrade}
             </if>
-            <if test="evaluationGrade.tenantId != null ">and a.tenantId = #{evaluationGrade.tenantId}</if>
+            <if test="evaluationGrade.tenantId != null ">and a.TENANT_ID = #{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">

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

@@ -69,7 +69,7 @@
             <if test="name != null  and name != ''">
                 and a.name LIKE concat('%',#{name},'%')
             </if>
-            <if test="tenantId != null ">and a.tenantId = #{tenantId}</if>
+            <if test="tenantId != null ">and a.TENANT_ID = #{tenantId}</if>
             and a.status=1
         </where>
     </select>
@@ -91,7 +91,7 @@
             <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>
+            <if test="evaluationItem.tenantId != null ">and a.TENANT_ID = #{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">