Commit 83ef4276 authored by wanglong's avatar wanglong

修复问题分类后因流程问题造成的错误闭环

parent e31922b2
...@@ -78,6 +78,8 @@ public class QualityProblemDto extends BaseDto { ...@@ -78,6 +78,8 @@ public class QualityProblemDto extends BaseDto {
@ApiModelProperty(value = "是否限期内整改(1是/0否)") @ApiModelProperty(value = "是否限期内整改(1是/0否)")
private Boolean rectifyWithinTime; private Boolean rectifyWithinTime;
//问题分类更新截止时间
private Date dateTime;
/** /**
* 项目名称 * 项目名称
......
...@@ -161,7 +161,7 @@ public class QualityProblemController extends BaseController { ...@@ -161,7 +161,7 @@ public class QualityProblemController extends BaseController {
} }
} }
QualityProblem qualityProblem = new QualityProblem(); QualityProblemDto qualityProblem = new QualityProblemDto();
BeanUtils.copyProperties(qualityProblemDto,qualityProblem); BeanUtils.copyProperties(qualityProblemDto,qualityProblem);
return ResponseHelper.buildResponse(qualityProblemServiceImpl.updateItem(qualityProblem,sequenceNbr)); return ResponseHelper.buildResponse(qualityProblemServiceImpl.updateItem(qualityProblem,sequenceNbr));
} }
......
...@@ -86,7 +86,7 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua ...@@ -86,7 +86,7 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
return page; return page;
} }
public String updateItem(QualityProblem qualityProblem, Long sequenceNbr){ public String updateItem(QualityProblemDto qualityProblem, Long sequenceNbr){
QualityProblem quality = this.getById(sequenceNbr); QualityProblem quality = this.getById(sequenceNbr);
if(ProblemProcessEnum.确定问题.getName().equals(quality.getStatus())) { if(ProblemProcessEnum.确定问题.getName().equals(quality.getStatus())) {
//监检机构确定问题 //监检机构确定问题
...@@ -132,10 +132,10 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua ...@@ -132,10 +132,10 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
//获取ProblemType状态 //获取ProblemType状态
if(quality.getProblemType()){ if(quality.getProblemType()){
//拿到qualityProblem更新到数据库 //拿到qualityProblem更新到数据库
quality.setSubmitDate(qualityProblem.getDateTime());
problemInitiationService.execute(quality.getInstanceId(),quality,"0"); problemInitiationService.execute(quality.getInstanceId(),quality,"0");
}else { }else {
problemInitiationService.execute(quality.getInstanceId(),quality,"1"); problemInitiationService.execute(quality.getInstanceId(),quality,"1");
} }
}else if(ProblemProcessEnum.审查整改过程.getName().equals(quality.getStatus())) { }else if(ProblemProcessEnum.审查整改过程.getName().equals(quality.getStatus())) {
quality.setHandingOpinion(qualityProblem.getHandingOpinion()); quality.setHandingOpinion(qualityProblem.getHandingOpinion());
......
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