liuyc преди 2 години
родител
ревизия
ad680dd157

+ 1 - 1
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMFinancialReimbursementServiceImpl.java

@@ -62,7 +62,7 @@ public class EMFinancialReimbursementServiceImpl extends BaseServiceImpl<ExMFina
             vo.setApprovalStatusName(vo.getStatus().equals(1) ? "待审批" : (vo.getStatus().equals(2) ? "已审批" : (vo.getStatus().equals(3) ? "已驳回" : "未上报")));
             vo.setApprovalResultName(vo.getApprovalStatusName().equals("已审批") || vo.getApprovalStatusName().equals("已驳回") ? "已通过" : "未通过");
             for (DictInfo dictInfo : dictInfoList) {
-                if (dictInfo.getDictValue().equals(vo.getFrType() + "")) {
+                if (dictInfo.getDictValue().equals(vo.getFrType())) {
                     vo.setFrTypeName(dictInfo.getDictName());
                     break;
                 }

+ 1 - 1
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMInvoiceServiceImpl.java

@@ -55,7 +55,7 @@ public class EMInvoiceServiceImpl extends BaseServiceImpl<ExMInvoiceMapper, EMIn
             vo.setApprovalStatusName(vo.getStatus().equals(1) ? "待审批" : (vo.getStatus().equals(2) ? "已审批" : (vo.getStatus().equals(3) ? "已驳回" : "未上报")));
             vo.setApprovalResultName(vo.getApprovalStatusName().equals("已审批") || vo.getApprovalStatusName().equals("已驳回") ? "已通过" : "未通过");
             for (DictInfo dictInfo : dictInfoList1) {
-                if (dictInfo.getDictValue().equals(vo.getInvoiceType() + "")) {
+                if (dictInfo.getDictValue().equals(vo.getInvoiceType())) {
                     vo.setInvoiceTypeName(dictInfo.getDictName());
                     break;
                 }

+ 1 - 1
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMOutsourcingPayServiceImpl.java

@@ -55,7 +55,7 @@ public class EMOutsourcingPayServiceImpl extends BaseServiceImpl<ExMOutsourcingP
             vo.setApprovalResultName(vo.getApprovalStatusName().equals("已审批") || vo.getApprovalStatusName().equals("已驳回") ? "已通过" : "未通过");
 
             for (DictInfo dictInfo : dictInfoList) {
-                if (dictInfo.getDictValue().equals(vo.getOutsourcingType() + "")) {
+                if (dictInfo.getDictValue().equals(vo.getOutsourcingType())) {
                     vo.setOutsourcingTypeName(dictInfo.getDictName());
                     break;
                 }

+ 1 - 1
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMPurchaseServiceImpl.java

@@ -49,7 +49,7 @@ public class EMPurchaseServiceImpl extends BaseServiceImpl<ExMPurchaseMapper, EM
             EMPurchaseInfoVO vo = new EMPurchaseInfoVO();
             BeanUtils.copyProperties(obj, vo);
             for (DictInfo dictInfo : dictInfoList) {
-                if (dictInfo.getDictValue().equals(vo.getPurType() + "")) {
+                if (dictInfo.getDictValue().equals(vo.getPurType())) {
                     vo.setPurTypeName(dictInfo.getDictName());
                     break;
                 }

+ 3 - 3
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskProcessServiceImpl.java

@@ -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;
                                         }