Showing
7 changed files
with
20 additions
and
4 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/customer/CustomerCreditController.java
| @@ -314,13 +314,14 @@ public class CustomerCreditController extends DefaultBaseController { | @@ -314,13 +314,14 @@ public class CustomerCreditController extends DefaultBaseController { | ||
| 314 | Collections.singletonList("1. 带*是必填项"), | 314 | Collections.singletonList("1. 带*是必填项"), |
| 315 | Collections.singletonList("2. 办事处要是全称：例如 北方办事处"), | 315 | Collections.singletonList("2. 办事处要是全称：例如 北方办事处"), |
| 316 | Collections.singletonList("3. 区域要是全称：例如 山东区域"), | 316 | Collections.singletonList("3. 区域要是全称：例如 山东区域"), |
| 317 | - Collections.singletonList("4. 企业类型只能是：经销商、终端"), | 317 | + Collections.singletonList("4. 企业类型只能是：经销商、终端、外贸"), |
| 318 | Collections.singletonList("5. 注册资本格式：100 或 100万元"), | 318 | Collections.singletonList("5. 注册资本格式：100 或 100万元"), |
| 319 | Collections.singletonList("6. 登记日期、注册时间格式：2025年3月21日 或 2025-03-21 或 2025/3/21"), | 319 | Collections.singletonList("6. 登记日期、注册时间格式：2025年3月21日 或 2025-03-21 或 2025/3/21"), |
| 320 | Collections.singletonList("7. 年龄格式：正整数，不要带单位 例如 25"), | 320 | Collections.singletonList("7. 年龄格式：正整数，不要带单位 例如 25"), |
| 321 | Collections.singletonList("8. 性别格式：男 或 女"), | 321 | Collections.singletonList("8. 性别格式：男 或 女"), |
| 322 | Collections.singletonList("9. 员工人数格式：正整数，不要带单位 例如 25"), | 322 | Collections.singletonList("9. 员工人数格式：正整数，不要带单位 例如 25"), |
| 323 | - Collections.singletonList("10. 建议客户分类格式：只能为：AAA、AA、A、BBB、BB、B、C、D") | 323 | + Collections.singletonList("10. 建议客户分类格式：只能为：AAA、AA、A、BBB、BB、B、C、D"), |
| 324 | + Collections.singletonList("11. 调查人：只能是系统中存在的人") | ||
| 324 | ); | 325 | ); |
| 325 | 326 | ||
| 326 | try (OutputStream out = response.getOutputStream()) { | 327 | try (OutputStream out = response.getOutputStream()) { |
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
| @@ -407,7 +407,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController { | @@ -407,7 +407,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController { | ||
| 407 | String et = data.getEnterpriseType(); | 407 | String et = data.getEnterpriseType(); |
| 408 | dataMap.put("enterpriseType", | 408 | dataMap.put("enterpriseType", |
| 409 | "DEALER".equals(et) ? "经销商" : | 409 | "DEALER".equals(et) ? "经销商" : |
| 410 | - "TERMINAL".equals(et) ? "终端" : ""); | 410 | + "TERMINAL".equals(et) ? "终端" : |
| 411 | + "FOREIGN".equals(et) ? "外贸" : ""); | ||
| 411 | //办事处 | 412 | //办事处 |
| 412 | String deptCode = transactorHandler.returnDeptCode(data.getContractCreateById()); | 413 | String deptCode = transactorHandler.returnDeptCode(data.getContractCreateById()); |
| 413 | dataMap.put("officeName", returnDeptName(deptCode)); | 414 | dataMap.put("officeName", returnDeptName(deptCode)); |
| @@ -187,6 +187,9 @@ public class CustomerDevelopExportModel extends BaseBo<GetCustomerDevelopPlanBo> | @@ -187,6 +187,9 @@ public class CustomerDevelopExportModel extends BaseBo<GetCustomerDevelopPlanBo> | ||
| 187 | case "TERMINAL": | 187 | case "TERMINAL": |
| 188 | this.customerTypeName = "终端"; | 188 | this.customerTypeName = "终端"; |
| 189 | break; | 189 | break; |
| 190 | + case "FOREIGN": | ||
| 191 | + this.customerTypeName = "外贸"; | ||
| 192 | + break; | ||
| 190 | default: | 193 | default: |
| 191 | break; | 194 | break; |
| 192 | } | 195 | } |
| @@ -374,6 +374,9 @@ public class CustomerCreditExportModel extends BaseBo<GetCustomerCreditBo> imple | @@ -374,6 +374,9 @@ public class CustomerCreditExportModel extends BaseBo<GetCustomerCreditBo> imple | ||
| 374 | case "TERMINAL": | 374 | case "TERMINAL": |
| 375 | this.enterpriseType = "终端"; | 375 | this.enterpriseType = "终端"; |
| 376 | break; | 376 | break; |
| 377 | + case "FOREIGN": | ||
| 378 | + this.enterpriseType = "外贸"; | ||
| 379 | + break; | ||
| 377 | default: | 380 | default: |
| 378 | break; | 381 | break; |
| 379 | } | 382 | } |
| @@ -152,6 +152,8 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr | @@ -152,6 +152,8 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr | ||
| 152 | data.setEnterpriseType("DEALER"); | 152 | data.setEnterpriseType("DEALER"); |
| 153 | } else if ("终端".equals(data.getEnterpriseType())) { | 153 | } else if ("终端".equals(data.getEnterpriseType())) { |
| 154 | data.setEnterpriseType("TERMINAL"); | 154 | data.setEnterpriseType("TERMINAL"); |
| 155 | + } else if ("外贸".equals(data.getEnterpriseType())) { | ||
| 156 | + data.setEnterpriseType("FOREIGN"); | ||
| 155 | } else { | 157 | } else { |
| 156 | throw new DefaultClientException( | 158 | throw new DefaultClientException( |
| 157 | "第" + context.readRowHolder().getRowIndex() + "行“企业类型”不存在"); | 159 | "第" + context.readRowHolder().getRowIndex() + "行“企业类型”不存在"); |
| @@ -348,6 +348,8 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer | @@ -348,6 +348,8 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer | ||
| 348 | value1 = "终端"; | 348 | value1 = "终端"; |
| 349 | } else if ("DEALER".equals(data.getEnterpriseType())) { | 349 | } else if ("DEALER".equals(data.getEnterpriseType())) { |
| 350 | value1 = "经销商"; | 350 | value1 = "经销商"; |
| 351 | + } else if ("FOREIGN".equals(data.getEnterpriseType())) { | ||
| 352 | + value1 = "外贸"; | ||
| 351 | } | 353 | } |
| 352 | } | 354 | } |
| 353 | if (StringUtil.isNotEmpty(customerCreditHistory.getEnterpriseType())) { | 355 | if (StringUtil.isNotEmpty(customerCreditHistory.getEnterpriseType())) { |
| @@ -355,6 +357,8 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer | @@ -355,6 +357,8 @@ public class CustomerCreditHistoryServiceImpl extends BaseMpServiceImpl<Customer | ||
| 355 | value2 = "终端"; | 357 | value2 = "终端"; |
| 356 | } else if ("DEALER".equals(customerCreditHistory.getEnterpriseType())) { | 358 | } else if ("DEALER".equals(customerCreditHistory.getEnterpriseType())) { |
| 357 | value2 = "经销商"; | 359 | value2 = "经销商"; |
| 360 | + } else if ("FOREIGN".equals(customerCreditHistory.getEnterpriseType())) { | ||
| 361 | + value2 = "外贸"; | ||
| 358 | } | 362 | } |
| 359 | } | 363 | } |
| 360 | } | 364 | } |
| @@ -1410,7 +1410,9 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM | @@ -1410,7 +1410,9 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM | ||
| 1410 | enterpriseType = "经销商"; | 1410 | enterpriseType = "经销商"; |
| 1411 | } else if ("TERMINAL".equals(data.getEnterpriseType())) { | 1411 | } else if ("TERMINAL".equals(data.getEnterpriseType())) { |
| 1412 | enterpriseType = "终端"; | 1412 | enterpriseType = "终端"; |
| 1413 | - } else { | 1413 | + } else if ("FOREIGN".equals(data.getEnterpriseType())) { |
| 1414 | + enterpriseType = "外贸"; | ||
| 1415 | + } else { | ||
| 1414 | enterpriseType = data.getEnterpriseType(); | 1416 | enterpriseType = data.getEnterpriseType(); |
| 1415 | } | 1417 | } |
| 1416 | data.setEnterpriseType(enterpriseType); | 1418 | data.setEnterpriseType(enterpriseType); |