Skip to content

N
notes2.0
提交 a1af7b18 authored 作者: gongwenjie's avatar gongwenjie
浏览文件
操作

Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

上级 161216c0 3db19914
隐藏空白字符变更
内嵌 并排
正在显示 包含 31 行增加 和 55 行删除
notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/ScController.java
浏览文件 @ a1af7b18
......@@ -43,7 +43,7 @@ public class ScController {
public ResponseEntity<JobResponse> add(@RequestBody ScRo scRo
) {
String saveId = scoreCoefficientService.add(scRo.toDb());
businessTreeManagement.saveAction(scRo.getUserId(),scRo.getWorkId(),Action.APPRAISAL_WORD,new Date(),"");
businessTreeManagement.saveAction(scRo.getUserId(),scRo.getWorkId(),Action.APPRAISAL_WORD,new Date()," 自我评价");
return ok(new JobResponse(saveId));
}
......@@ -60,8 +60,14 @@ public class ScController {
@ApiOperation(value = "考评信息修改.", notes = "修改必须在数据中附带id.")
public ResponseEntity<JobResponse> modify(@RequestBody ScoreCoefficient scoreCoefficient,
@RequestParam String userId) {
ScoreCoefficient scoreCoefficient1= scoreCoefficientService.findById(scoreCoefficient.getId());
String saveId = scoreCoefficientService.modify(scoreCoefficient);
businessTreeManagement.saveAction(userId,scoreCoefficient.getWordId(),Action.APPRAISAL_WORD,new Date(),"");
if (scoreCoefficient1.getScore2()==null || "".equals(scoreCoefficient1.getScore2())){
businessTreeManagement.saveAction(userId,scoreCoefficient.getWordId(),Action.APPRAISAL_WORD,new Date()," 发布者评价");
}else {
businessTreeManagement.saveAction(userId, scoreCoefficient.getWordId(), Action.APPRAISAL_WORD, new Date(), " 修改发布者评价");
}
return ok(new JobResponse(saveId));
}
......
notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/WorkController.java
浏览文件 @ a1af7b18
......@@ -6,8 +6,8 @@ import com.zjty.tynotes.job.basic.entity.request.UpdateWorkload;
import com.zjty.tynotes.job.basic.entity.request.WorkRo;
import com.zjty.tynotes.job.basic.entity.response.JobResponse;
import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
import com.zjty.tynotes.job.basic.entity.response.WorkMpping;
import com.zjty.tynotes.job.basic.entity.response.WorkVo;
import com.zjty.tynotes.job.basic.entity.response.WorkVoMapping;
import com.zjty.tynotes.job.basic.repository.WorkRepository;
import com.zjty.tynotes.job.basic.service.ConversionService;
import com.zjty.tynotes.job.basic.service.WorkService;
......@@ -179,7 +179,6 @@ public class WorkController {
return ok(new JobResponse(workId));
}
@PutMapping(value = "/select/subtasks/{workId}")
@ApiOperation(value = "根据任务id是否可以提交任务", notes = "查看是否可以提交.")
public ResponseEntity<WorkIsNotCommit> selectSubtasks(@PathVariable("workId") String workId) {
......@@ -196,10 +195,8 @@ public class WorkController {
@GetMapping(value = "/select/work/{userId}")
@ApiOperation(value = "根据用户id查看其部门所有的任务", notes = "部门所有的任务")
public ResponseEntity<WorkVoMapping> selectWorkUserId(@PathVariable("userId") String userId) {
public ResponseEntity<List<WorkMpping>> selectWorkUserId(@PathVariable("userId") String userId) {
return ok(workService.selectUserIdsWork(userId));
}
}
notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/response/WorkMpping.java
浏览文件 @ a1af7b18
......@@ -17,5 +17,9 @@ public class WorkMpping {
private String status;
private String publisherName;
private String executorName;
private List<WorkMpping> workMppings;
}
notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/response/WorkVoMapping.java deleted 100644 → 0
浏览文件 @ 161216c0
package com.zjty.tynotes.job.basic.entity.response;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(value = "查看部门任务信息和思维导图详情", description = "部门任务信息和思维导图对象")
public class WorkVoMapping {
/**
* 主任务列表
*/
private List<WorkVo> workVos;
/**
* 主任务思维导图列表
*/
private List<WorkMpping> workMppings;
}
notes-job/src/main/java/com/zjty/tynotes/job/basic/service/WorkService.java
浏览文件 @ a1af7b18
......@@ -2,8 +2,7 @@ package com.zjty.tynotes.job.basic.service;
import com.zjty.tynotes.job.basic.entity.database.Work;
import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
import com.zjty.tynotes.job.basic.entity.response.WorkVo;
import com.zjty.tynotes.job.basic.entity.response.WorkVoMapping;
import com.zjty.tynotes.job.basic.entity.response.WorkMpping;
import com.zjty.tynotes.job.basic.service.impl.WorkServiceImpl;
import org.springframework.stereotype.Service;
......@@ -146,7 +145,7 @@ public interface WorkService {
* @param userId 用户id
* @return 返回所有任务
*/
WorkVoMapping selectUserIdsWork(String userId);
List<WorkMpping> selectUserIdsWork(String userId);
......
notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/PriviceServiceImpl.java
浏览文件 @ a1af7b18
package com.zjty.tynotes.job.basic.service.impl;
import com.zjty.tynotes.job.basic.entity.database.Work;
import com.zjty.tynotes.job.basic.entity.response.WorkVo;
import com.zjty.tynotes.job.basic.repository.WorkRepository;
import com.zjty.tynotes.job.basic.service.PriviceService;
import com.zjty.tynotes.job.common.exception.NotFoundException;
......@@ -17,6 +16,11 @@ public class PriviceServiceImpl implements PriviceService {
return superoirIdWork(superoirId);
}
/**
* 递归调用查询主任务
* @param superoirId 上级任务id
* @return work对象
*/
private Work superoirIdWork(String superoirId){
if (!workRepository.existsById(superoirId)){
throw new NotFoundException(String.format("[job] id为 %s 的任务不存在.", superoirId));
......
notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/WorkServiceImpl.java
浏览文件 @ a1af7b18
......@@ -6,8 +6,6 @@ import com.zjty.tynotes.job.basic.entity.database.Work;
import com.zjty.tynotes.job.basic.entity.database.WorkTime;
import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
import com.zjty.tynotes.job.basic.entity.response.WorkMpping;
import com.zjty.tynotes.job.basic.entity.response.WorkVo;
import com.zjty.tynotes.job.basic.entity.response.WorkVoMapping;
import com.zjty.tynotes.job.basic.repository.WorkRepository;
import com.zjty.tynotes.job.basic.service.ConversionService;
import com.zjty.tynotes.job.basic.service.ScoreCoefficientService;
......@@ -20,21 +18,16 @@ import com.zjty.tynotes.job.common.exception.NotFoundException;
import com.zjty.tynotes.pas.entity.vo.HolidayRequest;
import com.zjty.tynotes.pas.service.ConfigService;
import com.zjty.tynotes.pas.service.IUserService;
import com.zjty.tynotes.pas.service.impl.UserServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
......@@ -314,28 +307,28 @@ return 0.0f;
}
@Override
public WorkVoMapping selectUserIdsWork(String userId) {
public List<WorkMpping> selectUserIdsWork(String userId) {
List<Work> works= workRepository.findAllByExecutorIn(iUserService.findUsers(userId));
List<WorkVo> workVos=new ArrayList<>();
List<WorkMpping> workMppings=new ArrayList<>();
for (Work work:works){
if (work.getSuperiorId()==null || work.getSuperiorId().equals("")){
workVos.add(conversionService.workToVo(work));
workMppings.add(new WorkMpping(work.getId(),work.getTitle(),work.getStatus(),workMppingList(work,works)));
workMppings.add(new WorkMpping(work.getId(),work.getTitle(),work.getStatus(),iUserService.findUserById(work.getPublisher()).getUsername(),iUserService.findUserById(work.getExecutor()).getUsername(),workMppingList(work,works)));
}else {
//如果上级id不为空 查询works中是否有这个任务的上级任务 如没有这个任务在这次查询中视为主任务显示。
boolean falg=true;
for (Work work1:works) {
if (work.getSuperiorId().equals(work1.getId())){
falg=false;
}
}
if (falg){
workVos.add(conversionService.workToVo(work));
workMppings.add(new WorkMpping(work.getId(),work.getTitle(),work.getStatus(),workMppingList(work,works)));
workMppings.add(new WorkMpping(work.getId(),work.getTitle(),work.getStatus(),iUserService.findUserById(work.getPublisher()).getUsername(),iUserService.findUserById(work.getExecutor()).getUsername(),workMppingList(work,works)));
}
}
}
return new WorkVoMapping(workVos,workMppings);
return workMppings;
}
......@@ -351,7 +344,7 @@ return 0.0f;
return workMppings;
}
for (Work work1:works){
workMppings.add(new WorkMpping(work1.getId(),work1.getTitle(),work1.getStatus(),workMppingList(work1,workList)));
workMppings.add(new WorkMpping(work1.getId(),work1.getTitle(),work1.getStatus(),iUserService.findUserById(work1.getPublisher()).getUsername(),iUserService.findUserById(work1.getExecutor()).getUsername(),workMppingList(work1,workList)));
}
return workMppings;
}
......
notes-job/src/main/java/com/zjty/tynotes/job/status/service/impl/BusinessTreeManagementImpl.java
浏览文件 @ a1af7b18
......@@ -180,13 +180,8 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
break;
case 9:
ScoreCoefficient scoreCoefficient= scoreCoefficientRepository.findByWordId(work.getId()).get(0);
String actionMsg = null;
if (scoreCoefficient.getScore1()!=null){
actionMsg=name+" 自我评价";
}else if (scoreCoefficient.getScore2()!=null){
actionMsg=name+" 发布者评价";
}
String actionMsg = name +msg;
actionHistory.setActionMsg(actionMsg);
actionHistoryRepository.save(actionHistory);
testService.appraisal(noteResource.getId(),actionMsg,work);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论