UAT问题清单,序号34,认证清单 退回增加原因。
This commit is contained in:
+3
@@ -219,4 +219,7 @@ public class ProjectCertificationInventoryEO implements Serializable {
|
|||||||
// @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
|
// @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String endTimeStr;
|
private String endTimeStr;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String reasonForReturn;
|
||||||
}
|
}
|
||||||
|
|||||||
+16
@@ -1478,6 +1478,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
if(StringUtils.isEmpty(ids)){
|
if(StringUtils.isEmpty(ids)){
|
||||||
throw new JeroBootException("至少选择一条数据进行操作!");
|
throw new JeroBootException("至少选择一条数据进行操作!");
|
||||||
}
|
}
|
||||||
|
String reasonForReturn = json.getString("reasonForReturn");
|
||||||
|
|
||||||
List<String> idList = Arrays.asList(ids.split(","));
|
List<String> idList = Arrays.asList(ids.split(","));
|
||||||
|
|
||||||
List<String> flowStatusList = new ArrayList<>();
|
List<String> flowStatusList = new ArrayList<>();
|
||||||
@@ -1493,6 +1495,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
}
|
}
|
||||||
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
|
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
|
||||||
projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
|
projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
|
||||||
|
projectCertificationInventoryEO.setReasonForReturn(reasonForReturn);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue());
|
this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue());
|
||||||
@@ -1846,6 +1849,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
if(StringUtils.isEmpty(ids)){
|
if(StringUtils.isEmpty(ids)){
|
||||||
throw new JeroBootException("至少选择一条数据进行操作!");
|
throw new JeroBootException("至少选择一条数据进行操作!");
|
||||||
}
|
}
|
||||||
|
String reasonForReturn = json.getString("reasonForReturn");
|
||||||
|
|
||||||
List<String> idList = Arrays.asList(ids.split(","));
|
List<String> idList = Arrays.asList(ids.split(","));
|
||||||
|
|
||||||
List<String> flowStatusList = new ArrayList<>();
|
List<String> flowStatusList = new ArrayList<>();
|
||||||
@@ -1870,6 +1875,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
|
|
||||||
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
|
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
|
||||||
projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
|
projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
|
||||||
|
projectCertificationInventoryEO.setReasonForReturn(reasonForReturn);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue());
|
this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue());
|
||||||
@@ -1973,6 +1979,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
if(StringUtils.isEmpty(ids)){
|
if(StringUtils.isEmpty(ids)){
|
||||||
throw new JeroBootException("至少选择一条数据进行操作!");
|
throw new JeroBootException("至少选择一条数据进行操作!");
|
||||||
}
|
}
|
||||||
|
String reasonForReturn = json.getString("reasonForReturn");
|
||||||
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
|
||||||
List<String> idList = Arrays.asList(ids.split(","));
|
List<String> idList = Arrays.asList(ids.split(","));
|
||||||
@@ -2026,6 +2033,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue());
|
projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (ProjectCertificationInventoryEO pciEo : projectCertificationInventoryEOList) {
|
||||||
|
pciEo.setReasonForReturn(reasonForReturn);
|
||||||
|
}
|
||||||
this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue());
|
this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue());
|
||||||
|
|
||||||
Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList);
|
Map<String, Object> standNameAndItemName = this.getStandNameAndItemName(projectCertificationInventoryEOList);
|
||||||
@@ -4456,7 +4466,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list");
|
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list");
|
||||||
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){
|
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){
|
||||||
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回");
|
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回");
|
||||||
|
contentCnSb.append(",退回原因:\"").append(pci.getReasonForReturn()).append("\"");
|
||||||
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned");
|
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned");
|
||||||
|
contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
|
||||||
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){
|
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){
|
||||||
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过");
|
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过");
|
||||||
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit");
|
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit");
|
||||||
@@ -4478,12 +4490,16 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information");
|
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information");
|
||||||
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){
|
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){
|
||||||
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息");
|
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息");
|
||||||
|
contentCnSb.append(",退回原因:\"").append(pci.getReasonForReturn()).append("\"");
|
||||||
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information");
|
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information");
|
||||||
|
contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
|
||||||
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){
|
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){
|
||||||
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝,流程退回至")
|
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝,流程退回至")
|
||||||
.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
|
.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
|
||||||
|
contentCnSb.append(",退回原因:\"").append(pci.getReasonForReturn()).append("\"");
|
||||||
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ")
|
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ")
|
||||||
.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
|
.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
|
||||||
|
contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
|
||||||
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){
|
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){
|
||||||
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程");
|
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程");
|
||||||
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process");
|
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process");
|
||||||
|
|||||||
Reference in New Issue
Block a user