Merge remote-tracking branch 'origin/20210223' into 20210223

operation_manager/src/main/java/com/huaxu/client/UserCenterClient.java

@@ -45,7 +45,7 @@ public interface UserCenterClient {
     List<Org> getAllByTenantId();
 
     @PostMapping(value = "/org/get")
-    AjaxMessage<Org> selectOne(@RequestParam Integer id);
+    AjaxMessage<Org> selectOne(@RequestParam(value = "id") Integer id);
     /**
      * 通过父配置id查询数据
      */

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

@@ -49,10 +49,12 @@ public class EvaluationCycleController {
             @RequestParam(required = false) Long companyOrgId) {
         IPage<EvaluationCycleEntity> iPage = new Page<>(pageNum, pageSize);
         EvaluationCycleEntity entity = new EvaluationCycleEntity();
-        if (type != null && type.trim() != "")
+        if (type != null && type.trim() != "") {
             entity.setType(Integer.valueOf(type));
-        if (companyOrgId != null)
+        }
+        if (companyOrgId != null) {
             entity.setCompanyOrgId(companyOrgId.intValue());
+        }
         iPage = evaluationCycleService.findPage(iPage, entity);
         Pagination<EvaluationCycleEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);

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

@@ -49,10 +49,12 @@ public class EvaluationGradeController {
             ) {
         IPage<EvaluationGradeEntity> iPage = new Page<>(pageNum, pageSize);
         EvaluationGradeEntity entity = new EvaluationGradeEntity();
-        if (grade != null && grade.trim() != "")
+        if (grade != null && grade.trim() != "") {
             entity.setEvaluationGrade(Long.valueOf(grade));
-        if (companyOrgId != null)
+        }
+        if (companyOrgId != null) {
             entity.setCompanyOrgId(companyOrgId.intValue());
+        }
         iPage = evaluationGradeService.findPage(iPage, entity);
         Pagination<EvaluationGradeEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);

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

@@ -39,15 +39,15 @@ public class EvaluationItemController{
     @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 (deptOrgId != null)
+        if (deptOrgId != null) {
             entity.setDeptOrgId(deptOrgId.intValue());
+        }
         iPage = evaluationItemService.findPage(iPage, entity);
         Pagination<EvaluationItemEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);

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

@@ -11,6 +11,7 @@ import com.huaxu.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 /**
  * sc_evaluation_item_value
@@ -27,6 +28,14 @@ public class EvaluationItemValueEntity extends BaseEntity {
     @ApiModelProperty(value = "名称")
     private Long evaluationItemId;
 
+    @ApiModelProperty(value = "所属公司ID")
+    @TableField(exist = false)
+    private Integer companyOrgId;
+
+    @ApiModelProperty(value = "所属部门ID")
+    @TableField(exist = false)
+    private Integer deptOrgId;
+
     /** 类型(0大于等于 2小于 1介于) */
     @ApiModelProperty(value = "类型(0大于等于 2小于 1介于)")
     private Long type;

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

@@ -55,4 +55,6 @@ public interface EvaluationItemValueService {
      */
     public EvaluationItemValueEntity findEvaluationItemValueById(Long id);
 
+    public boolean saveOrUpdate(EvaluationItemValueEntity evaluationItemValue);
+
 }

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

@@ -42,6 +42,7 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
     /**
      * 自定义分页查询，含关联实体对像
      */
+    @Override
     public IPage<EvaluationCycleEntity> findPage(IPage<EvaluationCycleEntity> page, EvaluationCycleEntity evaluationCycleEntity) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if(currentUser!=null) {
@@ -61,6 +62,7 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
     /**
      * 查列表
      */
+    @Override
     public List<EvaluationCycleEntity> findList(EvaluationCycleEntity evaluationCycleEntity) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if(currentUser!=null) {
@@ -76,6 +78,7 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
     /**
      * 批量删除
      */
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean delEvaluationCycleByIds(Long[] ids) {
         return this.removeByIds(Arrays.asList(ids));
@@ -84,6 +87,7 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
     /**
      * 单个删除
      */
+    @Override
     public boolean delEvaluationCycleById(Long id) {
         return this.removeById(id);
     }
@@ -91,6 +95,7 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
     /**
      * 保存
      */
+    @Override
     public boolean addEvaluationCycle(EvaluationCycleEntity evaluationCycle) {
         if (this.save(evaluationCycle)) {
             return true;
@@ -109,6 +114,7 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
     /**
      * 修改根居ID
      */
+    @Override
     public boolean updateEvaluationCycleById(EvaluationCycleEntity evaluationCycle) {
         if (this.updateById(evaluationCycle)) {
             return true;
@@ -119,6 +125,7 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
     /**
      * 根居ID获取对象
      */
+    @Override
     public EvaluationCycleEntity findEvaluationCycleById(Long id) {
         return evaluationCycleMapper.findEvaluationCycleById(id);
     }

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

@@ -42,6 +42,7 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
     /**
      * 自定义分页查询，含关联实体对像
      */
+    @Override
     public IPage<EvaluationGradeEntity> findPage(IPage<EvaluationGradeEntity> page, EvaluationGradeEntity evaluationGradeEntity) {
 
         LoginUser currentUser = UserUtil.getCurrentUser();
@@ -55,10 +56,12 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
         Page<EvaluationGradeEntity> iPage = evaluationGradeMapper.findPage(page, evaluationGradeEntity);
         for (EvaluationGradeEntity item : iPage.getRecords()) {
             item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId()));
-            if (item.getType() != null)
+            if (item.getType() != null) {
                 item.setTypeName(dictUtil.getDictName("SC_EVALUATION_GRADE_TYPE", item.getType().intValue()));
-            if (item.getEvaluationGrade() != null)
+            }
+            if (item.getEvaluationGrade() != null) {
                 item.setEvaluationGradeName(dictUtil.getDictName("SC_EVALUATION_GRADE", item.getEvaluationGrade().intValue()));
+            }
         }
         return iPage;
     }
@@ -66,6 +69,7 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
     /**
      * 查列表
      */
+    @Override
     public List<EvaluationGradeEntity> findList(EvaluationGradeEntity evaluationGradeEntity) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if(currentUser!=null) {
@@ -81,6 +85,7 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
     /**
      * 批量删除
      */
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean delEvaluationGradeByIds(Long[] ids) {
         return this.removeByIds(Arrays.asList(ids));
@@ -89,6 +94,7 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
     /**
      * 单个删除
      */
+    @Override
     public boolean delEvaluationGradeById(Long id) {
         return this.removeById(id);
     }
@@ -96,6 +102,7 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
     /**
      * 保存
      */
+    @Override
     public boolean addEvaluationGrade(EvaluationGradeEntity evaluationGrade) {
         if (this.save(evaluationGrade)) {
             return true;
@@ -114,6 +121,7 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
     /**
      * 修改根居ID
      */
+    @Override
     public boolean updateEvaluationGradeById(EvaluationGradeEntity evaluationGrade) {
         if (this.updateById(evaluationGrade)) {
             return true;
@@ -124,6 +132,7 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
     /**
      * 根居ID获取对象
      */
+    @Override
     public EvaluationGradeEntity findEvaluationGradeById(Long id) {
         return evaluationGradeMapper.findEvaluationGradeById(id);
     }

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

@@ -44,6 +44,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 自定义分页查询，含关联实体对像
      */
+    @Override
     public IPage<EvaluationItemEntity> findPage(IPage<EvaluationItemEntity> page, EvaluationItemEntity evaluationItemEntity) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if (currentUser != null) {
@@ -82,6 +83,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 查列表
      */
+    @Override
     public List<EvaluationItemEntity> findList(EvaluationItemEntity evaluationItemEntity) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if(currentUser!=null) {
@@ -97,6 +99,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 批量删除
      */
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean delEvaluationItemByIds(Long[] ids) {
         return this.removeByIds(Arrays.asList(ids));
@@ -105,6 +108,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 单个删除
      */
+    @Override
     public boolean delEvaluationItemById(Long id) {
         boolean result = this.removeById(id);
         if (result) {
@@ -116,6 +120,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 保存
      */
+    @Override
     public boolean addEvaluationItem(EvaluationItemEntity evaluationItem) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         for (Integer itemCompanyId : evaluationItem.getDeptOrgIds()) {
@@ -148,6 +153,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 修改根居ID
      */
+    @Override
     public boolean updateEvaluationItemById(EvaluationItemEntity evaluationItem) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if (this.updateById(evaluationItem)) {
@@ -172,6 +178,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 根居ID获取对象
      */
+    @Override
     public EvaluationItemEntity findEvaluationItemById(Long id) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         EvaluationItemEntity entity = evaluationItemMapper.findEvaluationItemById(id);

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

@@ -35,6 +35,7 @@ public class EvaluationItemValueServiceImpl extends ServiceImpl<EvaluationItemVa
     /**
      * 自定义分页查询，含关联实体对像
      */
+    @Override
     public IPage<EvaluationItemValueEntity> findPage(IPage<EvaluationItemValueEntity> page, EvaluationItemValueEntity evaluationItemValueEntity) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if(currentUser!=null) {
@@ -47,6 +48,7 @@ public class EvaluationItemValueServiceImpl extends ServiceImpl<EvaluationItemVa
     /**
      * 查列表
      */
+    @Override
     public List<EvaluationItemValueEntity> findList(EvaluationItemValueEntity evaluationItemValueEntity) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if(currentUser!=null) {
@@ -58,6 +60,7 @@ public class EvaluationItemValueServiceImpl extends ServiceImpl<EvaluationItemVa
     /**
      * 批量删除
      */
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean delEvaluationItemValueByIds(Long[] ids) {
         return this.removeByIds(Arrays.asList(ids));
@@ -66,6 +69,7 @@ public class EvaluationItemValueServiceImpl extends ServiceImpl<EvaluationItemVa
     /**
      * 单个删除
      */
+    @Override
     public boolean delEvaluationItemValueById(Long id) {
         return this.removeById(id);
     }
@@ -73,6 +77,7 @@ public class EvaluationItemValueServiceImpl extends ServiceImpl<EvaluationItemVa
     /**
      * 保存
      */
+    @Override
     public boolean addEvaluationItemValue(EvaluationItemValueEntity evaluationItemValue) {
         if (this.save(evaluationItemValue)) {
             return true;
@@ -83,6 +88,7 @@ public class EvaluationItemValueServiceImpl extends ServiceImpl<EvaluationItemVa
     /**
      * 修改根居ID
      */
+    @Override
     public boolean updateEvaluationItemValueById(EvaluationItemValueEntity evaluationItemValue) {
         if (this.updateById(evaluationItemValue)) {
             return true;
@@ -93,12 +99,14 @@ public class EvaluationItemValueServiceImpl extends ServiceImpl<EvaluationItemVa
     /**
      * 根居ID获取对象
      */
+    @Override
     public EvaluationItemValueEntity findEvaluationItemValueById(Long id) {
         return evaluationItemValueMapper.findEvaluationItemValueById(id);
     }
     /**
      * 修改状态为删除
      */
+    @Override
     public boolean updateByItemId(Long id) {
         return evaluationItemValueMapper.updateByItemId(id);
     }

operation_manager/src/main/java/com/huaxu/org/OrgInfoUtil.java

@@ -3,6 +3,8 @@ package com.huaxu.org;
 import com.huaxu.client.UserCenterClient;
 import com.huaxu.util.RedisUtil;
 import com.huaxu.util.UserUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -60,11 +62,18 @@ public class OrgInfoUtil {
         Integer parentId = null;
         Org org = userCenterClient.selectOne(id).getData();
         Org parentOrg = new Org();
-        parentOrg.setOrgType(org.getOrgType());
-        while (!parentOrg.getOrgType().equals("company")) {
-            if (org.getParentOrgId().equals(0)) break;
-            Org temp = userCenterClient.selectOne(org.getParentOrgId()).getData();
+        BeanUtils.copyProperties(org,parentOrg);
+        while ("department".equals(parentOrg.getOrgType())) {
+            if (parentOrg.getParentOrgId().equals(0)|| parentOrg.getParentOrgId()==null) {
+                break;
+            }
+            Org temp = userCenterClient.selectOne(parentOrg.getParentOrgId()).getData();
             parentOrg.setOrgType(temp.getOrgType());
+            parentOrg.setId(temp.getId());
+            parentOrg.setParentOrgId(temp.getParentOrgId());
+            if ("company".equals(temp.getOrgType())) {
+                parentId = temp.getId();
+            }
         }
         return parentId;
     }

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

@@ -56,6 +56,7 @@
             <if test="evaluationItemId != null ">and a.evaluation_item_id = #{evaluationItemId}</if>
             <if test="tenantId != null ">and a.TENANT_ID = #{tenantId}</if>
         </where>
+        and a.status=1
     </select>
 
     <!--  根据获取实体 page   -->