UAT问题清单,79条,法规清单增加验证、设计符合性流程 责任确认截止日期字段。
认证清单数据字典项修改sql更新。
This commit is contained in:
+11
@@ -511,4 +511,15 @@ public class ProjectLawsInventoryEO implements Serializable {
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "流程结束时间 最后的时间")
|
||||
private Date processEndTime;
|
||||
|
||||
/**设计符合性确认-责任确认截止时间*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "设计符合性确认-责任确认截止时间")
|
||||
private Date designDutyDueDate;
|
||||
/**验证符合性确认-责任确认截止时间*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "验证符合性确认-责任确认截止时间")
|
||||
private Date verifyDutyDueDate;
|
||||
}
|
||||
|
||||
+5
-2
@@ -9,9 +9,12 @@ import com.jero.common.constant.enums.CutEnum;
|
||||
public enum CertificationProgressEnum {
|
||||
TEST_PASSED("实验通过","Test passed"),
|
||||
TEST_FAILED("实验失败","Test failed"),
|
||||
NOT_START("待开始","Not start"),
|
||||
NOT_START("未开始","Not start"),
|
||||
IN_PROGRESS("进行中","In progress"),
|
||||
NA("不涉及","NA"),
|
||||
// NA("不涉及","NA"),// 04-12弃用,
|
||||
COMPONENT_REPORT_NOT_SUBMITTED("部件报告未提交","Component report not submitted"),
|
||||
COMPONENT_REPORT_SUBMITTED("部件报告已提交","Component report submitted"),
|
||||
COMPONENT_REPORT_HAS_BEEN_STORED("部件报告已入库","Component report has been stored"),
|
||||
;
|
||||
|
||||
String name;
|
||||
|
||||
+4
-3
@@ -361,9 +361,10 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
|
||||
|
||||
//2. 认证进度(不涉及/待开始/进行中/实验失败/实验通过)
|
||||
if(StringUtils.isNotBlank(certificationProgressTemp)){
|
||||
if(CertificationProgressEnum.NA.getValue().equals(certificationProgressTemp)){
|
||||
na++;
|
||||
}else if(CertificationProgressEnum.NOT_START.getValue().equals(certificationProgressTemp)){
|
||||
// if(CertificationProgressEnum.NA.getValue().equals(certificationProgressTemp)){
|
||||
// na++;
|
||||
// }else
|
||||
if(CertificationProgressEnum.NOT_START.getValue().equals(certificationProgressTemp)){
|
||||
notStart++;
|
||||
}else if(CertificationProgressEnum.IN_PROGRESS.getValue().equals(certificationProgressTemp)){
|
||||
inProgress++;
|
||||
|
||||
Reference in New Issue
Block a user