Commit 34a8f17682ea718b4aa6b1801129ad9b6493c8bf
Merge remote-tracking branch 'origin/master_0929' into master_0929
Showing
2 changed files
with
12 additions
and
1 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/customer/CustomerCreditController.java
| @@ -463,6 +463,17 @@ public class CustomerCreditController extends DefaultBaseController { | @@ -463,6 +463,17 @@ public class CustomerCreditController extends DefaultBaseController { | ||
| 463 | List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList()); | 463 | List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList()); |
| 464 | data.setShowExamine(businessIds.contains(credit.getId())); | 464 | data.setShowExamine(businessIds.contains(credit.getId())); |
| 465 | } | 465 | } |
| 466 | + // enterpriseOperationType 转中文 | ||
| 467 | + String opType = data.getEnterpriseOperationType(); | ||
| 468 | + if ("NEW_CUSTOMER".equals(opType)) { | ||
| 469 | + data.setEnterpriseOperationType("新开发客户"); | ||
| 470 | + } else if ("RECONNECT_CUSTOMER".equals(opType)) { | ||
| 471 | + data.setEnterpriseOperationType("再接轨客户"); | ||
| 472 | + } else if ("OLD_CUSTOMER".equals(opType)) { | ||
| 473 | + data.setEnterpriseOperationType("老客户"); | ||
| 474 | + } else { | ||
| 475 | + data.setEnterpriseOperationType(""); | ||
| 476 | + } | ||
| 466 | return data; | 477 | return data; |
| 467 | } | 478 | } |
| 468 | 479 |
| @@ -177,7 +177,7 @@ | @@ -177,7 +177,7 @@ | ||
| 177 | <choose> | 177 | <choose> |
| 178 | <when test="vo.queryType == 'REVOKE'"> | 178 | <when test="vo.queryType == 'REVOKE'"> |
| 179 | AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR | 179 | AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR |
| 180 | - tb.revoke_status='PARTIAL') | 180 | + tb.revoke_status='PARTIAL' OR tb.revoke_status IS NULL) |
| 181 | AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT') | 181 | AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT') |
| 182 | AND tb.examine_status = 'PASS' | 182 | AND tb.examine_status = 'PASS' |
| 183 | AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL) | 183 | AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL) |