diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPerformancescoreController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPerformancescoreController.java index 4cc0a65..2263d79 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPerformancescoreController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPerformancescoreController.java @@ -36,9 +36,19 @@ public class HuzhouPerformancescoreController { public List getPerformancescore(String type){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HuzhouPerformancescore::getType,type); + // 模板都是null + queryWrapper.isNull(HuzhouPerformancescore::getAssessmentId); return performancescoreService.list(queryWrapper); } + @GetMapping("/getPerformanceScoreByAssessmentId") + public List getPerformanceScoreByAssessmentId(String AssessmentId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouPerformancescore::getAssessmentId,AssessmentId); + return performancescoreService.list(queryWrapper); + } + + @GetMapping("/getPerforman") public List getPerforman(){ return performancescoreService.getPerforman(); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java index 99b30c7..6df2343 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java @@ -2,11 +2,13 @@ package com.easy.admin.modules.huzhou.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.easy.admin.common.api.vo.Result; import com.easy.admin.common.core.annotation.ResponseResult; import com.easy.admin.modules.huzhou.entity.HuzhouPerformancescore; import com.easy.admin.modules.huzhou.entity.HuzhouProjectassessment; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.service.IHuzhouProjectassessmentService; +import com.easy.admin.modules.huzhou.vo.SubmitRatingVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -65,4 +67,12 @@ public class HuzhouProjectassessmentController { public void uploadProjectassessmentFile(@RequestParam(value = "file") MultipartFile multipartFile,@RequestParam String id,@RequestParam String selfScores) throws IOException { projectassessmentService.uploadProjectassessmentFile(multipartFile,id,selfScores); } + + + @PostMapping("/submitRating") + public Result submitRating(@RequestBody SubmitRatingVo submitRatingVo) { + + projectassessmentService.submitRating(submitRatingVo); + return Result.ok("成功"); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml index b02f6eb..e3d0332 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml @@ -39,11 +39,10 @@ \ No newline at end of file diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerformancescore.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerformancescore.java index 0d5a7b9..1efb0c7 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerformancescore.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerformancescore.java @@ -54,5 +54,15 @@ public class HuzhouPerformancescore extends BaseEntity implements Serializable { private String type; private String isobjectivescore; + /** + * 实际分数 + */ + private Double realScores; + + /** + * 关联的评分id + */ + private String assessmentId; + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java index 2f1b548..2fc6ab1 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java @@ -1,5 +1,6 @@ package com.easy.admin.modules.huzhou.entity; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; @@ -20,6 +21,12 @@ public class HuzhouProjectassessment extends BaseEntity implements Serializable * 项目id */ private String projectId; + + /** + * 项目名称 + */ + private String projectName; + /** * 评价维度 */ @@ -74,4 +81,10 @@ public class HuzhouProjectassessment extends BaseEntity implements Serializable private String documentName; private String documentPath; + + /** + * 任务牵头处室总评分 + */ + @TableField(exist = false) + private Double totalPscores; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectassessmentService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectassessmentService.java index 8b04627..b255efe 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectassessmentService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectassessmentService.java @@ -6,6 +6,7 @@ import com.easy.admin.modules.huzhou.entity.HuzhouPerformancescore; import com.easy.admin.modules.huzhou.entity.HuzhouProjectassessment; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.vo.HuzhouProjectassessmentOV; +import com.easy.admin.modules.huzhou.vo.SubmitRatingVo; import org.checkerframework.checker.units.qual.A; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -23,4 +24,6 @@ public interface IHuzhouProjectassessmentService extends IService getProjectassessmentIncludeSys(String type, String projectId); + + void submitRating(SubmitRatingVo submitRatingVo); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index be7de42..be0f206 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -166,7 +166,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl projectassessmentPageList = projectassessmentMapper.getProjectassessmentPageList(page, projectInfoAuthSelect); - List records = projectassessmentPageList.getRecords(); - records.forEach(item->{ - if(item.getTotalPscores()==null){ - item.setTotalPscores(0); - } - - if(item.getTotalSysscores()==null){ - item.setTotalSysscores(0); - } - item.setTotalScores(item.getTotalPscores()+ item.getTotalSysscores()); - }); - projectassessmentPageList.setRecords(records); return projectassessmentPageList; } - public Page getProjectassessmentProjectPageList(Page page, HuzhouProjectinfo projectinfo){ + + public Page getProjectassessmentProjectPageList(Page page, HuzhouProjectinfo projectinfo) { ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); - return projectassessmentMapper.getProjectassessmentProjectPageList(page,projectInfoAuthSelect); + return projectassessmentMapper.getProjectassessmentProjectPageList(page, projectInfoAuthSelect); } @Override @@ -340,4 +336,42 @@ public class HuzhouProjectassessmentService extends ServiceImpl performanceScoreList = submitRatingVo.getPerformancescoreList(); + double totalRealScore = performanceScoreList.stream() + .mapToDouble(HuzhouPerformancescore::getRealScores) + .sum(); + HuzhouProjectassessmentOV huzhouProjectassessmentOV = new HuzhouProjectassessmentOV(); + + HuzhouSubProjectinfo subProjectInfo = subProjectInfoService.getById(projectid); + if (subProjectInfo != null){ + BeanUtils.copyProperties(subProjectInfo,huzhouProjectassessmentOV,"id","projectId"); + + HuzhouProjectassessment projectAssessment = new HuzhouProjectassessment(); + BeanUtils.copyProperties(huzhouProjectassessmentOV,projectAssessment,"id"); + projectAssessment.setProjectId(projectid); + projectAssessment.setPscores(String.valueOf(totalRealScore)); + // 模板名称 + projectAssessment.setDescription(huzhouPerforman.getName()); + projectassessmentMapper.insert(projectAssessment); + // 拿到生成的id再去记录 + String generateId = projectAssessment.getId(); + // 记录评分 + for (HuzhouPerformancescore huzhouPerformancescore : performanceScoreList) { + huzhouPerformancescore.setAssessmentId(generateId); + huzhouPerformancescore.setId(null); + performancescoreMapper.insert(huzhouPerformancescore); + } + + } + + + } + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java index 5f08ef8..eb17ddf 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java @@ -229,7 +229,7 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl performancescoreList; +}