OA/zentao
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug添加备注

Browse Source
This commit is contained in:
郭其兵
2025-05-23 09:21:02 +08:00
parent acb8eb9532
commit b86a29658e
9 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sa/zentao/controller/ZtBugController.java
View File

@ -124,6 +124,12 @@ public class ZtBugController {
return Result.success(bugService.bugListByTaskStory(dto));
}
//添加备注
@RequestMapping(value = "/addRemark", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result addRemark(@RequestBody ZtBugDTO dto){
bugService.addRemark(dto);
return Result.success();
}
}

1
src/main/java/com/sa/zentao/service/IZtBugService.java
View File

@ -62,4 +62,5 @@ public interface IZtBugService extends IService<ZtBug> {
List<ZtBug> getDevBugList(List<ZtBug> bugList);
void addRemark(ZtBugDTO dto);
}

11
src/main/java/com/sa/zentao/service/impl/IZtCountService.java
View File

@ -2833,12 +2833,21 @@ public class IZtCountService {
BigDecimal finishPunctuality =BigDecimal.ZERO;
int kfzCount=0;
List multipleUserList= getmultipleDepartProjectTeam(firstDayOfMonth,lastDayOfMonth);
//分配总工时
List<ZtTask> taskList = this.taskService.taskListByEIdsAndDate(firstDayOfMonth, lastDayOfMonth, pIds);
BigDecimal totalTime = floatBatchAdd(this.taskService.getNormalTaskList(taskList).stream().map(o -> o.getConsumed()).collect(Collectors.toList()));
for (PerformanceDTO performanceDTO : performanceDTOS) {
ZtUser ztUser = userMap.get(performanceDTO.getAccount());
if (ztUser != null && ztUser.getUserType() == UserType.KFZ) {
//如果多项目组 那么 分配任务工时占 总工时的% TODO
if(multipleUserList.contains(ztUser.getAccount())){
examineTime = examineTime.add(performanceDTO.getAllocationTime());
examineTime =
examineTime.add(
(BigDecimalUtils.isZero(performanceDTO.getAllocationTime())||BigDecimalUtils.isZero(totalTime))?BigDecimal.ZERO:
(performanceDTO.getAllocationTime().divide(totalTime,2,BigDecimal.ROUND_HALF_UP))
.multiply(performanceDTO.getExamineTime())
);
}else{
examineTime = examineTime.add(performanceDTO.getExamineTime());
}

25
src/main/java/com/sa/zentao/service/impl/ZtBugServiceImpl.java
View File

@ -90,6 +90,9 @@ public class ZtBugServiceImpl extends ServiceImpl<ZtBugMapper, ZtBug> implements
@Autowired
private IZtBugBoundUserService bugBoundUserService;
@Autowired
private VxService vxService;
@Override
public PageInfo<ZtBugDTO> bugPageList(ZtProjectQo qo) {
@ -604,6 +607,17 @@ public class ZtBugServiceImpl extends ServiceImpl<ZtBugMapper, ZtBug> implements
return bugList.stream().filter(o->"dev".equals(o.getBugType())||"releaseBug".equals(o.getBugType())).collect(Collectors.toList());
}
@Override
public void addRemark(ZtBugDTO dto) {
ZtBug ztBug = this.baseMapper.selectById(dto.getId());
if(ztBug==null){
throw new BusinessException("未查询到数据");
}
actionService.addAction(ActionType.BUG, ActionStatus.TJBZ, dto.getId(), ztBug.getProduct()==null?null:ztBug.getProduct().toString(), ztBug.getProject(), ztBug.getExecution(),
RiskUserThreadLocal.get().getName(), dto.getRemark(), "");
}
@Override
@Transactional
@ -653,11 +667,12 @@ public class ZtBugServiceImpl extends ServiceImpl<ZtBugMapper, ZtBug> implements
if(dto.getExecution()!=null&&dto.getExecution()!=0){
kanbanlaneService.addBug(dto.getExecution(), Arrays.asList(ztBug));
}
Integer tostory = ztBug.getTostory();
if(ztBug.getFeedback()!=null&&ztBug.getFeedback()!=0){
this.storyFeedbackService.feedbackStart(ztBug.getFeedback());
}
this.actionService.addAction(ActionType.BUG, ActionStatus.XJ,ztBug.getId(),ztBug.getProject()+"",ztBug.getProject(),ztBug.getExecution()
this.actionService.addAction(ActionType.BUG, ActionStatus.XJ,ztBug.getId(),ztBug.getProduct()+"",ztBug.getProject(),ztBug.getExecution()
,RiskUserThreadLocal.get().getName(),"",""
);
@ -817,7 +832,6 @@ public class ZtBugServiceImpl extends ServiceImpl<ZtBugMapper, ZtBug> implements
kanbanlaneService.changeStatus(ztBug.getExecution(), ztBug.getId(), "bug", "fixed");
}
if(ztBug.getFeedback()!=null&&ztBug.getFeedback()!=0){
this.storyFeedbackService.feedbackStart(ztBug.getFeedback());
this.storyFeedbackService.feedbackFinished(ztBug.getFeedback(),null);
}
@ -858,8 +872,7 @@ public class ZtBugServiceImpl extends ServiceImpl<ZtBugMapper, ZtBug> implements
);
}
@Autowired
private VxService vxService;
private void bugSendMessage(Integer id, String oldUser, String newUser) {
if (ObjectUtils.notEqual(oldUser, newUser) && !StringUtils.isEmpty(newUser)) {

1
src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java
View File

@ -1555,6 +1555,7 @@ public class ZtProjectServiceImpl extends ServiceImpl<ZtProjectMapper, ZtProject
return new ArrayList<>();
}
List<ZtTask> list = this.taskService.list(new QueryWrapper<ZtTask>().lambda()
.select(SFunctionColums.taskColumes())
.notIn(ZtTask::getStatus,"cancel","closed","reviewing" ,"draft")
.ge(ZtTask::getEstStarted, firstDayOfMonth)
.le(ZtTask::getEstStarted, lastDayOfMonth).in(ZtTask::getAssignedTo,teams.stream().map(o->o.getAccount()).collect(Collectors.toList())));

4
src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java
View File

@ -186,9 +186,9 @@ public class ZtStoryFeedbackServiceImpl extends ServiceImpl<ZtStoryFeedbackMappe
ZtProduct ztProduct = this.productService.getById(ztStoryFeedback.getProduct());
ZtProject ztProject = this.projectService.getById(ztProduct);
// ZtProject ztProject = this.projectService.getById(ztProduct);
addFeedbackMessage(ztStoryFeedback.getId(),addName,ztProject.getPm());
addFeedbackMessage(ztStoryFeedback.getId(),addName,ztProduct.getPo());
actionService.addAction(ActionType.WTFK, ActionStatus.XJ, ztStoryFeedback.getId(), ztStoryFeedback.getProduct() + "", null, null,
RiskUserThreadLocal.get() == null ? "admin" : RiskUserThreadLocal.get().getName(), "", "");
}

3
src/main/java/com/sa/zentao/service/impl/ZtStoryServiceImpl.java
View File

@ -207,9 +207,10 @@ public class ZtStoryServiceImpl extends ServiceImpl<ZtStoryMapper, ZtStory> impl
if (dto.getFeedback() != null && dto.getFeedback() != 0) {
ZtStoryFeedback storyFeedback = this.storyFeedbackService.getById(dto.getFeedback());
if (!storyFeedback.getStatus().equals("wait")) {
if (!Arrays.asList("wait","doing").contains(storyFeedback.getStatus())) {
throw new BusinessException("问题反馈已被处理");
}
this.storyFeedbackService.feedbackStart(dto.getFeedback());
}
if (dto.getUserStory() != null && dto.getUserStory() != 0) {
ZtStoryUser storyUser = storyUserService.getById(dto.getUserStory());

16
src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
View File

@ -539,9 +539,9 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
@Override
@Transactional
public void addTask(ZtTaskDTO dto) {
if(dto.getDeadline()==null||dto.getEstStarted()==null){
throw new BusinessException("请录入开始结束日期");
}
// if(dto.getDeadline()==null||dto.getEstStarted()==null){
// throw new BusinessException("请录入开始结束日期");
// }
ZtTask ztTask = new ZtTask();
BeanUtils.copyProperties(dto, ztTask);
ztTask.setOpenedby(RiskUserThreadLocal.get().getName());
@ -621,7 +621,9 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
ztTask.setEstimate(ztTask.getUseTime().floatValue());
ztTask.setLeft(ztTask.getUseTime().floatValue());
}
if(ztTask.getDeadline()==null){
throw new BusinessException("当前环境异常请联系管理员");
}
this.baseMapper.insert(ztTask);
if ("wait".equals(ztTask.getStatus())) {
this.storyService.taskFinishChangeStatus(ztTask.getStory(), null, TaskType.transferType(ztTask.getType()), false);
@ -655,6 +657,11 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
if (ztTask.getStatus().equals("reviewing")) {
taskSendPsMessage(ztTask.getId(), null, ztProject.getPm());
}
if (ztTask.getFeedback() != null && ztTask.getFeedback() != 0) {
this.storyFeedbackService.feedbackStart(ztTask.getFeedback());
}
taskSendZpMessage(ztTask.getId(), null, ztTask.getAssignedTo());
@ -819,7 +826,6 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
} else {
this.storyFeedbackService.feedbackFinished(ztTask.getFeedback(),ztTask.getFeedbackRemark());
}
}
if (dto.getConsumed() > 0) {
ZtEffortDTO e = new ZtEffortDTO();

2
src/main/resources/mapper/ZtStoryFeedbackMapper.xml
View File

@ -59,7 +59,7 @@
AND ys_flag=2
</when>
<when test="qo.status == 'wait'">
AND and s.status = #{qo.status} and ys_flag in (null,0)
AND s.status = #{qo.status} and ys_flag in (null,0)
</when>
<otherwise>
and s.status = #{qo.status}