VOLTA EDI

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -1471,7 +1471,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							BCorps bCorps13 = bCorpsService.getById(hpsCorpId);
 							if (ObjectUtils.isNotNull(bCorps13)) {
 								Long ownerCorpId = ObjectUtils.isNotNull(bCorps13.getCorpId()) ? bCorps13.getCorpId() : 0L;
-								if (ownerCorpId > 0 && (ownerCorpId.equals(item.getCorpId()) || ownerCorpId.equals(item.getCarrierId()) || ownerCorpId.equals(hpsCorpId))) {
+								if (ownerCorpId.equals(item.getCorpId()) || ownerCorpId.equals(item.getCarrierId()) || hpsCorpId.equals(item.getCorpId())) {
 									isPS = ObjectUtils.isNotNull(bCorps13.getIsPs()) && bCorps13.getIsPs() == 1;
 								}
 							}
@@ -1510,7 +1510,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 											BigDecimal psr1 = new BigDecimal(1).subtract(pt1).setScale(2, BigDecimal.ROUND_HALF_UP);
 											ps_remarks += " PS比例高，公司比例： " + psr1.toString() + " 系统比例为:" + specPsRate.toString() + "\r\n";
 											BigDecimal psr2 = new BigDecimal(1).subtract(specPsRate).setScale(2, BigDecimal.ROUND_HALF_UP);
-											ps_ps += "公司比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
+											ps_ps += "公司分成比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
 										}
 									}
 								}
@@ -1523,7 +1523,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 											BigDecimal psr1 = new BigDecimal(1).subtract(pt1).setScale(2, BigDecimal.ROUND_HALF_UP);
 											ps_remarks += " PS比例高，公司比例： " + psr1.toString() + " 系统比例为:" + specPsRate.toString() + "\r\n";
 											BigDecimal psr2 = new BigDecimal(1).subtract(PsRate).setScale(2, BigDecimal.ROUND_HALF_UP);
-											ps_ps += "公司比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
+											ps_ps += "公司分成比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
 										}
 									}
 								}
@@ -2801,7 +2801,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 											BigDecimal psr1 = new BigDecimal(1).subtract(pt1).setScale(2, BigDecimal.ROUND_HALF_UP);
 											ps_remarks += " PS比例高，公司比例： " + psr1.toString() + " 系统比例为:" + specPsRate.toString() + "\r\n";
 											BigDecimal psr2 = new BigDecimal(1).subtract(specPsRate).setScale(2, BigDecimal.ROUND_HALF_UP);
-											ps_ps += "公司比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
+											ps_ps += "公司分成比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
 										}
 									}
 								}
@@ -2814,7 +2814,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 											BigDecimal psr1 = new BigDecimal(1).subtract(pt1).setScale(2, BigDecimal.ROUND_HALF_UP);
 											ps_remarks += " PS比例高，公司比例： " + psr1.toString() + " 系统比例为:" + specPsRate.toString() + "\r\n";
 											BigDecimal psr2 = new BigDecimal(1).subtract(PsRate).setScale(2, BigDecimal.ROUND_HALF_UP);
-											ps_ps += "公司比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
+											ps_ps += "公司分成比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
 										}
 									}
 								}