Skip to content

Y
yd-csf
Commit 8ece8bef by zhangxingmin
Options

push

parent 7b7eccc3
Showing with 22 additions and 15 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
...@@ -355,7 +355,7 @@ public class ApiCommissionExpectedController { ...@@ -355,7 +355,7 @@ public class ApiCommissionExpectedController {
commissionExpectedQueryRequest.getBrokerName(), commissionExpectedQueryRequest.getBrokerName(),
commissionExpectedQueryRequest.getInsured()); commissionExpectedQueryRequest.getInsured());
} }
log.info("应收款报表=>receivableReport=>queryPolicyNoList:{}",JSON.toJSONString(queryPolicyNoList));
// 构建查询条件 // 构建查询条件
commissionExpectedQueryRequest.setPolicyNoList(queryPolicyNoList); commissionExpectedQueryRequest.setPolicyNoList(queryPolicyNoList);
QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest); QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java
...@@ -951,7 +951,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -951,7 +951,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
policyInsurant.setName(apiInsurantInfoDto.getNameCn()); policyInsurant.setName(apiInsurantInfoDto.getNameCn());
policyInsurant.setNameEn(apiInsurantInfoDto.getNamePyEn()); policyInsurant.setNameEn(apiInsurantInfoDto.getNamePyEn());
policyInsurant.setNameSc(ChineseTextConverter.traditionalToSimplified(apiInsurantInfoDto.getNameCn())); policyInsurant.setNameSc(ChineseTextConverter.traditionalToSimplified(apiInsurantInfoDto.getNameCn()));
policyInsurant.setNameEnLc(EnglishTextUtil.toLowerCaseSafe(apiInsurantInfoDto.getNamePyEn())); policyInsurant.setNameEnLc(EnglishTextUtil.toLowerCaseSafeSafe(apiInsurantInfoDto.getNamePyEn()));
return policyInsurantService.saveOrUpdate(policyInsurant); return policyInsurantService.saveOrUpdate(policyInsurant);
} }
...@@ -971,7 +971,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -971,7 +971,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
policyPolicyholder.setName(apiPolicyholderInfoDto.getNameCn()); policyPolicyholder.setName(apiPolicyholderInfoDto.getNameCn());
policyPolicyholder.setNameEn(apiPolicyholderInfoDto.getNamePyEn()); policyPolicyholder.setNameEn(apiPolicyholderInfoDto.getNamePyEn());
policyPolicyholder.setNameSc(ChineseTextConverter.traditionalToSimplified(apiPolicyholderInfoDto.getNameCn())); policyPolicyholder.setNameSc(ChineseTextConverter.traditionalToSimplified(apiPolicyholderInfoDto.getNameCn()));
policyPolicyholder.setNameEnLc(EnglishTextUtil.toLowerCaseSafe(apiPolicyholderInfoDto.getNamePyEn())); policyPolicyholder.setNameEnLc(EnglishTextUtil.toLowerCaseSafeSafe(apiPolicyholderInfoDto.getNamePyEn()));
return policyPolicyholderService.saveOrUpdate(policyPolicyholder); return policyPolicyholderService.saveOrUpdate(policyPolicyholder);
} }
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPremiumReconciliationServiceImpl.java
...@@ -134,11 +134,11 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia ...@@ -134,11 +134,11 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
// 投保人-中文转简体 // 投保人-中文转简体
String policyHolderNameSc = ChineseTextConverter.traditionalToSimplified(request.getPolicyHolder()); String policyHolderNameSc = ChineseTextConverter.traditionalToSimplified(request.getPolicyHolder());
// 投保人-英文转小写 // 投保人-英文转小写
String policyHolderNameEnLc = EnglishTextUtil.toLowerCase(request.getPolicyHolder()); String policyHolderNameEnLc = EnglishTextUtil.toLowerCaseSafe(request.getPolicyHolder());
// 受保人-中文转简体 // 受保人-中文转简体
String insuredNameSc = ChineseTextConverter.traditionalToSimplified(request.getPolicyHolder()); String insuredNameSc = ChineseTextConverter.traditionalToSimplified(request.getPolicyHolder());
// 受保人-英文转小写 // 受保人-英文转小写
String insuredNameEnLc = EnglishTextUtil.toLowerCase(request.getPolicyHolder()); String insuredNameEnLc = EnglishTextUtil.toLowerCaseSafe(request.getPolicyHolder());
request.setPolicyHolderNameSc(policyHolderNameSc); request.setPolicyHolderNameSc(policyHolderNameSc);
request.setPolicyHolderNameEnLc(policyHolderNameEnLc); request.setPolicyHolderNameEnLc(policyHolderNameEnLc);
request.setInsuredNameSc(insuredNameSc); request.setInsuredNameSc(insuredNameSc);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
...@@ -635,7 +635,13 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -635,7 +635,13 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
queryWrapper.eq(ObjectUtils.isNotEmpty(productLaunchBizId), "product_launch_biz_id", productLaunchBizId); queryWrapper.eq(ObjectUtils.isNotEmpty(productLaunchBizId), "product_launch_biz_id", productLaunchBizId);
queryWrapper.eq(ObjectUtils.isNotEmpty(commissionBizType), "commission_biz_type", commissionBizType); queryWrapper.eq(ObjectUtils.isNotEmpty(commissionBizType), "commission_biz_type", commissionBizType);
queryWrapper.in(ObjectUtils.isNotEmpty(statusList), "status", statusList); queryWrapper.in(ObjectUtils.isNotEmpty(statusList), "status", statusList);
if (CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList())) {
queryWrapper.in(CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList()),"policy_no",commissionExpectedQueryRequest.getPolicyNoList()); queryWrapper.in(CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList()),"policy_no",commissionExpectedQueryRequest.getPolicyNoList());
}else {
//查询不到数据
queryWrapper.apply("1=0");
}
// 范围查询 // 范围查询
queryWrapper.ge(ObjectUtils.isNotEmpty(commissionDateStart), "commission_date", commissionDateStart); queryWrapper.ge(ObjectUtils.isNotEmpty(commissionDateStart), "commission_date", commissionDateStart);
queryWrapper.le(ObjectUtils.isNotEmpty(commissionDateEnd), "commission_date", commissionDateEnd); queryWrapper.le(ObjectUtils.isNotEmpty(commissionDateEnd), "commission_date", commissionDateEnd);
...@@ -644,6 +650,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -644,6 +650,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
queryWrapper.apply("EXISTS (SELECT 1 FROM policy_broker pb WHERE pb.policy_no = commission_expected.policy_no AND pb.team_biz_id = {0})", queryWrapper.apply("EXISTS (SELECT 1 FROM policy_broker pb WHERE pb.policy_no = commission_expected.policy_no AND pb.team_biz_id = {0})",
teamBizId); teamBizId);
} }
// 默认排序规则 // 默认排序规则
queryWrapper.orderByDesc("commission_date"); queryWrapper.orderByDesc("commission_date");
// 排序字段 // 排序字段
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CustomerServiceImpl.java
...@@ -74,7 +74,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> ...@@ -74,7 +74,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
// 中文转简体 // 中文转简体
String nameSc = ChineseTextConverter.traditionalToSimplified(name); String nameSc = ChineseTextConverter.traditionalToSimplified(name);
// 英文转小写 // 英文转小写
String nameEnLc = EnglishTextUtil.toLowerCase(name); String nameEnLc = EnglishTextUtil.toLowerCaseSafe(name);
queryWrapper.like(StringUtils.isNotBlank(nameSc), "name_sc", nameSc) queryWrapper.like(StringUtils.isNotBlank(nameSc), "name_sc", nameSc)
.or().like(StringUtils.isNotBlank(nameEnLc), "name_en_lc", nameEnLc); .or().like(StringUtils.isNotBlank(nameEnLc), "name_en_lc", nameEnLc);
...@@ -150,7 +150,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> ...@@ -150,7 +150,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
// 中文转简体 // 中文转简体
String nameSc = ChineseTextConverter.traditionalToSimplified(customerAddRequest.getNameCn()); String nameSc = ChineseTextConverter.traditionalToSimplified(customerAddRequest.getNameCn());
// 英文转小写 // 英文转小写
String nameEnLc = EnglishTextUtil.toLowerCase(customerAddRequest.getNamePyEn()); String nameEnLc = EnglishTextUtil.toLowerCaseSafe(customerAddRequest.getNamePyEn());
customer.setNameSc(nameSc); customer.setNameSc(nameSc);
customer.setNameEnLc(nameEnLc); customer.setNameEnLc(nameEnLc);
...@@ -263,7 +263,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> ...@@ -263,7 +263,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
// 中文转简体 // 中文转简体
String nameSc = ChineseTextConverter.traditionalToSimplified(customerUpdateRequest.getNameCn()); String nameSc = ChineseTextConverter.traditionalToSimplified(customerUpdateRequest.getNameCn());
// 英文转小写 // 英文转小写
String nameEnLc = EnglishTextUtil.toLowerCase(customerUpdateRequest.getNamePyEn()); String nameEnLc = EnglishTextUtil.toLowerCaseSafe(customerUpdateRequest.getNamePyEn());
oldCustomer.setNameSc(nameSc); oldCustomer.setNameSc(nameSc);
oldCustomer.setNameEnLc(nameEnLc); oldCustomer.setNameEnLc(nameEnLc);
boolean result = customerService.updateById(oldCustomer); boolean result = customerService.updateById(oldCustomer);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java
...@@ -1331,11 +1331,11 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol ...@@ -1331,11 +1331,11 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
public List<String> queryPolicyNoList(String policyHolder, String signer, String brokerName, String insured) { public List<String> queryPolicyNoList(String policyHolder, String signer, String brokerName, String insured) {
// 投保人转换：中文转简体、英文转小写 // 投保人转换：中文转简体、英文转小写
String policyHolderSc = ChineseTextConverter.traditionalToSimplified(policyHolder); String policyHolderSc = ChineseTextConverter.traditionalToSimplified(policyHolder);
String policyHolderEnLc = EnglishTextUtil.toLowerCase(policyHolder); String policyHolderEnLc = EnglishTextUtil.toLowerCaseSafe(policyHolder);
// 受保人转换：中文转简体、英文转小写 // 受保人转换：中文转简体、英文转小写
String insuredSc = ChineseTextConverter.traditionalToSimplified(insured); String insuredSc = ChineseTextConverter.traditionalToSimplified(insured);
String insuredEnLc = EnglishTextUtil.toLowerCase(insured); String insuredEnLc = EnglishTextUtil.toLowerCaseSafe(insured);
return this.baseMapper.queryPolicyNoList( return this.baseMapper.queryPolicyNoList(
policyHolderSc, policyHolderEnLc, policyHolderSc, policyHolderEnLc,
...@@ -1394,7 +1394,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol ...@@ -1394,7 +1394,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
// 英文 → 小写 // 英文 → 小写
if (StringUtils.isNotBlank(entity.getNameEn())) { if (StringUtils.isNotBlank(entity.getNameEn())) {
String nameEnLc = EnglishTextUtil.toLowerCase(entity.getNameEn()); String nameEnLc = EnglishTextUtil.toLowerCaseSafe(entity.getNameEn());
if (!nameEnLc.equals(entity.getNameEnLc())) { if (!nameEnLc.equals(entity.getNameEnLc())) {
entity.setNameEnLc(nameEnLc); entity.setNameEnLc(nameEnLc);
changed = true; changed = true;
...@@ -1440,7 +1440,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol ...@@ -1440,7 +1440,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
} }
if (StringUtils.isNotBlank(entity.getNameEn())) { if (StringUtils.isNotBlank(entity.getNameEn())) {
String nameEnLc = EnglishTextUtil.toLowerCase(entity.getNameEn()); String nameEnLc = EnglishTextUtil.toLowerCaseSafe(entity.getNameEn());
if (!nameEnLc.equals(entity.getNameEnLc())) { if (!nameEnLc.equals(entity.getNameEnLc())) {
entity.setNameEnLc(nameEnLc); entity.setNameEnLc(nameEnLc);
changed = true; changed = true;
...@@ -1486,7 +1486,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol ...@@ -1486,7 +1486,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
} }
if (StringUtils.isNotBlank(entity.getNamePyEn())) { if (StringUtils.isNotBlank(entity.getNamePyEn())) {
String nameEnLc = EnglishTextUtil.toLowerCase(entity.getNamePyEn()); String nameEnLc = EnglishTextUtil.toLowerCaseSafe(entity.getNamePyEn());
if (!nameEnLc.equals(entity.getNameEnLc())) { if (!nameEnLc.equals(entity.getNameEnLc())) {
entity.setNameEnLc(nameEnLc); entity.setNameEnLc(nameEnLc);
changed = true; changed = true;
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyInsurantServiceImpl.java
...@@ -60,7 +60,7 @@ public class PolicyInsurantServiceImpl extends ServiceImpl<PolicyInsurantMapper, ...@@ -60,7 +60,7 @@ public class PolicyInsurantServiceImpl extends ServiceImpl<PolicyInsurantMapper,
// 中文转简体 // 中文转简体
String nameSc = ChineseTextConverter.traditionalToSimplified(insured); String nameSc = ChineseTextConverter.traditionalToSimplified(insured);
// 英文转小写 // 英文转小写
String nameEnLc = EnglishTextUtil.toLowerCase(insured); String nameEnLc = EnglishTextUtil.toLowerCaseSafe(insured);
return this.baseMapper.selectList(new LambdaQueryWrapper<PolicyInsurant>() return this.baseMapper.selectList(new LambdaQueryWrapper<PolicyInsurant>()
.and(wrapper -> wrapper .and(wrapper -> wrapper
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyPolicyholderServiceImpl.java
...@@ -77,7 +77,7 @@ public class PolicyPolicyholderServiceImpl extends ServiceImpl<PolicyPolicyholde ...@@ -77,7 +77,7 @@ public class PolicyPolicyholderServiceImpl extends ServiceImpl<PolicyPolicyholde
// 中文转简体 // 中文转简体
String nameSc = ChineseTextConverter.traditionalToSimplified(policyHolder); String nameSc = ChineseTextConverter.traditionalToSimplified(policyHolder);
// 英文转小写 // 英文转小写
String nameEnLc = EnglishTextUtil.toLowerCase(policyHolder); String nameEnLc = EnglishTextUtil.toLowerCaseSafeSafe(policyHolder);
return this.baseMapper.selectList(new LambdaQueryWrapper<PolicyPolicyholder>() return this.baseMapper.selectList(new LambdaQueryWrapper<PolicyPolicyholder>()
.and(wrapper -> wrapper .and(wrapper -> wrapper
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment