Commit 4b7cd60c authored by 王蔡翾's avatar 王蔡翾
Browse files

项目和考核

parent 1d964e64
...@@ -7,6 +7,7 @@ import com.platform.projectBusiness.service.BsProjectRoleAssessmentService; ...@@ -7,6 +7,7 @@ import com.platform.projectBusiness.service.BsProjectRoleAssessmentService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -27,4 +28,18 @@ public class BsProjectRoleAssessmentController extends BsProjectController{ ...@@ -27,4 +28,18 @@ public class BsProjectRoleAssessmentController extends BsProjectController{
public Result<List<BsProjectRoleAssessmentVO>> tree(BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO) { public Result<List<BsProjectRoleAssessmentVO>> tree(BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO) {
return Result.data(bsProjectRoleAssessmentService.queryListByProjectIdAndRole(bsProjectRoleAssessmentDTO)); return Result.data(bsProjectRoleAssessmentService.queryListByProjectIdAndRole(bsProjectRoleAssessmentDTO));
} }
@ApiOperation(value = "项目考核标准新增")
@PostMapping("/add")
public Result<Boolean> add(List<BsProjectRoleAssessmentDTO> assessmentDTOS){
return Result.data(bsProjectRoleAssessmentService.addAssessment(assessmentDTOS));
}
@ApiOperation(value = "项目考核标准更新")
@PutMapping("/update")
public Result<Boolean> update(List<BsProjectRoleAssessmentDTO> assessmentDTOS){
return Result.data(bsProjectRoleAssessmentService.updateBatchAssessment(assessmentDTOS));
}
} }
...@@ -5,7 +5,9 @@ import com.platform.model.resp.Result; ...@@ -5,7 +5,9 @@ import com.platform.model.resp.Result;
import com.platform.page.TableDataInfo; import com.platform.page.TableDataInfo;
import com.platform.projectBusiness.model.dto.SysUserDTO; import com.platform.projectBusiness.model.dto.SysUserDTO;
import com.platform.projectBusiness.model.entity.LoginEntity; import com.platform.projectBusiness.model.entity.LoginEntity;
import com.platform.projectBusiness.model.vo.SysUserVO;
import com.platform.projectBusiness.service.SysUserService; import com.platform.projectBusiness.service.SysUserService;
import com.platform.projectBusiness.util.JwtUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -19,6 +21,8 @@ public class SysUserController extends BaseController { ...@@ -19,6 +21,8 @@ public class SysUserController extends BaseController {
@Resource @Resource
private SysUserService sysUserService; private SysUserService sysUserService;
@Resource
private JwtUtil jwtUtil;
@PostMapping("/page") @PostMapping("/page")
...@@ -52,4 +56,14 @@ public class SysUserController extends BaseController { ...@@ -52,4 +56,14 @@ public class SysUserController extends BaseController {
} }
@ApiOperation(value = "获取当前用户信息")
@GetMapping("/getSelf")
public Result<SysUserVO> getSelf(@RequestHeader("authorization") String token){
SysUserDTO sysUserDTO = new SysUserDTO();
String userName = jwtUtil.getUserNameFromToken(token);
sysUserDTO.setUserName(userName);
return Result.data(sysUserService.getSelf(sysUserDTO));
}
} }
...@@ -16,7 +16,7 @@ public interface SysRolePermissionMapper extends BaseMapper<SysRolePermissionEnt ...@@ -16,7 +16,7 @@ public interface SysRolePermissionMapper extends BaseMapper<SysRolePermissionEnt
* @param roleId * @param roleId
* @return * @return
*/ */
List<SysRolePermissionVO> queryPermission(String roleId); List<SysRolePermissionVO> queryPermission(Integer roleId);
/** /**
......
...@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class BsProjectDTO extends BsProjectEntity { public class BsProjectDTO extends BsProjectEntity {
...@@ -14,4 +16,8 @@ public class BsProjectDTO extends BsProjectEntity { ...@@ -14,4 +16,8 @@ public class BsProjectDTO extends BsProjectEntity {
@ApiModelProperty(value = "每页显示的数量", example = "10") @ApiModelProperty(value = "每页显示的数量", example = "10")
private Integer pageSize; private Integer pageSize;
@ApiModelProperty(value = "项目成员列表")
private List<BsProjectPeopleScoreDTO> bsProjectPeopleScoreDTOList;
} }
package com.platform.projectBusiness.model.dto; package com.platform.projectBusiness.model.dto;
import com.platform.projectBusiness.model.entity.BsProjectRoleAssessmentEntity; import com.platform.projectBusiness.model.entity.BsProjectRoleAssessmentEntity;
import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class BsProjectRoleAssessmentDTO extends BsProjectRoleAssessmentEntity { public class BsProjectRoleAssessmentDTO extends BsProjectRoleAssessmentEntity {
@ApiModelProperty("子集考核节点")
private List<BsProjectRoleAssessmentDTO> children;
} }
...@@ -26,4 +26,8 @@ public class BsProjectEntity { ...@@ -26,4 +26,8 @@ public class BsProjectEntity {
private String description; private String description;
@ApiModelProperty("项目状态") @ApiModelProperty("项目状态")
private String status; private String status;
@ApiModelProperty("周期")
@TableField("cycle")
private Integer cycle;
} }
...@@ -34,4 +34,8 @@ public class BsProjectPeopleScoreDetailEntity { ...@@ -34,4 +34,8 @@ public class BsProjectPeopleScoreDetailEntity {
@TableField(value = "status") @TableField(value = "status")
private String status; private String status;
@ApiModelProperty("考核模板打分项id")
@TableField("assessment_id")
private Integer assessmentId;
} }
...@@ -22,4 +22,8 @@ public class SysUserEntity { ...@@ -22,4 +22,8 @@ public class SysUserEntity {
private String phone; private String phone;
@TableField("email") @TableField("email")
private String email; private String email;
@TableField("dept_id")
private Integer deptId;
@TableField("role_id")
private Integer roleId;
} }
...@@ -5,10 +5,17 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -5,10 +5,17 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysUserVO extends SysUserEntity { public class SysUserVO extends SysUserEntity {
@ApiModelProperty(value = "部门名")
private String deptName;
@ApiModelProperty(value = "角色名")
private String roleName;
@ApiModelProperty(value = "权限列表")
private List<SysRolePermissionVO> sysRolePermissionVOS;
} }
...@@ -2,8 +2,10 @@ package com.platform.projectBusiness.service; ...@@ -2,8 +2,10 @@ package com.platform.projectBusiness.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO; import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO;
import com.platform.projectBusiness.model.dto.BsProjectRoleAssessmentDTO;
import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreDetailEntity; import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreDetailEntity;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO; import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO;
import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO;
import java.util.List; import java.util.List;
......
...@@ -4,9 +4,15 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,9 +4,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.projectBusiness.model.dto.BsProjectRoleAssessmentDTO; import com.platform.projectBusiness.model.dto.BsProjectRoleAssessmentDTO;
import com.platform.projectBusiness.model.entity.BsProjectRoleAssessmentEntity; import com.platform.projectBusiness.model.entity.BsProjectRoleAssessmentEntity;
import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO; import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
public interface BsProjectRoleAssessmentService extends IService<BsProjectRoleAssessmentEntity> { public interface BsProjectRoleAssessmentService extends IService<BsProjectRoleAssessmentEntity> {
List<BsProjectRoleAssessmentVO> queryListByProjectIdAndRole(BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO); List<BsProjectRoleAssessmentVO> queryListByProjectIdAndRole(BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO);
boolean addAssessment(List<BsProjectRoleAssessmentDTO> bsProjectRoleAssessmentDTOS);
@Transactional
boolean updateBatchAssessment(List<BsProjectRoleAssessmentDTO> assessmentList);
} }
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.projectBusiness.model.dto.BsProjectDTO; import com.platform.projectBusiness.model.dto.BsProjectDTO;
import com.platform.projectBusiness.model.entity.BsProjectEntity; import com.platform.projectBusiness.model.entity.BsProjectEntity;
import com.platform.projectBusiness.model.vo.BsProjectVO; import com.platform.projectBusiness.model.vo.BsProjectVO;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
...@@ -11,4 +12,7 @@ public interface BsProjectService extends IService<BsProjectEntity> { ...@@ -11,4 +12,7 @@ public interface BsProjectService extends IService<BsProjectEntity> {
List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO); List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO);
BsProjectVO geDetail(Integer projectId); BsProjectVO geDetail(Integer projectId);
@Transactional
boolean addOrUpdateProject(BsProjectDTO bsProjectDTO);
} }
...@@ -20,5 +20,5 @@ public interface SysRolePermissionService extends IService<SysRolePermissionEnti ...@@ -20,5 +20,5 @@ public interface SysRolePermissionService extends IService<SysRolePermissionEnti
* @param roleId roleId * @param roleId roleId
* @return List<SysRolePermissionVO> * @return List<SysRolePermissionVO>
*/ */
List<SysRolePermissionVO> queryPermission(String roleId); List<SysRolePermissionVO> queryPermission(Integer roleId);
} }
...@@ -16,4 +16,6 @@ public interface SysUserService extends IService<SysUserEntity> { ...@@ -16,4 +16,6 @@ public interface SysUserService extends IService<SysUserEntity> {
boolean addOrUpdateUser(SysUserDTO sysUserDTO); boolean addOrUpdateUser(SysUserDTO sysUserDTO);
LoginEntity login(LoginEntity login); LoginEntity login(LoginEntity login);
SysUserVO getSelf(SysUserDTO sysUserDTO);
} }
...@@ -80,6 +80,8 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject ...@@ -80,6 +80,8 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject
entity.setAssessmentStandard(currentNode.getAssessmentStandard()); entity.setAssessmentStandard(currentNode.getAssessmentStandard());
entity.setPercentage(currentNode.getPercentage()); entity.setPercentage(currentNode.getPercentage());
entity.setParentId(parentId); entity.setParentId(parentId);
entity.setAssessmentId(currentNode.getId());
// 保存当前节点并获取ID // 保存当前节点并获取ID
BsProjectPeopleScoreDetailEntity savedEntity = addAndGetId(entity); BsProjectPeopleScoreDetailEntity savedEntity = addAndGetId(entity);
......
...@@ -41,7 +41,6 @@ public class BsProjectPeopleScoreServiceImpl extends ServiceImpl<BsProjectPeople ...@@ -41,7 +41,6 @@ public class BsProjectPeopleScoreServiceImpl extends ServiceImpl<BsProjectPeople
bsProjectPeopleScoreDetailDTO.setProjectId(bsProjectPeopleScoreDTO.getProjectId()); bsProjectPeopleScoreDetailDTO.setProjectId(bsProjectPeopleScoreDTO.getProjectId());
bsProjectPeopleScoreDetailDTO.setProjectPeople(bsProjectPeopleScoreDTO.getProjectPeople()); bsProjectPeopleScoreDetailDTO.setProjectPeople(bsProjectPeopleScoreDTO.getProjectPeople());
bsProjectPeopleScoreDetailDTO.setProjectRole(bsProjectPeopleScoreDTO.getProjectRole()); bsProjectPeopleScoreDetailDTO.setProjectRole(bsProjectPeopleScoreDTO.getProjectRole());
bsProjectPeopleScoreDetailService.addProjectPeopleScoreDetail(bsProjectPeopleScoreDetailDTO);
return save(bsProjectPeopleScoreDTO); return save(bsProjectPeopleScoreDTO);
} }
......
...@@ -2,18 +2,33 @@ package com.platform.projectBusiness.service.impl; ...@@ -2,18 +2,33 @@ package com.platform.projectBusiness.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.projectBusiness.mapper.BsProjectRoleAssessmentMapper; import com.platform.projectBusiness.mapper.BsProjectRoleAssessmentMapper;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO;
import com.platform.projectBusiness.model.dto.BsProjectRoleAssessmentDTO; import com.platform.projectBusiness.model.dto.BsProjectRoleAssessmentDTO;
import com.platform.projectBusiness.model.entity.BsProjectRoleAssessmentEntity; import com.platform.projectBusiness.model.entity.BsProjectRoleAssessmentEntity;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO;
import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO; import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO;
import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import com.platform.projectBusiness.service.BsProjectRoleAssessmentService; import com.platform.projectBusiness.service.BsProjectRoleAssessmentService;
import com.platform.utils.DozerUtils;
import com.platform.utils.StringUtils; import com.platform.utils.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*; import java.util.*;
@Service @Service
public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRoleAssessmentMapper, BsProjectRoleAssessmentEntity> implements BsProjectRoleAssessmentService { public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRoleAssessmentMapper, BsProjectRoleAssessmentEntity> implements BsProjectRoleAssessmentService {
@Resource
private BsProjectPeopleScoreDetailService bsProjectPeopleScoreDetailService;
@Resource
private BsProjectPeopleScoreService bsProjectPeopleScoreService;
@Override @Override
public List<BsProjectRoleAssessmentVO> queryListByProjectIdAndRole(BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO){ public List<BsProjectRoleAssessmentVO> queryListByProjectIdAndRole(BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO){
...@@ -52,4 +67,115 @@ public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRol ...@@ -52,4 +67,115 @@ public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRol
return result; return result;
} }
/**
* 添加项目考核项模板同时给对应的项目成员添加考核项
*/
@Override
public boolean addAssessment(List<BsProjectRoleAssessmentDTO> bsProjectRoleAssessmentDTOS) {
BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO = bsProjectRoleAssessmentDTOS.get(0);
// 添加项目考核项 - 处理树形结构并设置parent_id
processAssessmentTree(bsProjectRoleAssessmentDTOS, null);
// 查询项目中特定角色成员
BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO = new BsProjectPeopleScoreDTO();
bsProjectPeopleScoreDTO.setProjectId(bsProjectRoleAssessmentDTO.getProjectId());
bsProjectPeopleScoreDTO.setProjectRole(bsProjectRoleAssessmentDTO.getProjectRole());
List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOS = bsProjectPeopleScoreService.qyeryProjectPeopleScoreList(bsProjectPeopleScoreDTO);
// 给项目中项目角色对应的成员添加考核项
for (BsProjectPeopleScoreVO bsProjectPeopleScoreVO : bsProjectPeopleScoreVOS) {
BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO = new BsProjectPeopleScoreDetailDTO();
bsProjectPeopleScoreDetailDTO.setProjectId(bsProjectRoleAssessmentDTO.getProjectId());
bsProjectPeopleScoreDetailDTO.setProjectPeople(bsProjectPeopleScoreVO.getProjectPeople());
bsProjectPeopleScoreDetailDTO.setProjectRole(bsProjectRoleAssessmentDTO.getProjectRole());
bsProjectPeopleScoreDetailService.addProjectPeopleScoreDetail(bsProjectPeopleScoreDetailDTO);
}
return true;
}
/**
* 递归处理考核项树形结构,设置parent_id并保存到数据库
* @param assessmentList 考核项列表
* @param parentId 父节点ID(根节点的parentId为null)
*/
private void processAssessmentTree(List<BsProjectRoleAssessmentDTO> assessmentList, Integer parentId) {
if (assessmentList == null || assessmentList.isEmpty()) {
return;
}
for (BsProjectRoleAssessmentDTO assessmentDTO : assessmentList) {
// 创建实体对象并设置parent_id
BsProjectRoleAssessmentEntity entity = DozerUtils.convertBean(assessmentDTO, BsProjectRoleAssessmentEntity.class);
entity.setParentId(parentId);
// 保存到数据库并获取生成的ID
BsProjectRoleAssessmentEntity savedEntity = addAndGetId(entity);
Integer currentId = savedEntity.getId();
// 如果有子节点,递归处理子节点
if (assessmentDTO.getChildren() != null && !assessmentDTO.getChildren().isEmpty()) {
processAssessmentTree(assessmentDTO.getChildren(), currentId);
}
}
}
/*
* 添加项目考核项并获取id
*/
private BsProjectRoleAssessmentEntity addAndGetId(BsProjectRoleAssessmentEntity bsProjectRoleAssessmentEntity) {
baseMapper.insert(bsProjectRoleAssessmentEntity);
return bsProjectRoleAssessmentEntity;
}
/**
* 批量更新项目考核项
*/
@Transactional
@Override
public boolean updateBatchAssessment(List<BsProjectRoleAssessmentDTO> assessmentList){
// 批量更新项目角色对应考核项模板
updateBatchById(DozerUtils.convertList(assessmentList, BsProjectRoleAssessmentEntity.class));
//更新实际人员对应考核项
updateAssessmentTree(assessmentList);
return true;
}
/**
* 递归处理考核项树形结构,更新相关联项目人员对应的考核项
* @param assessmentList 考核项列表
*/
private void updateAssessmentTree(List<BsProjectRoleAssessmentDTO> assessmentList) {
if (assessmentList == null || assessmentList.isEmpty()) {
return;
}
for (BsProjectRoleAssessmentDTO assessmentDTO : assessmentList) {
// 创建实体对象并设置parent_id
BsProjectRoleAssessmentEntity entity = DozerUtils.convertBean(assessmentDTO, BsProjectRoleAssessmentEntity.class);
//获取关联项目人员对应的考核项
BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO = new BsProjectPeopleScoreDetailDTO();
bsProjectPeopleScoreDetailDTO.setAssessmentId(assessmentDTO.getId());
List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOS = bsProjectPeopleScoreDetailService.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO);
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : bsProjectPeopleScoreDetailVOS) {
bsProjectPeopleScoreDetailVO.setAssessmentDescription(assessmentDTO.getAssessmentDescription());
bsProjectPeopleScoreDetailVO.setAssessmentStandard(assessmentDTO.getAssessmentStandard());
bsProjectPeopleScoreDetailVO.setPercentage(assessmentDTO.getPercentage());
bsProjectPeopleScoreDetailService.updateById(bsProjectPeopleScoreDetailVO);
}
// 如果有子节点,递归处理子节点
if (assessmentDTO.getChildren() != null && !assessmentDTO.getChildren().isEmpty()) {
updateAssessmentTree(assessmentDTO.getChildren());
}
}
}
} }
...@@ -6,6 +6,7 @@ import com.platform.projectBusiness.model.dto.BsProjectDTO; ...@@ -6,6 +6,7 @@ import com.platform.projectBusiness.model.dto.BsProjectDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDTO; import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO; import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO;
import com.platform.projectBusiness.model.entity.BsProjectEntity; import com.platform.projectBusiness.model.entity.BsProjectEntity;
import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreEntity;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO; import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO; import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO;
import com.platform.projectBusiness.model.vo.BsProjectVO; import com.platform.projectBusiness.model.vo.BsProjectVO;
...@@ -14,8 +15,10 @@ import com.platform.projectBusiness.service.BsProjectPeopleScoreService; ...@@ -14,8 +15,10 @@ import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import com.platform.projectBusiness.service.BsProjectService; import com.platform.projectBusiness.service.BsProjectService;
import com.platform.utils.DozerUtils; import com.platform.utils.DozerUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.List; import java.util.List;
@Service @Service
...@@ -34,7 +37,22 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject ...@@ -34,7 +37,22 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
*/ */
@Override @Override
public List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO){ public List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO){
return baseMapper.queryProjectList(bsProjectDTO); List<BsProjectVO> bsProjectVOList = baseMapper.queryProjectList(bsProjectDTO);
for (BsProjectVO bsProjectVO : bsProjectVOList){
//获取项目创建时间
LocalDate createTime = bsProjectVO.getCreateTime();
//根据周期判断状态
if (LocalDate.now().isAfter(createTime.plusDays(bsProjectVO.getCycle()))
&&LocalDate.now().isBefore(createTime.plusDays(bsProjectVO.getCycle() * 2))){
bsProjectVO.setStatus("立项中");
}
if (LocalDate.now().isAfter(createTime.plusDays(bsProjectVO.getCycle() * 2))){
bsProjectVO.setStatus("已完结");
}
save(DozerUtils.convertBean(bsProjectVO,BsProjectEntity.class));
}
return bsProjectVOList;
} }
...@@ -78,5 +96,13 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject ...@@ -78,5 +96,13 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
return bsProjectVO; return bsProjectVO;
} }
@Transactional
@Override
public boolean addOrUpdateProject(BsProjectDTO bsProjectDTO){
//添加项目成员和得分
bsProjectPeopleScoreService.saveBatch(DozerUtils.convertList(bsProjectDTO.getBsProjectPeopleScoreDTOList(), BsProjectPeopleScoreEntity.class));
return saveOrUpdate(DozerUtils.convertBean(bsProjectDTO,BsProjectEntity.class));
}
} }
...@@ -28,7 +28,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM ...@@ -28,7 +28,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
* @return List<SysRolePermissionVO> * @return List<SysRolePermissionVO>
*/ */
@Override @Override
public List<SysRolePermissionVO> queryPermission(String roleId) { public List<SysRolePermissionVO> queryPermission(Integer roleId) {
return baseMapper.queryPermission(roleId); return baseMapper.queryPermission(roleId);
} }
......
...@@ -6,7 +6,9 @@ import com.platform.projectBusiness.mapper.SysUserMapper; ...@@ -6,7 +6,9 @@ import com.platform.projectBusiness.mapper.SysUserMapper;
import com.platform.projectBusiness.model.dto.SysUserDTO; import com.platform.projectBusiness.model.dto.SysUserDTO;
import com.platform.projectBusiness.model.entity.LoginEntity; import com.platform.projectBusiness.model.entity.LoginEntity;
import com.platform.projectBusiness.model.entity.SysUserEntity; import com.platform.projectBusiness.model.entity.SysUserEntity;
import com.platform.projectBusiness.model.vo.SysRolePermissionVO;
import com.platform.projectBusiness.model.vo.SysUserVO; import com.platform.projectBusiness.model.vo.SysUserVO;
import com.platform.projectBusiness.service.SysRolePermissionService;
import com.platform.projectBusiness.service.SysUserService; import com.platform.projectBusiness.service.SysUserService;
import com.platform.projectBusiness.util.JwtUtil; import com.platform.projectBusiness.util.JwtUtil;
import com.platform.utils.StringUtils; import com.platform.utils.StringUtils;
...@@ -22,6 +24,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity ...@@ -22,6 +24,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
@Resource @Resource
private JwtUtil jwtUtil; private JwtUtil jwtUtil;
@Resource
private SysRolePermissionService sysRolePermissionService;
// 查询用户列表 // 查询用户列表
@Override @Override
public List<SysUserVO> queryUserList(SysUserDTO sysUserDTO) { public List<SysUserVO> queryUserList(SysUserDTO sysUserDTO) {
...@@ -78,5 +85,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity ...@@ -78,5 +85,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
} }
@Override
public SysUserVO getSelf(SysUserDTO sysUserDTO){
List<SysUserVO> sysUserVOList = queryUserList(sysUserDTO);
SysUserVO sysUserVO =new SysUserVO();
// 获取当前用户信息
if (!sysUserVOList.isEmpty()){
sysUserVO = sysUserVOList.get(0);
}
//获取当前用户权限
List<SysRolePermissionVO> sysRolePermissionVOList = sysRolePermissionService.queryPermission(sysUserVO.getRoleId());
sysUserVO.setSysRolePermissionVOS(sysRolePermissionVOList);
return sysUserVO;
}
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment