|
@@ -119,7 +119,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
|
|
|
vo.setStatusName(vo.getStatus().equals(1) ? "待审批" : (vo.getStatus().equals(2) ? "已审批" : "已驳回"));
|
|
|
|
|
|
for (DictInfo dictInfo : dictInfoList) {
|
|
|
- if ((vo.getTaskType() + "").equals(dictInfo.getDictValue())) {
|
|
|
+ if ((vo.getTaskType()).equals(dictInfo.getDictValue())) {
|
|
|
vo.setReportTypeName(dictInfo.getDictName());
|
|
|
break;
|
|
|
}
|
|
@@ -142,7 +142,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
|
|
|
basicsVO.setTaskId(taskProcessInfo.getId());
|
|
|
basicsVO.setTaskName(taskProcessInfo.getTaskName());
|
|
|
for (DictInfo dictInfo : dictInfoList1) {
|
|
|
- if ((taskProcessInfo.getTaskType() + "").equals(dictInfo.getDictValue())) {
|
|
|
+ if ((taskProcessInfo.getTaskType()).equals(dictInfo.getDictValue())) {
|
|
|
basicsVO.setReportTypeName(dictInfo.getDictName());
|
|
|
break;
|
|
|
}
|
|
@@ -187,7 +187,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
|
|
|
}
|
|
|
}
|
|
|
for (DictInfo dictInfo : dictInfoList2) {
|
|
|
- if (dictInfo.getDictValue().equals(voCW.getFrType() + "")) {
|
|
|
+ if (dictInfo.getDictValue().equals(voCW.getFrType())) {
|
|
|
voCW.setFrTypeName(dictInfo.getDictName());
|
|
|
break;
|
|
|
}
|