Commit 3e438774 authored by 王蔡翾's avatar 王蔡翾
Browse files

项目和考核

parent cb70e7fa
......@@ -62,6 +62,14 @@
<artifactId>common-swagger</artifactId>
<version>1.0.0</version>
</dependency>
<!-- BCrypt 密码加密 -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
......
......@@ -7,9 +7,7 @@ import com.platform.projectBusiness.model.vo.BsProjectVO;
import com.platform.projectBusiness.service.BsProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
......@@ -29,4 +27,11 @@ public class BsProjectController extends BaseController {
return Result.data(bsProjectService.queryProjectList(bsProjectDTO));
}
@ApiOperation(value = "项目详情")
@GetMapping("/{id}")
public Result<BsProjectVO> detail(@PathVariable Integer id){
return Result.data(bsProjectService.geDetail(id));
}
}
package com.platform.projectBusiness.controller;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import com.platform.projectBusiness.model.dto.SysDeptDTO;
import com.platform.projectBusiness.model.vo.SysDeptVO;
import com.platform.projectBusiness.service.SysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@Api(tags = "部门管理")
@RestController
@RequestMapping("/dept")
public class SysDeptController extends BaseController {
@Resource
private SysDeptService sysDeptService;
@ApiOperation(value = "查询所有部门--树形结构")
@GetMapping("/list")
public Result<List<SysDeptVO>> list() {
SysDeptDTO sysDeptDTO = new SysDeptDTO();
return Result.data(sysDeptService.queryPositionList(sysDeptDTO));
}
@ApiOperation(value = "新增或者修改")
@PostMapping("/addOrUpdate")
public Result<Boolean> addOrUpdate(SysDeptDTO sysDeptDTO) {
return Result.data(sysDeptService.saveOrUpdate(sysDeptDTO));
}
@ApiOperation(value = "删除")
@DeleteMapping("/delete/{id}")
public Result<Boolean> delete(@PathVariable Integer id) {
return Result.data(sysDeptService.removeById(id));
}
}
package com.platform.projectBusiness.controller;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import com.platform.projectBusiness.model.dto.SysRoleDTO;
import com.platform.projectBusiness.model.vo.SysRoleVO;
import com.platform.projectBusiness.service.SysRoleService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@Api(tags = "角色管理")
@RestController
@RequestMapping("/role")
public class SysRoleController extends BaseController {
@Resource
private SysRoleService sysRoleService;
@PostMapping("/list")
public Result<List<SysRoleVO>> list(){
return Result.data(sysRoleService.queryRoleList());
}
@PostMapping("/add")
public Result<Boolean> add(SysRoleDTO sysRoleDTO){
return Result.data(sysRoleService.saveOrUpdate(sysRoleDTO));
}
@DeleteMapping("/delete/{id}")
public Result<Boolean> delete(@PathVariable Integer id){
return Result.data(sysRoleService.removeById(id));
}
}
package com.platform.projectBusiness.controller;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import com.platform.page.TableDataInfo;
import com.platform.projectBusiness.model.dto.SysUserDTO;
import com.platform.projectBusiness.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@Api(tags = "用户管理")
@RestController
@RequestMapping("/user")
public class SysUserController extends BaseController {
@Resource
private SysUserService sysUserService;
@PostMapping("/page")
@ApiOperation(value = "分页")
public TableDataInfo page(SysUserDTO sysUserDTO) {
startPage(sysUserDTO.getPageNum(), sysUserDTO.getPageSize());
return getDataTable(sysUserService.queryUserList(sysUserDTO));
}
@ApiOperation(value = "新增用户")
@PostMapping("/addOrUpdate")
public Result<Boolean> add(SysUserDTO sysUserDTO){
if (sysUserService.addOrUpdateUser(sysUserDTO)){
return Result.success("用户添加成功");
}else {
return Result.fail("账号重复请重新添加");
}
}
@ApiOperation(value = "删除用户")
@DeleteMapping("/delete/{id}")
public Result<Boolean> delete(@PathVariable Integer id) {
return Result.data(sysUserService.removeById(id));
}
}
......@@ -13,4 +13,8 @@ public interface BsProjectPeopleScoreDetailMapper extends BaseMapper<BsProjectPe
List<BsProjectPeopleScoreDetailVO> queryProjectPeopleScoreDetailList(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO);
List<BsProjectPeopleScoreDetailVO> queryScoreDetailListCount(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO);
}
......@@ -31,4 +31,7 @@ public class BsProjectPeopleScoreDetailEntity {
@TableField("level")
private Integer level;
@TableField(value = "status")
private String status;
}
......@@ -12,4 +12,11 @@ import java.util.List;
public class BsProjectPeopleScoreVO extends BsProjectPeopleScoreEntity {
@ApiModelProperty(value = "项目人员得分详情树形结构列表")
private List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOList;
@ApiModelProperty(value = "项目人员考核完成率---对于自己需要打分的项来说")
private String completeRate;
@ApiModelProperty(value = "项目人员考核项数量占比")
private String proportion;
}
......@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class BsProjectVO extends BsProjectEntity {
......@@ -15,4 +17,7 @@ public class BsProjectVO extends BsProjectEntity {
@ApiModelProperty("考核完成率")
private String checkCompleteRate;
@ApiModelProperty("项目成员得分")
private List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOList;
}
......@@ -15,4 +15,6 @@ public interface BsProjectPeopleScoreDetailService extends IService<BsProjectPeo
boolean addProjectPeopleScoreDetail(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO);
Boolean updateScoresForForest(List<BsProjectPeopleScoreDetailDTO> allNodes);
List<BsProjectPeopleScoreDetailVO> queryScoreDetailListCount(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO);
}
......@@ -9,4 +9,6 @@ import java.util.List;
public interface BsProjectService extends IService<BsProjectEntity> {
List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO);
BsProjectVO geDetail(Integer projectId);
}
......@@ -11,4 +11,6 @@ public interface SysUserService extends IService<SysUserEntity> {
List<SysUserVO> queryUserList(SysUserDTO sysUserDTO);
boolean addOrUpdateUser(SysUserDTO sysUserDTO);
}
......@@ -10,7 +10,6 @@ import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO;
import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectRoleAssessmentService;
import com.platform.utils.DozerUtils;
import com.platform.utils.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -224,6 +223,15 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject
}
/**
* 获取已完成考核项
*/
@Override
public List<BsProjectPeopleScoreDetailVO> queryScoreDetailListCount(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO){
return baseMapper.queryScoreDetailListCount(bsProjectPeopleScoreDetailDTO);
}
......
......@@ -3,16 +3,30 @@ package com.platform.projectBusiness.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.projectBusiness.mapper.BsProjectMapper;
import com.platform.projectBusiness.model.dto.BsProjectDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO;
import com.platform.projectBusiness.model.entity.BsProjectEntity;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO;
import com.platform.projectBusiness.model.vo.BsProjectVO;
import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import com.platform.projectBusiness.service.BsProjectService;
import com.platform.utils.DozerUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProjectEntity> implements BsProjectService {
@Resource
private BsProjectPeopleScoreService bsProjectPeopleScoreService;
@Resource
private BsProjectPeopleScoreDetailService bsProjectPeopleScoreDetailService;
/**
* 查询项目列表
* @param bsProjectDTO
......@@ -24,4 +38,45 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
}
@Override
public BsProjectVO geDetail(Integer projectId){
BsProjectEntity bsProjectEntity = getById(projectId);
BsProjectVO bsProjectVO = DozerUtils.convertBean(bsProjectEntity,BsProjectVO.class);
//获取项目成员得分
BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO = new BsProjectPeopleScoreDTO();
bsProjectPeopleScoreDTO.setProjectId(projectId);
List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOList = bsProjectPeopleScoreService.qyeryProjectPeopleScoreList(bsProjectPeopleScoreDTO);
bsProjectVO.setBsProjectPeopleScoreVOList(bsProjectPeopleScoreVOList);
bsProjectVO.setProjectPeopleNum(bsProjectPeopleScoreVOList.size());
//获取项目所有需要打分项
BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO1 = new BsProjectPeopleScoreDetailDTO();
bsProjectPeopleScoreDetailDTO1.setProjectId(projectId);
List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOList = bsProjectPeopleScoreDetailService.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO1);
int needNum = bsProjectPeopleScoreDetailVOList.size();
//获取项目完成率
int completeNum = 0;
for (BsProjectPeopleScoreVO bsProjectPeopleScoreVO : bsProjectPeopleScoreVOList){
//统计所有成员完成数量
if ("已完成".equals(bsProjectPeopleScoreVO.getStatus())){
completeNum++;
}
//统计各个成员完成率
int completeNum1 = 0;
BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO = new BsProjectPeopleScoreDetailDTO();
bsProjectPeopleScoreDetailDTO.setProjectId(projectId);
bsProjectPeopleScoreDetailDTO.setProjectPeople(bsProjectPeopleScoreVO.getProjectPeople());
List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailDTOList = bsProjectPeopleScoreDetailService.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO);
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : bsProjectPeopleScoreDetailDTOList){
if ("已完成".equals(bsProjectPeopleScoreDetailVO.getStatus())){
completeNum1++;
}
}
bsProjectPeopleScoreVO.setProportion(String.format("%.2f",bsProjectPeopleScoreDetailDTOList.size() * 100.0 / needNum));
bsProjectPeopleScoreVO.setCompleteRate(String.format("%.2f",completeNum1 * 100.0 / bsProjectPeopleScoreDetailDTOList.size()));
}
bsProjectVO.setCheckCompleteRate(String.format("%.2f",completeNum * 100.0 / bsProjectPeopleScoreVOList.size()));
return bsProjectVO;
}
}
......@@ -6,17 +6,38 @@ import com.platform.projectBusiness.model.dto.SysUserDTO;
import com.platform.projectBusiness.model.entity.SysUserEntity;
import com.platform.projectBusiness.model.vo.SysUserVO;
import com.platform.projectBusiness.service.SysUserService;
import com.platform.utils.StringUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity> implements SysUserService {
private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
// 查询用户列表
@Override
public List<SysUserVO> queryUserList(SysUserDTO sysUserDTO) {
return baseMapper.queryUserList(sysUserDTO);
}
@Override
public boolean addOrUpdateUser(SysUserDTO sysUserDTO) {
try {
if (sysUserDTO.getId() == null) {
if (StringUtils.isNotEmpty(sysUserDTO.getPassword())) {
String encodedPassword = passwordEncoder.encode(sysUserDTO.getPassword());
sysUserDTO.setPassword(encodedPassword); // 将加密后的密码设置回去
}
}
return saveOrUpdate(sysUserDTO);
}catch (Exception e){
return false;
}
}
}
......@@ -12,7 +12,8 @@
parent_id,
score,
percentage,
level
level,
status
from
bs_project_people_score_detail
<where>
......@@ -22,6 +23,35 @@
<if test="projectPeople != null and projectPeople != ''">
project_people = #{projectPeople}
</if>
<if test="status != null and status != ''">
status = #{status}
</if>
</where>
</select>
<select id="queryScoreDetailListCount" resultType="com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO">
select
id,
project_id,
project_people,
assessment_description,
assessment_standard,
parent_id,
score,
percentage,
level,
status
from
bs_project_people_score_detail
<where>
<if test="projectId != null and projectId != ''">
project_id = #{projectId}
</if>
<if test="projectPeople != null and projectPeople != ''">
project_people = #{projectPeople}
</if>
and status = '已完成'
</where>
</select>
......
......@@ -9,9 +9,20 @@
nick_name,
phone,
email,
password
password,
role_id
from
sys_user
<where>
<if test="userName != null and userName != ''">
user_name =#{userName}
</if>
<if test="roleId != null and roleId != ''">
role_id =#{roleId}
</if>
</where>
</select>
</mapper>
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